Skip to content

GitLab

Commit 137c289a authored by Frederic Massart's avatar Frederic Massart Committed by Dan Poltawski
Browse files

MDL-55593 theme_noname: Post-prod on preset default styling 

Some styles were moved to be part of the core SCSS rules. Extra
variables were removed, and other styles where adapted.

Part of MDL-55071
parent a13dd17c
Expand all Hide whitespace changes
Inline Side-by-side
mod/wiki/styles.css
View file @ 137c289a
......@@ -233,11 +233,6 @@ a.wiki_newentry:link, a.wiki_newentry:visited {
font-style: italic;
}
#intro.generalbox {
margin-top: 10px;
padding: 5px;
}
.wiki_navigation_container {
margin: 0 auto;
}
......
theme/noname/classes/output/core_renderer.php
View file @ 137c289a
......@@ -137,7 +137,7 @@ class core_renderer extends \core_renderer {
* @return string
*/
public function get_compact_logo_url($maxwidth = 100, $maxheight = 100) {
return parent::get_compact_logo_url(null, 43);
return parent::get_compact_logo_url(null, 35);
}
/**
......@@ -286,24 +286,6 @@ class core_renderer extends \core_renderer {
if (empty($bc->blockinstanceid) || !strip_tags($bc->title)) {
$bc->collapsible = block_contents::NOT_HIDEABLE;
}
if (!empty($bc->blockinstanceid)) {
$bc->attributes['data-instanceid'] = $bc->blockinstanceid;
}
$skiptitle = strip_tags($bc->title);
if ($bc->blockinstanceid && !empty($skiptitle)) {
$bc->attributes['aria-labelledby'] = 'instance-'.$bc->blockinstanceid.'-header';
} else if (!empty($bc->arialabel)) {
$bc->attributes['aria-label'] = $bc->arialabel;
}
if ($bc->dockable) {
$bc->attributes['data-dockable'] = 1;
}
if ($bc->collapsible == block_contents::HIDDEN) {
$bc->add_class('hidden');
}
if (!empty($bc->controls)) {
$bc->add_class('block_with_controls');
}
$id = !empty($bc->attributes['id']) ? $bc->attributes['id'] : uniqid('block-');
$context = new stdClass();
......
theme/noname/scss/moodle/admin.scss
View file @ 137c289a
......@@ -175,11 +175,13 @@
}
#notice {
// Would like the use the alert stuff below for this,
// but the way buttons are used makes it tricky.
width: 60%;
min-width: 220px;
margin: auto;
text-align: center;
.buttons {
padding: 0
}
}
#page-admin-index .releasenoteslink,
......
theme/noname/scss/moodle/blocks.scss
View file @ 137c289a
......@@ -14,7 +14,7 @@
}
.block .card-title {
margin-bottom: -1.5rem;
word-break: break-all;
}
.block .block-controls {
......
theme/noname/scss/moodle/core.scss
View file @ 137c289a
......@@ -179,7 +179,7 @@ img.resize {
.action-menu .userpicture {
width: auto;
height: auto;
padding-left: 1rem;
margin-left: 1rem;
}
.block img.resize,
.breadcrumb img.resize {
......@@ -377,8 +377,12 @@ a.skip:active {
}
// My Moodle
.path-my .coursebox .overview {
margin: 15px 30px 10px 30px;
.path-my .coursebox {
margin: $spacer-y 0;
padding: 0;
.overview {
margin: 15px 30px 10px 30px;
}
}
.path-my .coursebox .info {
float: none;
......@@ -1642,18 +1646,29 @@ img#persona_signin {
.navbar-brand {
.logo {
display: inline-block;
margin-top: -$navbar-brand-padding-y;
margin: -$navbar-brand-padding-y 0;
}
.site-name {
display: inline-block;
margin-left: $spacer/2;
}
height: 43px;
&.has-logo {
.site-name {
margin-left: $spacer / 2;
}
}
}
@include media-breakpoint-down(xs) {
.navbar-brand .site-name {
display: none;
.navbar {
.navbar-brand {
max-width: 80%;
margin-right: 0;
&.has-logo {
.site-name {
display: none;
}
}
}
}
}
......@@ -1691,14 +1706,6 @@ header {
margin-right: 1em;
margin-bottom: 1em;
}
.page-header-headings {
margin-top: 30px;
margin-bottom: 10px;
h1 {
display: block;
}
}
.page-header-headings,
.header-button-group {
......
theme/noname/scss/moodle/course.scss
View file @ 137c289a
......@@ -37,9 +37,11 @@
.sitetopic ul.section {
margin: 0;
}
.course-content ul.section {
margin: 1em;
margin: $spacer;
}
.section {
.side {
&.left {
......@@ -84,11 +86,16 @@
.contentwithoutlink,
.activityinstance {
min-width: 40%;
display: table-cell;
padding-right: 4px;
min-height: 2em;
> a,
> .inplaceeditable-text {
display: block;
text-indent: -31px;
padding-left: 31px;
}
}
}
.label {
......@@ -182,7 +189,7 @@
}
.editing .section .activity:hover,
.editing .section .activity.action-menu-shown {
background-color: $gray-lighter;
background-color: $table-bg-accent;
}
.course-content .current {
@extend .tag-info;
......@@ -241,8 +248,11 @@
margin-top: 0;
}
.course-content ul li.section.main {
border-bottom: 2px solid $table-border-color;
border-bottom: $border-width solid $table-border-color;
margin-top: 0;
&:last-child {
border-bottom: 0;
}
}
.course-content ul li.section.hidden {
.sectionname > span,
......@@ -256,21 +266,23 @@
margin-right: 10px;
}
}
.course-content ul.topics li.section .content,
.course-content ul.weeks li.section .content {
margin-right: 20px;
margin-left: 20px;
.course-content ul.topics,
.course-content ul.weeks {
padding: 0;
li.section {
padding-top: $spacer;
padding-bottom: $spacer;
.content {
margin: 0;
padding: 0;
}
}
}
.course-content {
margin-top: 0;
}
.course-content ul.topics li.section {
padding-bottom: 20px;
}
.course-content ul.topics li.section .summary {
margin-left: 25px;
}
......@@ -303,6 +315,12 @@
}
}
}
.right {
> .icon:first-child {
/* Remove the spacer icon. */
display: none;
}
}
}
}
......@@ -473,10 +491,7 @@ span.editinstructions {
}
.coursebox {
margin-bottom: 15px;
border: 1px dotted #ddd;
@include border-radius(4px);
padding: 5px;
padding: $spacer / 2;
}
.coursebox > .info > .coursename a {
......@@ -544,8 +559,8 @@ span.editinstructions {
.coursebox .content .coursefile,
.coursebox .content .teachers,
.coursebox.remotecoursebox .remotecourseinfo {
margin:3px 5px;
padding:0;
margin: 15px 5px 5px;
padding: 0;
}
.coursebox.remotehost > .info > .categoryname a {
......@@ -557,17 +572,23 @@ span.editinstructions {
.coursebox.collapsed > .content {
display:none;
}
.courses .coursebox.collapsed {
border: 1px solid $table-border-color;
padding: 5px;
}
.courses .coursebox.even {
background-color: $table-bg-accent;
.courses .coursebox {
&.collapsed {
padding-top: $spacer-y / 2;
padding-bottom: $spacer-y / 2;
}
&.even {
background-color: $table-bg-accent;
}
&:hover {
background-color: $table-bg-hover;
}
}
.courses .coursebox:hover,
.course_category_tree .courses > .paging.paging-morelink:hover {
background-color: $table-bg-hover;
.courses > .paging.paging-morelink {
text-align: center;
padding: $spacer;
}
.course_category_tree .category .numberofcourse {
......@@ -622,39 +643,14 @@ span.editinstructions {
display:none;
}
.course_category_tree .category >.info {
@extend .card;
min-height:0;
padding:0;
margin:3px 0;
margin-bottom:3px;
.course_category_tree .category > .info {
clear: both;
}
.course_category_tree.frontpage-category-names .category >.info {
background:none;
border:none;
margin:0;
}
.course_category_tree .category > .content {
padding-left:16px;
}
.course_category_tree .subcategories > .paging,
.courses > .paging {
margin:0;
padding:5px;
text-align:center;
}
.courses > .paging.paging-morelink,
.course_category_tree .subcategories > .paging.paging-morelink {
text-align:left;
}
.course_category_tree .paging.paging-morelink a {
font-size: $font-size-sm;
}
#page-course-index-category .generalbox.info {
margin-bottom: 15px;
border: 1px dotted #ddd;
......
theme/noname/scss/moodle/forms.scss
View file @ 137c289a
......@@ -20,7 +20,9 @@
margin-bottom: 4px;
}
.mform fieldset {
margin-left: $spacer;
margin-left: $spacer * 1.5;
margin-bottom: $spacer / 2;
border-bottom: $border-width solid $table-border-color;
}
.mform fieldset.collapsible legend a.fheader {
padding: 0 5px 0 ($spacer * 1.5);
......
theme/noname/scss/moodle/icons.scss
View file @ 137c289a
......@@ -28,3 +28,11 @@ a:first-of-type > .icon {
.ygtvcell .icon {
margin-left: 0 !important;
}
// In the navigation, tree icons should not have margins.
.block_navigation,
.block_settings {
.tree_item .icon {
margin-left: 0;
}
}
theme/noname/scss/moodle/modules.scss
View file @ 137c289a
......@@ -224,6 +224,11 @@ div#dock {
width: 100%;
}
// Dropdown styling.
.dropdown-menu {
margin-top: 11px;
}
// Survey module
.path-mod-survey {
......
theme/noname/scss/moodle/user.scss
View file @ 137c289a
......@@ -15,13 +15,7 @@
}
.userprofile .profile_tree section {
@extend .card;
//display: inline-block;
//width: 100%;
//border: 1px solid #ddd;
//border-radius: $baseBorderRadius;
//padding: 0 15px;
//margin-bottom: 20px;
//@include box-sizing(border-box);
@extend .card-block;
}
.userprofile .profile_tree section h3 {
@extend .lead;
......@@ -43,9 +37,9 @@
#page-user-profile .node_category,
.path-user .node_category {
ul {
margin-left: 0;
margin-right: 0;
margin: 0;
list-style: none;
padding-left: 0;
}
li {
margin-top: 5px;
......
theme/noname/scss/preset-default.scss
View file @ 137c289a
This diff is collapsed.
theme/noname/templates/core/block.mustache
View file @ 137c289a
......@@ -5,26 +5,32 @@
{{! Start Block Container }}
<aside id="{{id}}"
class="{{#hidden}}hidden{{/hidden}} m-b-1 block block_{{type}} card"
class="{{#hidden}}hidden{{/hidden}} block block_{{type}} {{#hascontrols}}block_with_controls{{/hascontrols}} card m-b-1"
role="{{ariarole}}"
data-block="{{type}}"
{{#arialabel}}
aria-label="{{{arialabel}}}"
{{/arialabel}} >
aria-label={{#quote}}{{{arialabel}}}{{/quote}}
{{/arialabel}}
{{^arialabel}}
{{#title}}
aria-labelledby="instance-{{blockinstanceid}}-header"
{{/title}}
{{/arialabel}}>
{{! Block contents }}
<div class="card-block">
{{#hascontrols}}
<div class="pull-xs-right block-controls">
{{{controls}}}
</div>
{{/hascontrols}}
{{! Block header }}
{{#title}}
<h3 class="card-title p-r-3">{{{title}}}</h3>
<h3 id="instance-{{blockinstanceid}}-header" class="card-title">{{{title}}}</h3>
{{/title}}
{{#hascontrols}}
<div class="pull-xs-right block-controls">
{{{controls}}}
</div>
{{/hascontrols}}
<span class="clearfix m-b-1 d-block"></span>
<div class="card-text">
{{{content}}}
{{{footer}}}
......
theme/noname/templates/header.mustache
View file @ 137c289a
......@@ -21,14 +21,12 @@
<div class="container">
<div class="clearfix">
<button class="navbar-toggler pull-xs-right hidden-sm-up" data-toggle="collapse" data-target="#bd-main-nav" aria-expanded="false" aria-controls="bd-main-nav" type="button">☰<span class="sr-only">{{#str}}expand{{/str}}</span></button>
</div>
<button class="navbar-toggler pull-xs-right hidden-sm-up" data-toggle="collapse" data-target="#bd-main-nav" aria-expanded="false" aria-controls="bd-main-nav" type="button">☰<span class="sr-only">{{#str}}expand{{/str}}</span></button>
<a role="banner" href="{{{ config.wwwroot }}}" class="navbar-brand">
<a role="banner" href="{{{ config.wwwroot }}}" class="navbar-brand {{# output.should_display_navbar_logo }}has-logo{{/ output.should_display_navbar_logo }}">
{{# output.should_display_navbar_logo }}
<div class="logo">
<img src="{{output.get_compact_logo_url}}" alt={{#quote}}{{sitename}}{{/quote}}>
<img src="{{output.get_compact_logo_url}}" alt="{{sitename}}">
</div>
{{/ output.should_display_navbar_logo }}
<div class="site-name">{{{ sitename }}}</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment