Skip to content

E
edx-platform
Commit 41374838 by David Baumgold
Options

Changed `@include border-radius()` to `border-radius` 

The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
parent 13886841
Showing with 180 additions and 183 deletions
cms/static/sass/_base.scss
......@@ -591,7 +591,7 @@ hr.divide {
}
.window {
// @include border-radius(3px);
// border-radius: 3px;
// @include box-shadow(0 1px 1px $shadow-l1);
// margin-bottom: $baseline;
// border: 1px solid $gray-l2;
......
cms/static/sass/_mixins-inherited.scss
......@@ -108,8 +108,8 @@
// inherited - ui
.window {
@include clearfix();
@include border-radius(3px);
@include box-shadow(0 1px 1px $shadow-l1);
border-radius: 3px;
margin-bottom: $baseline;
border: 1px solid $gray-l2;
background: $white;
......
cms/static/sass/elements/_footer.scss
......@@ -44,7 +44,7 @@
}
a {
@include border-radius(2px);
border-radius: 2px;
padding: ($baseline/2) ($baseline*0.75);
background: transparent;
......
cms/static/sass/elements/_navigation.scss
......@@ -74,7 +74,7 @@ nav {
}
.nav-sub {
@include border-radius(2px);
border-radius: 2px;
@include box-sizing(border-box);
@include box-shadow(0 1px 1px $shadow-l1);
position: relative;
......
cms/static/sass/elements/_system-feedback.scss
......@@ -162,7 +162,7 @@
}
.prompt {
@include border-radius(($baseline/5));
border-radius: ($baseline/5);
@include box-shadow(0 0 3px $shadow-d1);
display: inline-block;
vertical-align: middle;
......
cms/static/sass/elements/_system-help.scss
......@@ -4,7 +4,7 @@
// notices - in-context: to be used as notices to users within the context of a form/action
.notice-incontext {
@extend .ui-well;
@include border-radius(($baseline/10));
border-radius: ($baseline/10);
.title {
@extend .t-title7;
......
cms/static/sass/elements/_tender-widget.scss
......@@ -7,7 +7,7 @@
}
#tender_window {
@include border-radius(3px);
border-radius: 3px;
@include box-shadow(0 2px 3px $shadow);
height: ($baseline*35) !important;
background: $white !important;
......
cms/static/sass/views/_account.scss
......@@ -58,7 +58,7 @@ body.signup, body.signin {
form {
@include box-sizing(border-box);
@include box-shadow(0 1px 2px $shadow-l1);
@include border-radius(2px);
border-radius: 2px;
width: 100%;
border: 1px solid $gray-l2;
padding: $baseline ($baseline*1.5);
......
cms/static/sass/views/_index.scss
......@@ -214,8 +214,8 @@ body.index {
.proofpoint {
@include box-sizing(border-box);
@include border-radius(($baseline/4));
@include transition(color .50s ease-in-out);
border-radius: ($baseline/4);
position: relative;
top: 0;
float: left;
......
cms/static/sass/views/_outline.scss
......@@ -36,7 +36,7 @@ body.course.outline {
display: none;
width: 110px;
padding: 5px 40px 5px 10px;
@include border-radius(3px);
border-radius: 3px;
color: $lightGrey;
text-align: right;
font-weight: bold;
......@@ -64,7 +64,7 @@ body.course.outline {
.menu {
@include font-size(12);
@include border-radius(4px);
border-radius: 4px;
@include box-shadow(0 1px 2px rgba(0, 0, 0, .2));
@include transition(opacity .15s);
z-index: 1;
......@@ -277,7 +277,7 @@ body.course.outline {
.section-published-date {
float: right;
@include border-radius(3px);
border-radius: 3px;
background: $lightGrey;
.published-status {
......@@ -312,7 +312,7 @@ body.course.outline {
.status-label {
@include font-size(12);
@include border-radius(3px);
border-radius: 3px;
position: absolute;
top: 0;
right: 2px;
......@@ -342,7 +342,7 @@ body.course.outline {
.menu {
@include font-size(12);
@include border-radius(4px);
border-radius: 4px;
@include box-shadow(0 1px 2px rgba(0, 0, 0, .2));
@include transition(opacity .15s);
@include transition(display .15s);
......@@ -542,7 +542,7 @@ body.course.outline {
[class^="icon-"] {
@include font-size(11);
@include border-radius(20px);
border-radius: 20px;
position: relative;
top: -1px;
display: inline-block;
......
cms/static/sass/views/_settings.scss
......@@ -214,7 +214,7 @@ body.course.settings {
.field-group {
@include box-sizing(border-box);
@include border-radius(3px);
border-radius: 3px;
background: $gray-l5;
padding: $baseline;
......@@ -295,7 +295,7 @@ body.course.settings {
// course link note
.note-promotion-courseURL {
@include box-shadow(0 2px 1px $shadow-l1);
@include border-radius(($baseline/5));
border-radius: ($baseline/5);
margin-top: ($baseline*1.5);
border: 1px solid $gray-l2;
padding: ($baseline/2) 0 0 0;
......@@ -410,7 +410,7 @@ body.course.settings {
.input-existing {
@include box-sizing(border-box);
@include border-radius(3px);
border-radius: 3px;
background: $gray-l5;
padding: ($baseline/2);
......@@ -555,7 +555,7 @@ body.course.settings {
top: 0;
height: 50px;
text-align: right;
@include border-radius(2px);
border-radius: 2px;
&:hover,
&.is-dragging {
......
cms/static/sass/views/_subsection.scss
......@@ -347,7 +347,7 @@ body.course.subsection {
background: $white;
border: 1px solid $mediumGrey;
font-size: 12px;
@include border-radius(4px);
border-radius: 4px;
@include box-shadow(0 1px 2px rgba(0, 0, 0, .2));
@include transition(opacity .15s);
......
common/lib/xmodule/xmodule/css/capa/display.scss
......@@ -111,7 +111,7 @@ section.problem {
background: #FFF;
position: relative;
@include box-shadow(inset 0 0 0 1px #eee);
@include border-radius(3px);
border-radius: 3px;
&:empty {
display: none;
......@@ -214,7 +214,7 @@ section.problem {
background: #f1f1f1;
border: 1px solid #e3e3e3;
@include inline-block;
@include border-radius(4px);
border-radius: 4px;
min-width: 30px;
}
}
......@@ -464,7 +464,7 @@ section.problem {
white-space: nowrap;
border: 1px solid #EAEAEA;
background-color: #F8F8F8;
@include border-radius(3px);
border-radius: 3px;
font-size: .9em;
}
......@@ -475,7 +475,7 @@ section.problem {
line-height: 1.4;
overflow: auto;
padding: 6px 10px;
@include border-radius(3px);
border-radius: 3px;
> code {
margin: 0;
......@@ -499,7 +499,7 @@ section.problem {
}
pre {
@include border-radius(0);
border-radius: 0;
border-radius: 0;
border-width: 0;
margin: 0;
......@@ -580,7 +580,7 @@ section.problem {
.submission_feedback {
// background: #F3F3F3;
// border: 1px solid #ddd;
// @include border-radius(3px);
// border-radius: 3px;
// padding: 8px 12px;
// margin-top: 10px;
@include inline-block;
......@@ -690,7 +690,7 @@ section.problem {
background: #FFF;
position: relative;
@include box-shadow(inset 0 0 0 1px #eee);
@include border-radius(3px);
border-radius: 3px;
p:last-of-type {
margin-bottom: 0;
......
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
......@@ -293,7 +293,7 @@ section.open-ended-child {
background: #FFF;
position: relative;
@include box-shadow(inset 0 0 0 1px #eee);
@include border-radius(3px);
border-radius: 3px;
&:empty {
display: none;
......@@ -649,7 +649,7 @@ section.open-ended-child {
input[type=radio]:checked + label {
background: #666;
color: white;
color: white;
}
input[class='grade-selection'] {
display: none;
......
common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
.crowdsource-wrapper {
@include box-shadow(inset 0 1px 2px 1px rgba(0,0,0,0.1));
@include border-radius(2px);
border-radius: 2px;
display: none;
margin-top: 20px;
padding: (15px);
......
common/lib/xmodule/xmodule/css/video/display.scss
......@@ -49,7 +49,7 @@ div.video {
@include clearfix();
background: #c2c2c2;
border: 1px solid #000;
@include border-radius(0);
border-radius: 0;
border-top: 1px solid #000;
@include box-shadow(inset 0 1px 0 #eee, 0 1px 0 #555);
height: 7px;
......@@ -66,7 +66,7 @@ div.video {
background: $pink url(../images/slider-handle.png) center center no-repeat;
@include background-size(50%);
border: 1px solid darken($pink, 20%);
@include border-radius(15px);
border-radius: 15px;
@include box-shadow(inset 0 1px 0 lighten($pink, 10%));
cursor: pointer;
height: 15px;
......@@ -322,7 +322,7 @@ div.video {
background: $pink url(../images/slider-handle.png) center center no-repeat;
@include background-size(50%);
border: 1px solid darken($pink, 20%);
@include border-radius(15px);
border-radius: 15px;
@include box-shadow(inset 0 1px 0 lighten($pink, 10%));
cursor: pointer;
height: 15px;
......@@ -426,7 +426,7 @@ div.video {
margin-top: -7px;
a.ui-slider-handle {
@include border-radius(20px);
border-radius: 20px;
height: 20px;
margin-left: -10px;
top: -4px;
......
common/lib/xmodule/xmodule/css/videoalpha/display.scss
......@@ -49,7 +49,7 @@ div.video {
@include clearfix();
background: #c2c2c2;
border: 1px solid #000;
@include border-radius(0);
border-radius: 0;
border-top: 1px solid #000;
@include box-shadow(inset 0 1px 0 #eee, 0 1px 0 #555);
height: 7px;
......@@ -66,7 +66,7 @@ div.video {
background: $pink url(../images/slider-handle.png) center center no-repeat;
@include background-size(50%);
border: 1px solid darken($pink, 20%);
@include border-radius(15px);
border-radius: 15px;
@include box-shadow(inset 0 1px 0 lighten($pink, 10%));
cursor: pointer;
height: 15px;
......@@ -322,7 +322,7 @@ div.video {
background: $pink url(../images/slider-handle.png) center center no-repeat;
@include background-size(50%);
border: 1px solid darken($pink, 20%);
@include border-radius(15px);
border-radius: 15px;
@include box-shadow(inset 0 1px 0 lighten($pink, 10%));
cursor: pointer;
height: 15px;
......@@ -426,7 +426,7 @@ div.video {
margin-top: -7px;
a.ui-slider-handle {
@include border-radius(20px);
border-radius: 20px;
height: 20px;
margin-left: -10px;
top: -4px;
......
common/static/sass/_mixins.scss
......@@ -140,11 +140,11 @@
// pill button
.btn-pill {
@include border-radius($baseline/5);
border-radius: ($baseline/5);
}
.btn-rounded {
@include border-radius($baseline/2);
border-radius: ($baseline/2);
}
// primary button
......
lms/static/sass/_discussion.scss
......@@ -95,7 +95,7 @@
body.discussion {
.new-post-form-errors {
display: none;
background: $error-red;
......@@ -490,7 +490,7 @@ body.discussion {
section.user-profile {
@extend .sidebar;
display: table-cell;
@include border-radius(3px 0 0 3px);
border-radius: 3px 0 0 3px;
border-right: 1px solid #ddd;
@include box-shadow(none);
background-color: $sidebar-color;
......@@ -548,7 +548,7 @@ body.discussion {
font-style: normal;
font-size: 0.8em;
line-height: 1.6em;
@include border-radius(3px 3px 0 0);
border-radius: 3px 3px 0 0;
&::-webkit-input-placeholder {
color: #888;
......@@ -563,7 +563,7 @@ body.discussion {
@include box-sizing(border-box);
border: 1px solid #c8c8c8;
border-top-width: 0;
@include border-radius(0 0 3px 3px);
border-radius: 0 0 3px 3px;
overflow: hidden;
@include transition(all, .2s, easeOut);
......@@ -1071,7 +1071,7 @@ body.discussion {
a {
display: block;
position: relative;
position: relative;
float: left;
clear: both;
width: 100%;
......@@ -1278,8 +1278,8 @@ body.discussion {
.discussion-article {
position: relative;
padding: 40px;
min-height: 468px;
min-height: 468px;
a {
word-wrap: break-word;
}
......@@ -1332,9 +1332,9 @@ body.discussion {
background-position: 0 0;
}
}
}
.discussion-post {
......@@ -1379,7 +1379,7 @@ body.discussion {
margin-bottom: 20px;
}
.responses {
list-style: none;
......@@ -1609,8 +1609,8 @@ body.discussion {
background: #449944;
font-size: 9px;
font-weight: 700;
font-style: normal;
color: white;
font-style: normal;
color: white;
text-transform: uppercase;
}
......@@ -2206,7 +2206,7 @@ body.discussion {
font-style: normal;
font-size: 0.8em;
line-height: 1.6em;
@include border-radius(3px 3px 0 0);
border-radius: 3px 3px 0 0;
&::-webkit-input-placeholder {
color: #888;
......@@ -2221,7 +2221,7 @@ body.discussion {
@include box-sizing(border-box);
border: 1px solid #c8c8c8;
border-top-width: 0;
@include border-radius(0 0 3px 3px);
border-radius: 0 0 3px 3px;
overflow: hidden;
@include transition(all, .2s, easeOut);
......@@ -2448,7 +2448,7 @@ body.discussion {
float:right;
padding-right: 5px;
font-style: italic;
cursor:pointer;
cursor:pointer;
margin-right: 10px;
opacity: 0.8;
......@@ -2460,7 +2460,7 @@ body.discussion {
@include transition(opacity .2s);
opacity: 1.0;
}
}
}
.discussion-pin-inline {
font-size: 12px;
......@@ -2472,39 +2472,39 @@ body.discussion {
margin-right:35px;
margin-top:13px;
opacity: 1.0;
}
}
.notpinned .icon {
display: block;
display: block;
float: left;
margin: 3px;
width: 10px;
width: 10px;
height: 14px;
padding-right: 3px;
background: transparent url('../images/unpinned.png') no-repeat 0 0;
background: transparent url('../images/unpinned.png') no-repeat 0 0;
}
.pinned .icon {
display: block;
display: block;
float: left;
margin: 3px;
width: 10px;
height: 14px;
width: 10px;
height: 14px;
padding-right: 3px;
background: transparent url('../images/pinned.png') no-repeat 0 0;
background: transparent url('../images/pinned.png') no-repeat 0 0;
}
.pinned span {
color: #B82066;
font-style: italic;
//cursor change is here since pins are read-only for inline discussions.
//cursor change is here since pins are read-only for inline discussions.
cursor: default;
}
.notpinned span {
color: #888;
font-style: italic;
//cursor change is here since pins are read-only for inline discussions.
//cursor change is here since pins are read-only for inline discussions.
cursor: default;
}
......@@ -2526,28 +2526,28 @@ display:none;
opacity: 1.0;
}
}
}
.notflagged .icon
{
display: block;
display: block;
float: left;
margin: 3px;
width: 10px;
width: 10px;
height: 14px;
padding-right: 3px;
background: transparent url('../images/notflagged.png') no-repeat 0 0;
background: transparent url('../images/notflagged.png') no-repeat 0 0;
}
.flagged .icon
{
display: block;
display: block;
float: left;
margin: 3px;
width: 10px;
height: 14px;
width: 10px;
height: 14px;
padding-right: 3px;
background: transparent url('../images/flagged.png') no-repeat 0 0;
background: transparent url('../images/flagged.png') no-repeat 0 0;
}
.flagged span {
......@@ -2558,4 +2558,4 @@ display:none;
.notflagged span {
color: #888;
font-style: italic;
}
\ No newline at end of file
}
lms/static/sass/base/_base.scss
......@@ -204,7 +204,7 @@ mark {
max-width: 1140px;
min-width: 720px;
margin: auto;
@include border-radius(0 0 3px 3px);
border-radius: 0 0 3px 3px;
background: #f4f4e0;
color: #3c3c3c;
padding: 5px 20px 8px;
......@@ -232,7 +232,7 @@ mark {
cursor: pointer;
border: 1px solid #ccc;
border-top-style: none;
@include border-radius(0px 0px 10px 10px);
border-radius: 0px 0px 10px 10px;
background: transparentize(#fff, 0.25);
color: transparentize(#333, 0.25);
font-weight: bold;
......@@ -261,12 +261,12 @@ mark {
&#feedback_link_problem {
border-bottom-style: none;
@include border-radius(10px 10px 0px 0px);
border-radius: 10px 10px 0px 0px;
}
&#feedback_link_question {
border-top-style: none;
@include border-radius(0px 0px 10px 10px);
border-radius: 0px 0px 10px 10px;
}
&:hover {
......
lms/static/sass/course/_info.scss
......@@ -67,7 +67,7 @@ div.info-wrapper {
> ol {
list-style: decimal outside none;
padding: 0 0 0 1em;
padding: 0 0 0 1em;
}
li {
......@@ -80,7 +80,7 @@ div.info-wrapper {
section.handouts {
@extend .sidebar;
@include border-radius(0 4px 4px 0);
border-radius: 0 4px 4px 0;
border-left: 1px solid #ddd;
@include box-shadow(none);
font-size: 14px;
......
lms/static/sass/course/_profile.scss
......@@ -5,7 +5,7 @@ div.profile-wrapper {
section.user-info {
@extend .sidebar;
border-left: 1px solid #d3d3d3;
@include border-radius(0px 4px 4px 0);
border-radius: 0px 4px 4px 0;
border-right: 0;
&:after {
......
lms/static/sass/course/base/_base.scss
......@@ -59,7 +59,7 @@ input[type="email"],
input[type="password"] {
background: $white;
border: 1px solid $border-color-2;
@include border-radius(0);
border-radius: 0;
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6), inset 0 0 3px 0 rgba(0,0,0, 0.1));
@include box-sizing(border-box);
font: normal 1em $sans-serif;
......
lms/static/sass/course/base/_extends.scss
......@@ -143,7 +143,7 @@ h1.top-header {
a {
background: #f6f6f6 url('../images/slide-left-icon.png') center center no-repeat;
border: 1px solid #D3D3D3;
@include border-radius(3px 0 0 3px);
border-radius: 3px 0 0 3px;
height: 16px;
padding: 6px;
position: absolute;
......
lms/static/sass/course/courseware/_amplifier.scss
......@@ -20,7 +20,7 @@ section.tool-wrapper {
.ui-widget-content {
background: none;
border: none;
@include border-radius(0);
border-radius: 0;
}
canvas {
......@@ -30,7 +30,7 @@ section.tool-wrapper {
ul.ui-tabs-nav {
background: darken(#073642, 2%);
border-bottom: 1px solid darken(#073642, 8%);
@include border-radius(0);
border-radius: 0;
margin: (-(lh())) (-(lh())) 0;
padding: 0;
position: relative;
......@@ -39,7 +39,7 @@ section.tool-wrapper {
li {
background: none;
border: none;
@include border-radius(0);
border-radius: 0;
color: #fff;
margin-bottom: 0;
......@@ -159,7 +159,7 @@ section.tool-wrapper {
}
label {
@include border-radius(2px);
border-radius: 2px;
color: #fff;
font-weight: bold;
padding: 3px;
......
lms/static/sass/course/courseware/_courseware.scss
......@@ -62,7 +62,7 @@ div.course-wrapper {
header {
@extend h1.top-header;
@include border-radius(0 4px 0 0);
border-radius: 0 4px 0 0;
margin-bottom: -16px;
border-bottom: 0;
......@@ -169,7 +169,7 @@ div.course-wrapper {
div.ui-tabs {
border: 0;
@include border-radius(0);
border-radius: 0;
margin: 0;
padding: 0;
......@@ -180,7 +180,7 @@ div.course-wrapper {
}
.ui-tabs-panel {
@include border-radius(0);
border-radius: 0;
padding: 0;
}
}
......
lms/static/sass/course/courseware/_sidebar.scss
section.course-index {
@extend .sidebar;
@extend .tran;
@include border-radius(3px 0 0 3px);
border-radius: 3px 0 0 3px;
border-right: 1px solid $border-color-2;
#open_close_accordion {
......@@ -21,7 +21,7 @@ section.course-index {
font-size: 14px;
h3 {
@include border-radius(0);
border-radius: 0;
margin: 0;
overflow: visible;
......@@ -44,7 +44,7 @@ section.course-index {
color: #000;
a {
@include border-radius(0);
border-radius: 0;
@include box-shadow(none);
padding-left: 19px;
}
......@@ -96,7 +96,7 @@ section.course-index {
ul.ui-accordion-content {
background: transparent;
border: none;
@include border-radius(0);
border-radius: 0;
margin: 0;
padding: 9px 0 9px 9px;
overflow: auto;
......@@ -104,12 +104,12 @@ section.course-index {
li {
border-bottom: 0;
@include border-radius(0);
border-radius: 0;
margin-bottom: 4px;
a {
background: transparent;
@include border-radius(4px);
border-radius: 4px;
display: block;
padding: 5px 36px 5px 10px;
position: relative;
......
lms/static/sass/course/layout/_calculator.scss
......@@ -14,7 +14,7 @@ div.calc-main {
a.calc {
background: url("../images/calc-icon.png") rgba(#111, .9) no-repeat center;
border-bottom: 0;
@include border-radius(3px 3px 0 0);
border-radius: 3px 3px 0 0;
color: #fff;
float: right;
height: 20px;
......@@ -51,7 +51,7 @@ div.calc-main {
input#calculator_button {
background: #111;
border: 1px solid #000;
@include border-radius(0);
border-radius: 0;
@include box-shadow(none);
@include box-sizing(border-box);
color: #fff;
......@@ -121,7 +121,7 @@ div.calc-main {
dl {
background: #fff;
@include border-radius(3px);
border-radius: 3px;
@include box-shadow(0 0 3px #999);
color: #333;
display: none;
......
lms/static/sass/course/layout/_courseware_header.scss
......@@ -79,7 +79,7 @@ header.global.slim {
@include background-image(linear-gradient(-90deg, lighten($link-color, 8%), lighten($link-color, 5%) 50%, $link-color 50%, darken($link-color, 10%) 100%));
border: 1px solid transparent;
border-color: darken($link-color, 10%);
@include border-radius(3px);
border-radius: 3px;
@include box-sizing(border-box);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
color: #fff;
......
lms/static/sass/course/wiki/_wiki.scss
......@@ -41,10 +41,10 @@ section.wiki {
a {
float: left;
display: block;
display: block;
overflow: hidden;
height: 30px;
line-height: 31px;
height: 30px;
line-height: 31px;
max-width: 200px;
height: 100%;
text-overflow: ellipsis;
......@@ -56,7 +56,7 @@ section.wiki {
display: inline;
margin-left: 10px;
color: $base-font-color;
height: 30px;
height: 30px;
line-height: 31px;
}
}
......@@ -208,7 +208,7 @@ section.wiki {
background-color: $sidebar-color;
padding: 9px;
margin: 10px 0;
@include border-radius(5px);
border-radius: 5px;
ul {
margin: 0;
......@@ -234,7 +234,7 @@ section.wiki {
.timestamp{
margin-top: 15px;
padding: 15px 0 0 10px;
border-top: 1px solid $light-gray;
border-top: 1px solid $light-gray;
.label {
font-size: 0.7em;
......@@ -536,13 +536,13 @@ section.wiki {
.modal-header {
h1, p {
color: #fff;
color: #fff;
}
h1 {
margin: 3px 12px 8px;
font-size: 1.1em;
}
}
p {
font-size: 0.9em;
......@@ -610,7 +610,7 @@ section.wiki {
border: 1px solid #ccc;
@include linear-gradient(top, #eee, #d2d2d2);
font-size: 22px;
line-height: 28px;
line-height: 28px;
color: #333;
text-align: center;
@include box-shadow(0 1px 0 #fff inset, 0 1px 2px rgba(0, 0, 0, .2));
......@@ -688,7 +688,7 @@ section.wiki {
overflow-x: scroll;
table {
min-width: 100%;
min-width: 100%;
}
th {
......@@ -798,7 +798,7 @@ section.wiki {
background-color: $sidebar-color;
padding: 9px;
margin: 0 -9px 20px;
@include border-radius(5px);
border-radius: 5px;
.well-small {
@include clearfix;
......@@ -837,7 +837,7 @@ section.wiki {
padding: 8px;
overflow: hidden;
}
a.list-children {
margin-left: 3px;
}
......@@ -858,7 +858,7 @@ section.wiki {
.attachment-options {
height: 40px;
margin: 40px 0 30px;
margin: 40px 0 30px;
}
.attachment-list {
......@@ -871,7 +871,7 @@ section.wiki {
margin-bottom: 15px;
border: 1px solid #DDD;
background: #F9F9F9;
@include border-radius(5px);
border-radius: 5px;
}
header,
......@@ -881,7 +881,7 @@ section.wiki {
.attachment-details {
background: #eee;
@include border-radius(0 0 5px 5px);
border-radius: 0 0 5px 5px;
}
h3 {
......@@ -1046,13 +1046,13 @@ section.wiki {
.modal-header {
h1, p {
color: #fff;
color: #fff;
}
h1 {
margin: 3px 12px 8px;
font-size: 1.1em;
}
}
p {
font-size: 0.9em;
......@@ -1086,7 +1086,7 @@ section.wiki {
@include button;
font-size: 0.8em;
}
margin-right: 10px;
}
}
lms/static/sass/multicourse/_account.scss
......@@ -62,7 +62,7 @@
// specific examples - buttons
.button-primary {
@include border-radius(0);
border-radius: 0;
@include linear-gradient(saturate($link-color-d1,15%) 5%, shade($link-color-d1,15%) 95%);
display: inline-block;
padding: $baseline/2 $baseline*2.5;
......@@ -249,7 +249,7 @@
// elements
label, input, textarea {
@include border-radius(0);
border-radius: 0;
display: block;
height: auto;
font-family: $sans-serif;
......@@ -539,11 +539,11 @@
// modal password reset form
#forgot-password-modal {
@include border-radius(2px);
border-radius: 2px;
.inner-wrapper {
@include border-radius(2px);
border-radius: 2px;
background: $body-bg;
padding-bottom: 0 !important;
}
......@@ -579,7 +579,7 @@
}
form {
@include border-radius(0);
border-radius: 0;
@include box-shadow(none);
margin: 0;
border: none;
......
lms/static/sass/multicourse/_course_about.scss
......@@ -101,7 +101,7 @@
> a.find-courses, a.register {
@include button(shiny, $button-color);
@include box-sizing(border-box);
@include border-radius(3px);
border-radius: 3px;
display: block;
font: normal 1.2rem/1.6rem $sans-serif;
letter-spacing: 1px;
......@@ -124,7 +124,7 @@
strong {
@include button(shiny, $button-color);
@include box-sizing(border-box);
@include border-radius(3px);
border-radius: 3px;
display: block;
float: left;
font: normal 1.2rem/1.6rem $sans-serif;
......@@ -183,7 +183,7 @@
.play-intro {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.65), rgba(0,0,0, 0.75)));
@include border-radius(4px);
border-radius: 4px;
@include box-shadow(0 1px 12px 0 rgba(0,0,0, 0.4));
border: 2px solid rgba(255,255,255, 0.8);
height: 80px;
......@@ -438,7 +438,7 @@
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%,
rgba(0,0,0, 0.7) 100%));
border: 1px solid rgba(0,0,0, 0.5);
@include border-radius(4px);
border-radius: 4px;
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@include box-sizing(border-box);
color: rgb(255,255,255);
......
lms/static/sass/multicourse/_dashboard.scss
......@@ -33,7 +33,7 @@
@include background-image($dashboard-profile-header-image);
background-color: $dashboard-profile-header-color;
border: 1px solid $border-color-2;
@include border-radius(4px);
border-radius: 4px;
@include box-sizing(border-box);
width: flex-grid(12);
......@@ -250,7 +250,7 @@
@include background-image($button-bg-image);
background-color: $button-bg-color;
border: 1px solid $border-color-2;
@include border-radius(4px);
border-radius: 4px;
@include box-shadow(0 1px 8px 0 rgba(0,0,0, 0.1));
@include box-sizing(border-box);
color: $base-font-color;
......@@ -284,7 +284,7 @@
margin-bottom: none;
}
.cover {
.cover {
@include box-sizing(border-box);
float: left;
height: 100%;
......@@ -378,7 +378,7 @@
.enter-course {
@include button(simple, $button-color);
@include box-sizing(border-box);
@include border-radius(3px);
border-radius: 3px;
display: block;
float: left;
font: normal 15px/1.6rem $sans-serif;
......@@ -406,7 +406,7 @@
.message-status {
@include clearfix;
@include border-radius(3px);
border-radius: 3px;
display: none;
z-index: 10;
margin: 20px 0 10px;
......@@ -431,7 +431,7 @@
strong {
font-weight: 700;
a {
font-weight: 700;
}
......@@ -454,7 +454,7 @@
.btn {
@include box-sizing(border-box);
@include border-radius(3px);
border-radius: 3px;
float: left;
font: normal 0.8rem/1.2rem $sans-serif;
letter-spacing: 1px;
......
lms/static/sass/multicourse/_home.scss
......@@ -106,7 +106,7 @@
.play-intro {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.65), rgba(0,0,0, 0.75)));
@include border-radius(4px);
border-radius: 4px;
@include box-shadow(0 1px 12px 0 rgba(0,0,0, 0.4));
@include box-sizing(border-box);
border: 2px solid rgba(255,255,255, 0.8);
......@@ -165,7 +165,7 @@
> h2 {
@include background-image(linear-gradient(-90deg, rgb(250,250,250), rgb(230,230,230)));
border: 1px solid $border-color-2;
@include border-radius(4px);
border-radius: 4px;
border-top-color: $border-color-1;
@include box-shadow(inset 0 0 0 1px rgba(255,255,255, 0.4), 0 0px 12px 0 rgba(0,0,0, 0.2));
color: $lighter-base-font-color;
......
lms/static/sass/multicourse/_media-kit.scss
......@@ -9,7 +9,7 @@ $white: rgb(255,255,255);
width: 980px;
.wrapper-mediakit {
@include border-radius(4px);
border-radius: 4px;
@include box-sizing(border-box);
@include box-shadow(0 1px 10px 0 rgba(0,0,0, 0.1));
margin: ($baseline*3) 0 0 0;
......@@ -24,7 +24,7 @@ $white: rgb(255,255,255);
}
header {
}
}
}
......@@ -113,7 +113,7 @@ $white: rgb(255,255,255);
}
aside {
@include border-radius(2px);
border-radius: 2px;
@include box-sizing(border-box);
@include box-shadow(0 1px 4px 0 rgba(0,0,0, 0.2));
width: 330px;
......@@ -142,7 +142,7 @@ $white: rgb(255,255,255);
.note {
width: 100%;
display: inline-block;
text-align: center;
text-align: center;
}
}
......@@ -171,7 +171,7 @@ $white: rgb(255,255,255);
// library section
.library {
@include border-radius(2px);
border-radius: 2px;
@include box-sizing(border-box);
@include box-shadow(0 1px 4px 0 rgba(0,0,0, 0.2));
border: 3px solid tint($light-gray,50%);
......@@ -220,7 +220,7 @@ $white: rgb(255,255,255);
figure {
a {
@include border-radius(2px);
border-radius: 2px;
@include box-sizing(border-box);
@include box-shadow(0 1px 2px 0 rgba(0,0,0, 0.1));
display: block;
......@@ -257,4 +257,4 @@ $white: rgb(255,255,255);
.share {
}
}
\ No newline at end of file
}
lms/static/sass/multicourse/_password_reset.scss
.password-reset {
background: rgb(245,245,245);
border: 1px solid rgb(200,200,200);
@include border-radius(4px);
border-radius: 4px;
@include box-sizing(border-box);
@include box-shadow(0 5px 50px 0 rgba(0,0,0, 0.3));
margin: 120px auto 0;
......
lms/static/sass/multicourse/_press_release.scss
......@@ -35,7 +35,7 @@
> article {
border: 1px solid rgb(220,220,220);
@include border-radius(10px);
border-radius: 10px;
@include box-sizing(border-box);
@include box-shadow(0 2px 16px 0 rgba(0,0,0, 0.1));
margin: 0 auto;
......
lms/static/sass/multicourse/_testcenter-register.scss
......@@ -39,7 +39,7 @@
.introduction {
header {
h2 {
margin: 0;
font-family: $sans-serif;
......@@ -51,7 +51,7 @@
font-family: $sans-serif;
font-size: 34px;
text-align: left;
}
}
}
}
......@@ -68,7 +68,7 @@
form {
border: 1px solid rgb(216, 223, 230);
@include border-radius(3px);
border-radius: 3px;
@include box-shadow(0 1px 2px 0 rgba(0,0,0, 0.2));
.instructions, .note {
......@@ -100,7 +100,7 @@
display: block;
@include button(simple, $blue);
@include box-sizing(border-box);
@include border-radius(3px);
border-radius: 3px;
font: bold 15px/1.6rem $sans-serif;
letter-spacing: 0;
padding: ($baseline*0.75) $baseline;
......@@ -181,7 +181,7 @@
}
.value {
@include border-radius(3px);
border-radius: 3px;
border: 1px solid #C8C8C8;
padding: $baseline ($baseline*0.75);
background: #FAFAFA;
......@@ -229,7 +229,7 @@
input, textarea {
height: 100%;
width: 100%;
padding: ($baseline/2);
padding: ($baseline/2);
&.long {
width: 100%;
......@@ -336,7 +336,7 @@
padding-left: $baseline;
.message-status {
@include border-radius(3px);
border-radius: 3px;
margin: 0 0 ($baseline*2) 0;
border: 1px solid #ccc;
padding: 0;
......@@ -412,7 +412,7 @@
}
&:before {
@include border-radius($baseline);
border-radius: $baseline;
position: relative;
top: 3px;
display: block;
......@@ -523,7 +523,7 @@
}
.label, .value {
display: inline-block;
display: inline-block;
}
.label {
......@@ -559,7 +559,7 @@
letter-spacing: 0;
}
}
.registration-processed {
......@@ -627,7 +627,7 @@
// status messages
.message {
@include border-radius(3px);
border-radius: 3px;
display: none;
margin: $baseline 0;
padding: ($baseline/2) $baseline;
......@@ -642,7 +642,7 @@
// registration status
&.message-flash {
@include border-radius(3px);
border-radius: 3px;
position: relative;
margin: 0 0 ($baseline*2) 0;
border: 1px solid #ccc;
......@@ -787,4 +787,4 @@
.is-hidden {
display: none;
}
}
\ No newline at end of file
}
lms/static/sass/shared/_activation_messages.scss
......@@ -22,7 +22,7 @@
background: rgb(252,252,252);
border: 1px solid rgb(200,200,200);
@include box-shadow(0 3px 20px 0 rgba(0,0,0, 0.2));
@include border-radius(4px);
border-radius: 4px;
margin: 0 auto;
padding: 40px;
width: flex-grid(6);
......
lms/static/sass/shared/_course_filter.scss
......@@ -30,7 +30,7 @@
.filter-heading {
@include background-image(linear-gradient(-90deg, rgb(250,250,250) 0%, rgb(245,245,245) 50%, rgb(235,235,235) 50%, rgb(230,230,230) 100%));
@include border-radius(4px);
border-radius: 4px;
@include box-sizing(border-box);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.4), inset 0 1px 0 0 rgba(255,255,255, 0.6));
border: 1px solid rgb(200,200,200);
......@@ -47,7 +47,7 @@
ul {
background: rgb(255,255,255);
@include border-radius(0px 4px 4px 4px);
border-radius: 0px 4px 4px 4px;
border: 1px solid rgb(200,200,200);
@include box-shadow(0 2px 15px 0 rgba(0,0,0, 0.2));
padding: 20px 0px 5px 20px;
......@@ -66,7 +66,7 @@
.filter-heading {
background: rgb(255,255,255);
@include background-image(linear-gradient(-90deg, rgb(250,250,250), rgb(255,255,255)));
@include border-radius(4px 4px 0px 0px);
border-radius: 4px 4px 0px 0px;
border-bottom: 1px dotted rgb(200,200,200);
@include box-shadow(0 2px 0 -1px rgb(255,255,255));
color: $base-font-color;
......@@ -83,14 +83,14 @@
float: right;
input[type="text"] {
@include border-radius(3px 0px 0px 3px);
border-radius: 3px 0px 0px 3px;
float: left;
height: 36px;
width: 200px;
}
input[type="submit"] {
@include border-radius(0px 3px 3px 0px);
border-radius: 0px 3px 3px 0px;
float: left;
height: 36px;
padding: 2px 20px;
......
lms/static/sass/shared/_course_object.scss
......@@ -33,7 +33,7 @@
.course {
background: $body-bg;
border: 1px solid $border-color-1;
@include border-radius(2px);
border-radius: 2px;
@include box-sizing(border-box);
@include box-shadow(0 1px 10px 0 rgba(0,0,0, 0.15), inset 0 0 0 1px rgba(255,255,255, 0.9));
margin-bottom: 30px;
......@@ -47,7 +47,7 @@
font-size: 10px;
left: 10px;
padding: 2px 10px;
@include border-radius(2px);
border-radius: 2px;
position: absolute;
text-transform: uppercase;
top: -6px;
......
lms/static/sass/shared/_forms.scss
......@@ -17,7 +17,7 @@ input[type="password"],
input[type="tel"] {
background: $form-bg-color;
border: 1px solid $border-color-2;
@include border-radius(3px);
border-radius: 3px;
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6), inset 0 0 3px 0 rgba(0,0,0, 0.1));
@include box-sizing(border-box);
font: italic 300 1rem/1.6rem $serif;
......@@ -45,7 +45,7 @@ input[type="submit"],
input[type="button"],
button,
.button {
@include border-radius(3px);
border-radius: 3px;
@include button(shiny, $button-color);
font: normal 1.2rem/1.6rem $sans-serif;
letter-spacing: 1px;
......
lms/static/sass/shared/_header.scss
......@@ -79,7 +79,7 @@ header.global {
@include background-image($button-bg-image);
background-color: $button-bg-color;
border: 1px solid $border-color-2;
@include border-radius(3px);
border-radius: 3px;
@include box-sizing(border-box);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
color: $base-font-color;
......@@ -120,7 +120,7 @@ header.global {
&:last-child {
> a {
@include border-radius(0 4px 4px 0);
border-radius: 0 4px 4px 0;
border-left: none;
padding: 5px 8px 7px 8px;
}
......@@ -158,7 +158,7 @@ header.global {
ul.dropdown-menu {
background: $border-color-4;
@include border-radius(4px);
border-radius: 4px;
@include box-shadow(0 2px 24px 0 rgba(0,0,0, 0.3));
border: 1px solid $border-color-3;
display: none;
......@@ -204,7 +204,7 @@ header.global {
> a {
border: 1px solid transparent;
@include border-radius(3px);
border-radius: 3px;
@include box-sizing(border-box);
color: $link-color;
cursor: pointer;
......@@ -279,7 +279,7 @@ header.global {
display: inline-block;
a {
@include border-radius(0);
border-radius: 0;
@include linear-gradient(saturate($link-color-d1,15%) 5%, shade($link-color-d1,15%) 95%);
display: inline-block;
padding: $baseline/2 $baseline*2.5;
......
lms/static/sass/shared/_modal.scss
......@@ -13,7 +13,7 @@
.modal {
background: rgba(0,0,0, 0.6);
border: 1px solid rgba(0, 0, 0, 0.9);
@include border-radius(0px);
border-radius: 0px;
@include box-shadow(0 15px 80px 15px rgba(0,0,0, 0.5));
color: #fff;
display: none;
......@@ -53,7 +53,7 @@
.inner-wrapper {
background: $modal-bg-color;
@include border-radius(0px);
border-radius: 0px;
border: 1px solid rgba(0, 0, 0, 0.9);
@include box-shadow(inset 0 1px 0 0 rgba(255, 255, 255, 0.7));
overflow: hidden;
......@@ -189,7 +189,7 @@
label.honor-code {
background: rgb(233,233,233);
border: 1px solid rgb(200,200,200);
@include border-radius(3px);
border-radius: 3px;
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
display: block;
margin-bottom: 20px;
......@@ -274,7 +274,7 @@
}
.close-modal {
@include border-radius(2px);
border-radius: 2px;
cursor: pointer;
@include inline-block;
padding: 10px;
......
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