Skip to content

Commit

Permalink
MDL-55167 less: reformat one line statemets into multiple lines
Browse files Browse the repository at this point in the history
  • Loading branch information
@danpoltawski
danpoltawski committed Jul 30, 2016
1 parent c2d3fe2 commit 75b68df
Show file tree
Hide file tree
Showing 4 changed files with 268 additions and 63 deletions.
50 changes: 39 additions & 11 deletions theme/bootstrapbase/less/moodle/bootstrapoverride.less
View file
Expand Up @@ -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 {
Expand Down
187 changes: 155 additions & 32 deletions theme/bootstrapbase/less/moodle/core.less
View file
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
82 changes: 65 additions & 17 deletions theme/bootstrapbase/less/moodle/course.less
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
12 changes: 9 additions & 3 deletions theme/bootstrapbase/less/moodle/modules.less
View file
Expand Up @@ -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,
Expand Down

0 comments on commit 75b68df

Please sign in to comment.