From 75b68df3eea1b41872e639295597114624e540ac Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Tue, 5 Jul 2016 22:36:24 +0100 Subject: [PATCH] MDL-55167 less: reformat one line statemets into multiple lines --- .../less/moodle/bootstrapoverride.less | 50 +++-- theme/bootstrapbase/less/moodle/core.less | 187 +++++++++++++++--- theme/bootstrapbase/less/moodle/course.less | 82 ++++++-- theme/bootstrapbase/less/moodle/modules.less | 12 +- 4 files changed, 268 insertions(+), 63 deletions(-) diff --git a/theme/bootstrapbase/less/moodle/bootstrapoverride.less b/theme/bootstrapbase/less/moodle/bootstrapoverride.less index f353aa637467c..7f31df8ce711e 100644 --- a/theme/bootstrapbase/less/moodle/bootstrapoverride.less +++ b/theme/bootstrapbase/less/moodle/bootstrapoverride.less @@ -12,17 +12,45 @@ @warningText: #8a6d3b; // Headings. -h1 { font-size: round(@baseFontSize * 2.30); } // ~32px -h2 { font-size: round(@baseFontSize * 2.00); } // ~28px -h3 { font-size: round(@baseFontSize * 1.70); } // ~24px -h4 { font-size: round(@baseFontSize * 1.40); } // ~20px -h5 { font-size: round(@baseFontSize * 1.15); } // ~16px -h6 { font-size: round(@baseFontSize * 0.85); } // ~12px - -h1 small { font-size: round(@baseFontSize * 1.70); } // ~24px -h2 small { font-size: round(@baseFontSize * 1.40); } // ~20px -h3 small { font-size: round(@baseFontSize * 1.15); } // ~16px -h4 small { font-size: round(@baseFontSize * 0.85); } // ~12px +h1 { + font-size: round(@baseFontSize * 2.30); // ~32px +} + +h2 { + font-size: round(@baseFontSize * 2.00); // ~28px +} + +h3 { + font-size: round(@baseFontSize * 1.70); // ~24px +} + +h4 { + font-size: round(@baseFontSize * 1.40); // ~20px +} + +h5 { + font-size: round(@baseFontSize * 1.15); // ~16px +} + +h6 { + font-size: round(@baseFontSize * 0.85); // ~12px +} + +h1 small { + font-size: round(@baseFontSize * 1.70); // ~24px +} + +h2 small { + font-size: round(@baseFontSize * 1.40); // ~20px +} + +h3 small { + font-size: round(@baseFontSize * 1.15); // ~16px +} + +h4 small { + font-size: round(@baseFontSize * 0.85); // ~12px +} // Printing. @media print { diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less index 4cc648fda601a..07e5cc920057f 100644 --- a/theme/bootstrapbase/less/moodle/core.less +++ b/theme/bootstrapbase/less/moodle/core.less @@ -2361,25 +2361,88 @@ img#persona_signin { } /** bottom left of button **/ - &.align-tl-bl {top: 100%;left: 0;margin-top: 4px;} - &.align-tr-bl {top: 100%;right: 100%;} - &.align-bl-bl {bottom: 100%;left: 0;} - &.align-br-bl {bottom: 100%;right: 100%;} + &.align-tl-bl { + top: 100%; + left: 0; + margin-top: 4px; + } + &.align-tr-bl { + top: 100%; + right: 100%; + } + &.align-bl-bl { + bottom: 100%; + left: 0; + } + &.align-br-bl { + bottom: 100%; + right: 100%; + } /** bottom right of button **/ - &.align-tl-br {top: 100%;left: 100%;} - &.align-tr-br {top: 100%;right: 0;margin-top: 4px;} - &.align-bl-br {bottom: 100%;left: 100%;} - &.align-br-br {bottom: 100%;right: 0;} + &.align-tl-br { + top: 100%; + left: 100%; + } + &.align-tr-br { + top: 100%; + right: 0; + margin-top: 4px; + } + + &.align-bl-br { + bottom: 100%; + left: 100%; + } + + &.align-br-br { + bottom: 100%; + right: 0; + } /** top left of button **/ - &.align-tl-tl {top: 0;left: 0;} - &.align-tr-tl {top: 0;right: 100%;margin-right: 4px;} - &.align-bl-tl {bottom: 100%;left: 0;margin-bottom: 4px;} - &.align-br-tl {bottom: 100%;right: 100%;} + &.align-tl-tl { + top: 0; + left: 0; + } + + &.align-tr-tl { + top: 0; + right: 100%; + margin-right: 4px; + } + + &.align-bl-tl { + bottom: 100%; + left: 0; + margin-bottom: 4px; + } + + &.align-br-tl { + bottom: 100%; + right: 100%; + } /** top right of button **/ - &.align-tl-tr {top: 0;left: 100%;margin-left: 4px;} - &.align-tr-tr {top: 0;right: 0;} - &.align-bl-tr {bottom: 100%;left: 100%;} - &.align-br-tr {bottom: 100%;right: 0;margin-bottom: 4px;} + &.align-tl-tr { + top: 0; + left: 100%; + margin-left: 4px; + } + + &.align-tr-tr { + top: 0; + right: 0; + } + + &.align-bl-tr { + bottom: 100%; + left: 100%; + } + + &.align-br-tr { + bottom: 100%; + right: 0; + margin-bottom: 4px; + } + } /** no wrap is set - prevent menu items from wrapping **/ &.nowrap-items .menu > li { @@ -2407,25 +2470,85 @@ img#persona_signin { } /** bottom left of button **/ - &.align-tl-bl {left: auto; right: 0;} - &.align-tr-bl {right: auto; left: 100%;} - &.align-bl-bl {left: auto; right: 0;} - &.align-br-bl {right: auto; left: 100%;} + &.align-tl-bl { + left: auto; + right: 0; + } + + &.align-tr-bl { + right: auto; + left: 100%; + } + + &.align-bl-bl { + left: auto; + right: 0; + } + + &.align-br-bl { + right: auto; + left: 100%; + } /** bottom right of button **/ - &.align-tl-br {left: auto; right: 100%;} - &.align-tr-br {right: auto; left: 0;} - &.align-bl-br {left: auto; right: 100%;} - &.align-br-br {right: auto; left: 0;} + &.align-tl-br { + left: auto; + right: 100%; + } + + &.align-tr-br { + right: auto; + left: 0; + } + + &.align-bl-br { + left: auto; + right: 100%; + } + + &.align-br-br { + right: auto; + left: 0; + } /** top left of button **/ - &.align-tl-tl {left: auto; right: 0;} - &.align-tr-tl {right: auto; left: 100%;} - &.align-bl-tl {left: auto; right: 0;} - &.align-br-tl {right: auto; left: 100%;} + &.align-tl-tl { + left: auto; + right: 0; + } + + &.align-tr-tl { + right: auto; + left: 100%; + } + + &.align-bl-tl { + left: auto; + right: 0; + } + + &.align-br-tl { + right: auto; + left: 100%; + } /** top right of button **/ - &.align-tl-tr {left: auto; right: 100%;} - &.align-tr-tr {right: auto; left: 0;} - &.align-bl-tr {left: auto; right: 100%;} - &.align-br-tr {right: auto; left: 0;} + &.align-tl-tr { + left: auto; + right: 100%; + } + + &.align-tr-tr { + right: auto; + left: 0; + } + + &.align-bl-tr { + left: auto; + right: 100%; + } + + &.align-br-tr { + right: auto; + left: 0; + } } } .block .moodle-actionmenu { diff --git a/theme/bootstrapbase/less/moodle/course.less b/theme/bootstrapbase/less/moodle/course.less index 1b144f2522e77..4e23297e1d6b5 100644 --- a/theme/bootstrapbase/less/moodle/course.less +++ b/theme/bootstrapbase/less/moodle/course.less @@ -945,7 +945,9 @@ span.editinstructions { padding-left: 1rem; } .moodle-actionmenu:not([data-enhanced]) { - li {line-height: normal;} + li { + line-height: normal; + } > .menubar a { color: inherit; display: inline-block; @@ -990,14 +992,37 @@ span.editinstructions { } // Tree item indenting to represent depth. - .tree-icon {margin-left: 0;} - li .tree-icon {margin-left: 1em;} - li li .tree-icon {margin-left: 2em;} - li li li .tree-icon {margin-left: 3em;} - li li li li .tree-icon {margin-left: 4em;} - li li li li li .tree-icon {margin-left: 4.5em;} - li li li li li li .tree-icon {margin-left: 5em;} - li li li li li li li .tree-icon {margin-left: 5.5em;} + .tree-icon { + margin-left: 0; + } + + li .tree-icon { + margin-left: 1em; + } + + li li .tree-icon { + margin-left: 2em; + } + + li li li .tree-icon { + margin-left: 3em; + } + + li li li li .tree-icon { + margin-left: 4em; + } + + li li li li li .tree-icon { + margin-left: 4.5em; + } + + li li li li li li .tree-icon { + margin-left: 5em; + } + + li li li li li li li .tree-icon { + margin-left: 5.5em; + } } .item-actions { @@ -1233,14 +1258,37 @@ span.editinstructions { } // Tree item indenting to represent depth. - .tree-icon {margin-right: 0;} - li .tree-icon {margin-right: 1em;} - li li .tree-icon {margin-right: 2em;} - li li li .tree-icon {margin-right: 3em;} - li li li li .tree-icon {margin-right: 4em;} - li li li li li .tree-icon {margin-right: 4.5em;} - li li li li li li .tree-icon {margin-right: 5em;} - li li li li li li li .tree-icon {margin-right: 5.5em;} + .tree-icon { + margin-right: 0; + } + + li .tree-icon { + margin-right: 1em; + } + + li li .tree-icon { + margin-right: 2em; + } + + li li li .tree-icon { + margin-right: 3em; + } + + li li li li .tree-icon { + margin-right: 4em; + } + + li li li li li .tree-icon { + margin-right: 4.5em; + } + + li li li li li li .tree-icon { + margin-right: 5em; + } + + li li li li li li li .tree-icon { + margin-right: 5.5em; + } } #category-listing { .listitem { diff --git a/theme/bootstrapbase/less/moodle/modules.less b/theme/bootstrapbase/less/moodle/modules.less index 6588a46f213f4..eb72a5609cb47 100644 --- a/theme/bootstrapbase/less/moodle/modules.less +++ b/theme/bootstrapbase/less/moodle/modules.less @@ -302,9 +302,15 @@ div#dock { .path-mod-survey { .surveytable { - > tbody > tr:nth-of-type(odd) {background-color: @tableBackground;} - > tbody > tr:nth-of-type(even) {background-color: @tableBackgroundAccent;} - .rblock label {text-align: center;} + > tbody > tr:nth-of-type(odd) { + background-color: @tableBackground; + } + > tbody > tr:nth-of-type(even) { + background-color: @tableBackgroundAccent; + } + .rblock label { + text-align: center; + } } .resultgraph, .reportsummary,