From 02b072545676fe18db3bf9f2b7fe9bc8c1d8b3a4 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 10 Jun 2014 10:18:18 -0400 Subject: [PATCH] correcting for Bourbon deprecated inline-block() mixin --- .../lib/xmodule/xmodule/css/capa/display.scss | 24 ++++---- .../css/combinedopenended/display.scss | 58 +++++++++---------- .../xmodule/xmodule/css/sequence/display.scss | 2 +- lms/static/sass/course/_info.scss | 6 +- .../sass/course/_open_ended_grading.scss | 6 +- lms/static/sass/course/_profile.scss | 8 +-- .../sass/course/courseware/_amplifier.scss | 10 ++-- .../sass/course/layout/_calculator.scss | 2 +- .../course/layout/_courseware_header.scss | 4 +- lms/static/sass/course/wiki/_wiki.scss | 2 +- lms/static/sass/multicourse/_about_pages.scss | 4 +- .../sass/multicourse/_course_about.scss | 20 +++---- lms/static/sass/multicourse/_courses.scss | 6 +- lms/static/sass/multicourse/_dashboard.scss | 2 +- lms/static/sass/multicourse/_home.scss | 4 +- lms/static/sass/shared/_header.scss | 10 ++-- lms/static/sass/shared/_modal.scss | 2 +- 17 files changed, 85 insertions(+), 85 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss index a4dbf8698b..e81d0c68c2 100644 --- a/common/lib/xmodule/xmodule/css/capa/display.scss +++ b/common/lib/xmodule/xmodule/css/capa/display.scss @@ -156,7 +156,7 @@ div.problem { &.unanswered { p.status { - @include inline-block(); + display: inline-block; width: 14px; height: 14px; background: url('../images/unanswered-icon.png') center center no-repeat; @@ -165,7 +165,7 @@ div.problem { &.correct, &.ui-icon-check { p.status { - @include inline-block(); + display: inline-block; width: 25px; height: 20px; background: url('../images/correct-icon.png') center center no-repeat; @@ -178,7 +178,7 @@ div.problem { &.processing { p.status { - @include inline-block(); + display: inline-block; width: 20px; height: 20px; background: url('../images/spinner.gif') center center no-repeat; @@ -191,7 +191,7 @@ div.problem { &.incorrect, &.incomplete, &.ui-icon-close { p.status { - @include inline-block(); + display: inline-block; width: 20px; height: 20px; background: url('../images/incorrect-icon.png') center center no-repeat; @@ -209,7 +209,7 @@ div.problem { } p.answer { - @include inline-block(); + display: inline-block; margin-bottom: 0; margin-left: $baseline/2; @@ -244,7 +244,7 @@ div.problem { margin-bottom: 0; &.math { - @include inline-block; + display: inline-block; padding: 6px; min-width: 30px; border: 1px solid #e3e3e3; @@ -256,7 +256,7 @@ div.problem { span { &.unanswered, &.ui-icon-bullet { - @include inline-block(); + display: inline-block; position: relative; top: 4px; width: 14px; @@ -265,7 +265,7 @@ div.problem { } &.processing, &.ui-icon-processing { - @include inline-block(); + display: inline-block; position: relative; top: 6px; width: 25px; @@ -274,7 +274,7 @@ div.problem { } &.correct, &.ui-icon-check { - @include inline-block(); + display: inline-block; position: relative; top: 3px; width: 25px; @@ -283,7 +283,7 @@ div.problem { } &.partially-correct { - @include inline-block(); + display: inline-block; position: relative; top: 6px; width: 25px; @@ -292,7 +292,7 @@ div.problem { } &.incorrect, &.incomplete, &.ui-icon-close { - @include inline-block(); + display: inline-block; position: relative; top: 3px; width: 20px; @@ -623,7 +623,7 @@ div.problem { // border-radius: 3px; // padding: 8px 12px; // margin-top: 10px; - @include inline-block; + display: inline-block; margin: 8px 0 0 $baseline/2; color: #777; font-style: italic; diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss index cab22d4b7c..b84417bfaf 100644 --- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss +++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss @@ -22,7 +22,7 @@ h2 { // Problem Header div.name{ padding-bottom: 15px; - + h2 { display: inline; } @@ -40,7 +40,7 @@ div.name{ section.combined-open-ended { @include clearfix; - + .written-feedback { position: relative; margin: 0px; @@ -50,7 +50,7 @@ section.combined-open-ended { resize: vertical; width: 99%; overflow: auto; - + .del { text-decoration: line-through; background-color: #ffc3c3; @@ -69,7 +69,7 @@ div.problemwrapper { .status-bar { background-color: #eee; border-radius: $baseline/2 $baseline/2 0 0; - border-bottom: 1px solid lightgray; + border-bottom: 1px solid lightgray; .statustable { width: 100%; @@ -155,7 +155,7 @@ section.combined-open-ended-status { &:only-child { border-radius: $baseline/4; } - + .show-results { margin-top: .3em; text-align:right; @@ -168,12 +168,12 @@ section.combined-open-ended-status { .statusitem-current { background-color: #fff; - color: #222; + color: #222; } span { &.unanswered { - @include inline-block(); + display: inline-block; position: relative; float: right; width: 14px; @@ -182,7 +182,7 @@ section.combined-open-ended-status { } &.correct { - @include inline-block(); + display: inline-block; position: relative; float: right; width: 25px; @@ -191,7 +191,7 @@ section.combined-open-ended-status { } &.incorrect { - @include inline-block(); + display: inline-block; position: relative; float: right; width: 20px; @@ -212,14 +212,14 @@ section.combined-open-ended-status { .visibility-control, .visibility-control-prompt { display: block; width: 100%; - height: 40px; + height: 40px; .inner { float: left; margin-top: $baseline; width: 85%; height: 5px; - border-top: 1px dotted #ddd; + border-top: 1px dotted #ddd; } } @@ -234,7 +234,7 @@ section.combined-open-ended-status { // Rubric Styling -.wrapper-score-selection { +.wrapper-score-selection { display: table-cell; padding: 0 $baseline/2; width: 20px; @@ -277,7 +277,7 @@ div.combined-rubric-container { margin: 0 $baseline $baseline/2 $baseline; padding: 0; list-style-type: none; - + li { &.rubric-list-item { @@ -325,7 +325,7 @@ div.combined-rubric-container { padding: 5px; } } - + div.result-container { padding-top: $baseline/2; padding-bottom: $baseline/4; @@ -343,7 +343,7 @@ div.result-container { .evaluation-response { margin-bottom: 2px; - + header { a { font-size: .85em; @@ -403,7 +403,7 @@ div.result-container { margin: $baseline/4; padding: $baseline/2 $baseline/2 $baseline/2 $baseline*2; background: url('../images/incorrect-icon.png') center left no-repeat; - + li { color: #B00; } @@ -481,7 +481,7 @@ div.rubric { background-color: #eee; } - .wrapper-score-selection { + .wrapper-score-selection { display: table-cell; padding: 0 $baseline/2; width: 20px; @@ -561,7 +561,7 @@ section.open-ended-child { div.unanswered { p.status { - @include inline-block(); + display: inline-block; width: 14px; height: 14px; background: url('../images/unanswered-icon.png') center center no-repeat; @@ -570,7 +570,7 @@ section.open-ended-child { div.correct, div.ui-icon-check { p.status { - @include inline-block(); + display: inline-block; width: 25px; height: 20px; background: url('../images/correct-icon.png') center center no-repeat; @@ -583,7 +583,7 @@ section.open-ended-child { div.processing { p.status { - @include inline-block(); + display: inline-block; width: 20px; height: 20px; background: url('../images/spinner.gif') center center no-repeat; @@ -596,7 +596,7 @@ section.open-ended-child { div.incorrect, div.ui-icon-close { p.status { - @include inline-block(); + display: inline-block; width: 20px; height: 20px; background: url('../images/incorrect-icon.png') center center no-repeat; @@ -614,7 +614,7 @@ section.open-ended-child { } p.answer { - @include inline-block(); + display: inline-block; margin-bottom: 0; margin-left: $baseline/2; @@ -633,7 +633,7 @@ section.open-ended-child { span { &.unanswered, &.ui-icon-bullet { - @include inline-block(); + display: inline-block; position: relative; top: 4px; width: 14px; @@ -642,7 +642,7 @@ section.open-ended-child { } &.processing, &.ui-icon-processing { - @include inline-block(); + display: inline-block; position: relative; top: 6px; width: 25px; @@ -651,7 +651,7 @@ section.open-ended-child { } &.correct, &.ui-icon-check { - @include inline-block(); + display: inline-block; position: relative; top: 6px; width: 25px; @@ -660,7 +660,7 @@ section.open-ended-child { } &.incorrect, &.ui-icon-close { - @include inline-block(); + display: inline-block; position: relative; top: 6px; width: 20px; @@ -826,7 +826,7 @@ section.open-ended-child { } .submission_feedback { - @include inline-block; + display: inline-block; margin: 8px 0 0 $baseline/2; color: #777; font-style: italic; @@ -944,7 +944,7 @@ section.open-ended-child { margin: $baseline/2; } .reset-button { - vertical-align: middle; + vertical-align: middle; } } @@ -959,7 +959,7 @@ section.open-ended-child { .staff-grading { - .breadcrumbs { + .breadcrumbs { padding: $baseline/10; background-color: #f6f6f6; border-radius: 5px; diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index 90ab82feb9..3e696b37e4 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -331,7 +331,7 @@ nav.sequence-bottom { ul { @include clearfix(); - @include inline-block(); + display: inline-block; li { float: left; diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index d2f1791f61..eaea329131 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -137,7 +137,7 @@ div.info-wrapper { &.multiple { a { - @include inline-block; + display: inline-block; padding: 0; &:hover, &:focus { @@ -158,7 +158,7 @@ div.info-wrapper { padding: 15px 30px; a { - @include inline-block; + display: inline-block; padding: 0; &:hover, &:focus { @@ -215,7 +215,7 @@ div.info-wrapper { &:before { color: #ccc; content: "•"; - @include inline-block(); + display: inline-block; padding-right: 8px; } diff --git a/lms/static/sass/course/_open_ended_grading.scss b/lms/static/sass/course/_open_ended_grading.scss index b95eca6b02..6207d63eb4 100644 --- a/lms/static/sass/course/_open_ended_grading.scss +++ b/lms/static/sass/course/_open_ended_grading.scss @@ -21,7 +21,7 @@ { margin: 10px; width: 30%; - @include inline-block; + display: inline-block; vertical-align: top; .notification-link { @@ -36,7 +36,7 @@ text-align: center; } } - .notification-title + .notification-title { text-transform: uppercase; background: $blue; @@ -53,7 +53,7 @@ { padding-top:5%; } - .alert-message + .alert-message { img { diff --git a/lms/static/sass/course/_profile.scss b/lms/static/sass/course/_profile.scss index 00615a07a6..fc1253f915 100644 --- a/lms/static/sass/course/_profile.scss +++ b/lms/static/sass/course/_profile.scss @@ -40,7 +40,7 @@ div#location_sub, div#language_sub { font-weight: bold; - @include inline-block(); + display: inline-block; form { width: 100%; @@ -235,17 +235,17 @@ h3 { font-size: em(14); - @include inline-block; + display: inline-block; } ol { list-style: none; margin: 0; padding: 0; - @include inline-block; + display: inline-block; li { - @include inline-block; + display: inline-block; font-size: em(14); font-weight: normal; padding-right: 1em; diff --git a/lms/static/sass/course/courseware/_amplifier.scss b/lms/static/sass/course/courseware/_amplifier.scss index 10e13a49b3..ae874e64f4 100644 --- a/lms/static/sass/course/courseware/_amplifier.scss +++ b/lms/static/sass/course/courseware/_amplifier.scss @@ -127,7 +127,7 @@ section.tool-wrapper { p { font-weight: bold; - @include inline-block(); + display: inline-block; margin: 0; text-shadow: 0 -1px 0 darken(#073642, 10%); -webkit-font-smoothing: antialiased; @@ -135,11 +135,11 @@ section.tool-wrapper { } ul { - @include inline-block(); + display: inline-block; margin-bottom: 0; li { - @include inline-block(); + display: inline-block; margin-bottom: 0; input { @@ -199,13 +199,13 @@ section.tool-wrapper { select#musicTypeSelect { font: 16px $body-font-family; - @include inline-block(); + display: inline-block; margin-bottom: 0; } p { font-weight: bold; - @include inline-block(); + display: inline-block; margin: 0 lh(.5) lh() 0; color: #839496; text-shadow: 0 -1px 0 darken(#073642, 10%); diff --git a/lms/static/sass/course/layout/_calculator.scss b/lms/static/sass/course/layout/_calculator.scss index 862be430a8..cd767b32f9 100644 --- a/lms/static/sass/course/layout/_calculator.scss +++ b/lms/static/sass/course/layout/_calculator.scss @@ -19,7 +19,7 @@ div.calc-main { float: right; height: 20px; @include hide-text; - @include inline-block; + display: inline-block; margin-right: 10px; padding: 8px 12px; position: relative; diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss index 1f285cf78c..7b60475182 100644 --- a/lms/static/sass/course/layout/_courseware_header.scss +++ b/lms/static/sass/course/layout/_courseware_header.scss @@ -26,7 +26,7 @@ nav.course-material { &.prominent { margin-right: 16px; background: rgba(255, 255, 255, .5); - border-radius: 3px; + border-radius: 3px; } &.prominent + li { @@ -98,7 +98,7 @@ header.global.slim { font-family: $sans-serif; font-size: 14px; font-weight: bold; - @include inline-block; + display: inline-block; letter-spacing: 0; line-height: 1em; margin: 4px; diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss index ed7cfd639d..c4f45cb4bb 100644 --- a/lms/static/sass/course/wiki/_wiki.scss +++ b/lms/static/sass/course/wiki/_wiki.scss @@ -793,7 +793,7 @@ section.wiki { @include clearfix; a { - @include inline-block; + display: inline-block; } } diff --git a/lms/static/sass/multicourse/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss index 6c0970586e..c2799e6d4d 100644 --- a/lms/static/sass/multicourse/_about_pages.scss +++ b/lms/static/sass/multicourse/_about_pages.scss @@ -17,7 +17,7 @@ color: $lighter-base-font-color; font-family: $serif; font-style: italic; - @include inline-block; + display: inline-block; letter-spacing: 1px; margin: 0px 15px; padding: 20px 10px; @@ -53,7 +53,7 @@ width: flex-grid(3); > img { - @include inline-block; + display: inline-block; margin-top: 26px; max-height: 60px; } diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index f3690175b0..b6188b300e 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -53,7 +53,7 @@ h1 { color: $base-font-color; font-weight: normal; - @include inline-block; + display: inline-block; margin: 0; letter-spacing: 0px; text-align: left; @@ -74,7 +74,7 @@ } h2 { - @include inline-block; + display: inline-block; margin: 0; a { @@ -233,14 +233,14 @@ .container { @include clearfix; - + .wrap-instructor-info { &.studio-view { position: relative; margin: ($baseline/2) 0 0 0; overflow: hidden; } - + .instructor-info-action { @extend %t-copy-sub2; float: right; @@ -250,14 +250,14 @@ text-align: right; text-transform: uppercase; color: $lighter-base-font-color; - + &:hover { background-color: $link-hover; color: $white; } } } - + nav { border-bottom: 1px solid $border-color-2; @include box-sizing(border-box); @@ -274,7 +274,7 @@ a { border-bottom: 3px solid transparent; color: $lighter-base-font-color; - @include inline-block; + display: inline-block; letter-spacing: 1px; margin: 0 15px; padding: 0px 5px 15px; @@ -299,7 +299,7 @@ margin-right: flex-gutter(); width: flex-grid(8); font: normal 1em/1.6em $serif; - + h2 { margin-top: ($baseline*1.5); } @@ -444,7 +444,7 @@ font-family: $sans-serif; font-style: italic; font-weight: 800; - @include inline-block; + display: inline-block; letter-spacing: 0px; margin-right: 15px; padding-right: 15px; @@ -501,7 +501,7 @@ .share { height: 44px; - @include inline-block; + display: inline-block; margin-right: 10px; opacity: 0.5; @include transition(all 0.15s linear 0s); diff --git a/lms/static/sass/multicourse/_courses.scss b/lms/static/sass/multicourse/_courses.scss index aca101fb86..fe4c4d62a1 100644 --- a/lms/static/sass/multicourse/_courses.scss +++ b/lms/static/sass/multicourse/_courses.scss @@ -37,11 +37,11 @@ text-align: center; hgroup { - @include inline-block; + display: inline-block; } .logo { - @include inline-block; + display: inline-block; height: 80px; margin-right: 30px; padding-right: 30px; @@ -73,7 +73,7 @@ } h1, h2 { - @include inline-block; + display: inline-block; letter-spacing: 1px; margin-bottom: 0px; text-shadow: 0 1px rgba(255,255,255, 0.8); diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 6f975475ca..28ecfa04be 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -330,7 +330,7 @@ @include box-sizing(border-box); color: $base-font-color; font-family: $sans-serif; - @include inline-block; + display: inline-block; letter-spacing: 1px; margin-left: 5px; padding: 5px 10px; diff --git a/lms/static/sass/multicourse/_home.scss b/lms/static/sass/multicourse/_home.scss index 2019122293..310bb2c50d 100644 --- a/lms/static/sass/multicourse/_home.scss +++ b/lms/static/sass/multicourse/_home.scss @@ -51,7 +51,7 @@ > hgroup { @include box-sizing(border-box); - @include inline-block; + display: inline-block; left: 0px; opacity: 1.0; padding: 20px 30px; @@ -222,7 +222,7 @@ text-align: center; li.partner { - @include inline-block; + display: inline-block; padding: 0px 30px; position: relative; vertical-align: middle; diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index 2e3a379d50..1d55a4b25a 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -36,7 +36,7 @@ header.global { } > li { - @include inline-block; + display: inline-block; margin-right: 20px; position: relative; vertical-align: middle; @@ -56,7 +56,7 @@ header.global { color: $link-color; display: block; font-family: $sans-serif; - @include inline-block; + display: inline-block; margin: 0px 30px 0px 0px; text-decoration: none; text-transform: uppercase; @@ -85,7 +85,7 @@ header.global { color: $base-font-color; display: inline-block; font-family: $sans-serif; - @include inline-block; + display: inline-block; line-height: 1em; margin: 1px 5px; padding: 10px 12px; @@ -123,7 +123,7 @@ header.global { border-radius: 0 4px 4px 0; border-left: none; padding: 5px 8px 7px 8px; - + &.shopping-cart { border-radius: 4px; border: 1px solid $border-color-2; @@ -146,7 +146,7 @@ header.global { @include background-image(url('../images/small-header-home-icon.png')); background-repeat: no-repeat; height: 26px; - @include inline-block; + display: inline-block; left: 8px; opacity: 0.5; overflow: hidden; diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss index 8c97b57f66..ddf9621c1d 100644 --- a/lms/static/sass/shared/_modal.scss +++ b/lms/static/sass/shared/_modal.scss @@ -277,7 +277,7 @@ .close-modal { border-radius: 2px; cursor: pointer; - @include inline-block; + display: inline-block; padding: 10px; position: absolute; right: 2px;