Skip to content

GitLab

Commit 9cb41231 authored by Dan Poltawski's avatar Dan Poltawski
Browse files

MDL-55071 theme_boost: fix indentation in scss files 

Part of MDL-55071
parent 773e68b0
Hide whitespace changes
Inline Side-by-side
theme/boost/scss/moodle/calendar.scss
View file @ 9cb41231
......@@ -292,12 +292,12 @@ $calendarEventUserColor: #dce7ec; // Pale blue.
//background-color: $grayLighter;
//border: 1px solid $grayLighter;
.yui3-overlay-content {
@extend .card;
// padding: 19px;
// background-color: lighten($wellBackground, 3%);
// border: 1px solid darken($wellBackground, 7%);
// @include border-radius($baseBorderRadius);
// @include box-shadow(inset 0 1px 1px rgba(0 ,0 ,0 , .05));
@extend .card;
// padding: 19px;
// background-color: lighten($wellBackground, 3%);
// border: 1px solid darken($wellBackground, 7%);
// @include border-radius($baseBorderRadius);
// @include box-shadow(inset 0 1px 1px rgba(0 ,0 ,0 , .05));
h2 {
&.eventtitle {
line-height: 1.2;
......
theme/boost/scss/moodle/core.scss
View file @ 9cb41231
......@@ -946,12 +946,12 @@ tr.flagged-tag a {
margin-bottom: 0;
}
}
.user-enroller-panel .uep-search-results .user .details {
width: 237px;
}
.user-enroller-panel .uep-search-results .cohort .details {
width: 237px;
}
.user-enroller-panel .uep-search-results .user .details {
width: 237px;
}
.user-enroller-panel .uep-search-results .cohort .details {
width: 237px;
}
}
#page-enrol-users .enrol-users-page-action input {
margin-left: 0
......@@ -978,21 +978,21 @@ tr.flagged-tag a {
display: table-cell;
}
.label .mod-indent {
float:left;
padding-top:20px
float:left;
padding-top:20px
}
$mod-indent-size: 30px;
/* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
@for $i from 1 through 16 {
$width: ($i * $mod-indent-size);
$width: ($i * $mod-indent-size);
.mod-indent-#{$i} {
width: $width;
}
.mod-indent-#{$i} {
width: $width;
}
}
.mod-indent-huge {
width: (16 * $mod-indent-size);
width: (16 * $mod-indent-size);
}
/* Audio player size in 'block' mode (can only change width, height is hardcoded in JS) */
......@@ -1333,7 +1333,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
/* The instruction/help area */
.jschooser .choosercontainer #chooseform .instruction,
.jschooser .choosercontainer #chooseform .typesummary {
display: none;
display: none;
position: absolute;
top: 0;
right: 0;
......@@ -1738,8 +1738,8 @@ a.disabled {
color: #808080;
}
body.lockscroll {
height: 100%;
overflow: hidden;
height: 100%;
overflow: hidden;
}
.progressbar_container {
......@@ -1754,11 +1754,11 @@ body.lockscroll {
dd:before,
dd:after {
display: block;
content: " ";
display: block;
content: " ";
}
dd:after {
clear: both;
clear: both;
}
// Active tabs with links should have a different
......
theme/boost/scss/moodle/course.scss
View file @ 9cb41231
......@@ -99,17 +99,17 @@
}
}
.label {
.contentwithoutlink,
.activityinstance {
padding-right: 32px;
display: block;
height: inherit;
}
.contentwithoutlink,
.activityinstance {
padding-right: 32px;
display: block;
height: inherit;
}
.mod-indent-outer {
padding-left: 24px;
display: block;
}
.mod-indent-outer {
padding-left: 24px;
display: block;
}
}
.filler {
......@@ -832,7 +832,7 @@ span.editinstructions {
}
> .firstpage .listitem:first-child > div .item-actions .action-moveup,
> .lastpage .listitem:last-child > div .item-actions .action-movedown {
display: none;
display: none;
}
.bulk-action-checkbox {
margin:-2px 6px 0 0;
......@@ -861,7 +861,7 @@ span.editinstructions {
}
&:first-child > div .item-actions .action-moveup,
&:last-child > div .item-actions .action-movedown {
display: none;
display: none;
}
}
.course-count {
......@@ -955,9 +955,9 @@ span.editinstructions {
float:right;
line-height:40px;
> div {
margin-left:1em;
margin: 10px 0;
display:inline-block;
margin-left:1em;
margin: 10px 0;
display:inline-block;
}
}
select {
......
theme/boost/scss/moodle/expendable.scss
View file @ 9cb41231
......@@ -44,26 +44,26 @@ table#permissions {
// language editing progress bar
// copied in because the styles are set on the HTML
div[id^="bar_pbar_"] {
overflow: hidden !important;
height: $line-height-base !important;
margin-bottom: $line-height-base !important;
@include gradient-y(#f5f5f5, #f9f9f9);
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
@include border-radius($border-radius);
border: none !important;
overflow: hidden !important;
height: $line-height-base !important;
margin-bottom: $line-height-base !important;
@include gradient-y(#f5f5f5, #f9f9f9);
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
@include border-radius($border-radius);
border: none !important;
}
div[id^="progress_pbar_"] {
height: 100% !important;
color: $body-bg !important;
float: left !important;
font-size: 12px !important;
text-align: center !important;
text-shadow: 0 -1px 0 rgba(0,0,0,.25) !important;
@include gradient-y(#149bdf, #0480be);
@include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
@include transition(width .6s ease);
padding-top: 0 !important;
border: none !important;
height: 100% !important;
color: $body-bg !important;
float: left !important;
font-size: 12px !important;
text-align: center !important;
text-shadow: 0 -1px 0 rgba(0,0,0,.25) !important;
@include gradient-y(#149bdf, #0480be);
@include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
@include transition(width .6s ease);
padding-top: 0 !important;
border: none !important;
}
// colored buttons
input.form-submit,
......
theme/boost/scss/moodle/filemanager.scss
View file @ 9cb41231
// File Picker and File Manager
// File Picker and File Manager
.fp-content-center {
height: 100%;
width: 100%;
......
theme/boost/scss/moodle/grade.scss
View file @ 9cb41231
......@@ -307,7 +307,7 @@
cursor: pointer;
}
}
}
}
/**
* User report.
......
theme/boost/scss/moodle/message.scss
View file @ 9cb41231
......@@ -228,7 +228,7 @@ table.message .searchresults td {
margin-left: 20px;
}
.message .messagearea .messagehistory .messageactive {
background-color: $table-bg-hover;
background-color: $table-bg-hover;
}
.message .messagearea .messagesend {
padding-top: 20px;
......@@ -316,7 +316,7 @@ table.message .searchresults td {
.message-input {
width: 100%;
height: 100%;
// @include box-sizing(border-box);
// @include box-sizing(border-box);
}
.message-send {
margin: 0;
......
theme/boost/scss/moodle/modules.scss
View file @ 9cb41231
......@@ -128,7 +128,7 @@ select {
// Override hardcoded forum modules styling
.forumsearch input[type=text] {
margin-bottom: 0 !important;
margin-bottom: 0 !important;
}
#page-mod-forum-discuss .discussioncontrols {
......@@ -233,8 +233,8 @@ div#dock {
.path-mod-survey {
.surveytable {
> tbody > tr:nth-of-type(odd) {background-color: $table-bg;}
> tbody > tr:nth-of-type(even) {background-color: $table-bg-accent;}
> tbody > tr:nth-of-type(odd) {background-color: $table-bg;}
> tbody > tr:nth-of-type(even) {background-color: $table-bg-accent;}
.rblock label {text-align: center;}
}
.resultgraph, .reportsummary, .studentreport, .reportbuttons, .centerpara {
......@@ -251,18 +251,18 @@ div#dock {
.divider {
overflow: hidden;
width: 0;
// height: $navbarHeight;
// border-left: 1px solid $navbarBackground;
// border-right: 1px solid $navbarBackgroundHighlight;
// height: $navbarHeight;
// border-left: 1px solid $navbarBackground;
// border-right: 1px solid $navbarBackgroundHighlight;
}
}
//.navbar-inverse {
// .nav {
// .divider {
// border-left-color: $navbarInverseBackground;
// border-right-color: lighten($navbarInverseBackground, 25%);
// }
// }
// .divider {
// border-left-color: $navbarInverseBackground;
// border-right-color: lighten($navbarInverseBackground, 25%);
// }
// }
//}
// Usermenu
......@@ -557,9 +557,9 @@ div#dock {
top: auto;
}
.path-mod-assign [data-region="grade-panel"] .has-popout {
background-color: $card-bg;
@include border-radius($card-border-radius);
border: $card-border-width solid $card-border-color;
background-color: $card-bg;
@include border-radius($card-border-radius);
border: $card-border-width solid $card-border-color;
}
.path-mod-assign [data-region="grade-panel"] .popout {
background-color: $modal-content-bg;
......
theme/boost/scss/moodle/question.scss
View file @ 9cb41231
......@@ -79,9 +79,9 @@
overflow-y: auto;
max-height: 400px;
max-height: calc(100vh - 15em);
/* The next line is a workaround because recess is crap. Delete ththe following line once
* https://github.com/twitter/recess/issues/59 / https://github.com/twitter/recess/issues/75
* is fixed. The previous line is the right one. */
/* The next line is a workaround because recess is crap. Delete ththe following line once
* https://github.com/twitter/recess/issues/59 / https://github.com/twitter/recess/issues/75
* is fixed. The previous line is the right one. */
max-height: 60vh;
width: 60%;
}
......@@ -279,9 +279,9 @@ body.path-question-type .fitem_fgroup .accesshide {
border-color: $borderColor;
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus {
border-color: darken($borderColor, 10%);
$shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
@include box-shadow($shadow);
border-color: darken($borderColor, 10%);
$shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
@include box-shadow($shadow);
}
}
......@@ -296,15 +296,15 @@ body.path-question-type .fitem_fgroup .accesshide {
}
.formulation select.correct,
.formulation input.correct {
@include answerState($btn-success-color, $btn-success-bg);
@include answerState($btn-success-color, $btn-success-bg);
}
.formulation select.partiallycorrect,
.formulation input.partiallycorrect {
@include answerState($btn-warning-color, $btn-warning-bg);
@include answerState($btn-warning-color, $btn-warning-bg);
}
.formulation select.incorrect,
.formulation input.incorrect {
@include answerState($btn-danger-color, $btn-danger-bg);
@include answerState($btn-danger-color, $btn-danger-bg);
}
.que .grading,
......
theme/boost/scss/moodle/responsive.scss
View file @ 9cb41231
......@@ -125,8 +125,8 @@
.loginbox.twocolumns .loginpanel,
.loginbox.twocolumns .signuppanel {
width: 48.617948717948715%;
*width: 48.664757228587014%;
}
*width: 48.664757228587014%;
}
}
@media (min-width: 768px) and (max-width: 979px) {
......@@ -158,7 +158,7 @@
clear: both;
}
}
}
@media (max-width: 480px) {
// make tabs act like nav-stacked
......@@ -243,28 +243,28 @@
// Stuart's 2,1,3 layout
@media (min-width : 768px) {
.row-fluid .desktop-first-column {
margin-left: 0;
}
#page-navbar .breadcrumb-button {
display: inline;
}
.row-fluid .desktop-first-column {
margin-left: 0;
}
#page-navbar .breadcrumb-button {
display: inline;
}
}
@media (max-width : 767px) {
.row-fluid .desktop-first-column {
clear: both;
}
.row-fluid .desktop-first-column {
clear: both;
}
}
// Forms
@media (max-width: 767px) {
// Remove the horizontal form styles
// Remove the horizontal form styles
.form-item .form-label,
.mform .fitem div.fitemtitle {
// copied from .control-label {
float: none;
width: auto;
padding-top: 0;
text-align: left;
// copied from .control-label {
float: none;
width: auto;
padding-top: 0;
text-align: left;
}
.form-item .form-label label{
display: inline-block;
......@@ -281,7 +281,7 @@
.path-backup .mform .fitem .felement,
.mform .fdescription.required,
.form-item .form-description {
margin-left: 0;
margin-left: 0;
}
.form-buttons,
#fitem_id_submitbutton,
......@@ -289,8 +289,8 @@
#fgroup_id_buttonar,
.form-horizontal .form-actions,
.fitem_fsubmit .felement.fsubmit {
padding-left: 10px;
padding-right: 10px;
padding-left: 10px;
padding-right: 10px;
}
#helppopupbox {
width: auto !important;
......@@ -308,7 +308,7 @@
@media (max-width: 979px) {
.nav-collapse {
height: 0;
height: 0;
.nav > li > a {
color: $grayDark;
}
......@@ -500,22 +500,22 @@
}
@media (max-width: 767px) {
// Resize, reflow file-picker on small devices
#filesskin .yui3-panel,
#filesskin .file-picker.fp-generallayout {
// Resize, reflow file-picker on small devices
#filesskin .yui3-panel,
#filesskin .file-picker.fp-generallayout {
width: 100%;
left: 0;
}
.userprofile dl.list {
// copied from dl-horizontal in bootstrap/repsonsive.less
// copied from dl-horizontal in bootstrap/repsonsive.less
dt {
float: none;
clear: none;
width: auto;
text-align: left;
float: none;
clear: none;
width: auto;
text-align: left;
}
dd {
margin-left: 0;
margin-left: 0;
}
}
// Reset the alignment for required label to display inline on mobile devices
......@@ -523,33 +523,33 @@
float: left;
}
// GRID & CONTAINERS
// -----------------
// Remove width from containers
.container {
width: auto;
}
// Fluid rows
.row-fluid {
width: 100%;
}
.row-fluid .span8.pull-right,
.row-fluid .span9.pull-right {
float: none;
}
// Undo negative margin on rows and thumbnails
.row {
margin-left: 0;
}
// Make all grid-sized elements block level again
[class*="span"],
.row-fluid [class*="span"] {
float: none;
display: block;
width: 100%;
margin-left: 0;
@include box-sizing(border-box);
}
// GRID & CONTAINERS
// -----------------
// Remove width from containers
.container {
width: auto;
}
// Fluid rows
.row-fluid {
width: 100%;
}
.row-fluid .span8.pull-right,
.row-fluid .span9.pull-right {
float: none;
}
// Undo negative margin on rows and thumbnails
.row {
margin-left: 0;
}
// Make all grid-sized elements block level again
[class*="span"],
.row-fluid [class*="span"] {
float: none;
display: block;
width: 100%;
margin-left: 0;
@include box-sizing(border-box);
}
// We need to specify a more specific selector to reset the width for
// cases when we have content in the side-pre blockregion but not in the
......@@ -563,16 +563,16 @@
}
}
.row-fluid .span12 {
width: 100%;
@include box-sizing(border-box);
}
.row-fluid [class*="offset"]:first-child {
margin-left: 0;
}
div[role=main] {
margin-bottom: 1em;
}
.row-fluid .span12 {
width: 100%;
@include box-sizing(border-box);
}
.row-fluid [class*="offset"]:first-child {
margin-left: 0;
}
div[role=main] {
margin-bottom: 1em;
}
.coursebox {
.info {
.name {
......
theme/boost/scss/moodle/templates.scss
View file @ 9cb41231
// Style for template 3 columns auto.
.columns-autoflow-1to1to1 {
column-count: 3;
column-count: 3;
}
@media(max-width: 767px) {
// Change to a single column for smaller screens.
.columns-autoflow-1to1to1 {
column-count: 1;
}
// Change to a single column for smaller screens.
.columns-autoflow-1to1to1 {
column-count: 1;
}
}
theme/boost/scss/moodle/undo.scss
View file @ 9cb41231
......@@ -9,19 +9,19 @@
li.activity.label,
.file-picker td.label {
background: inherit;
color: inherit;
border: inherit;
text-shadow: none;
padding: 8px;
white-space: normal;
display: block;
font-size: inherit;
line-height: inherit;
background: inherit;
color: inherit;
border: inherit;
text-shadow: none;
padding: 8px;
white-space: normal;
display: block;
font-size: inherit;
line-height: inherit;
}
.file-picker td.label {
display: table-cell;
text-align: right;
display: table-cell;
text-align: right;
}
// Some of this dialog is sized in ems so a different font size
......@@ -56,8 +56,8 @@ li.activity.label,
li.section.hidden,
.block.hidden,
.block.invisible {
visibility: visible;
display: block;
visibility: visible;
display: block;
}
......@@ -72,14 +72,14 @@ li.section.hidden,
#turnitintool_style .row,
.forumpost .row {
margin-left: 0 !important;
// not sure if this needs !important
margin-left: 0 !important;