Skip to content

E
edx-platform
Commit 1266fbf6 by Muzaffar yousaf Committed by GitHub
Options

Merge pull request #16253 from edx/fix-quality-voilation 

Fix quality issues to get green build for master.
parents b34b5d9a ef8b2994
Showing with 33 additions and 36 deletions
cms/static/sass/partials/cms/base/_variables.scss
......@@ -37,17 +37,17 @@ $f-monospace: 'Bitstream Vera Sans Mono', Consolas, Courier, monospace;
// +Colors - Utility
// ====================
$transparent: rgba(0,0,0,0) !default; // used when color value is needed for UI width/transitions but element is transparent
$transparent: rgba(0, 0, 0, 0) !default; // used when color value is needed for UI width/transitions but element is transparent
// +Colors - UXPL new pattern library colors
// ====================
$uxpl-blue-base: rgb(0, 117, 180) !default; // wcag2a compliant
$uxpl-blue-hover-active: rgb(6, 86, 131) !default; // wcag2a compliant
$uxpl-light-blue-base: rgb(242, 248, 251) !default
$uxpl-light-blue-base: rgb(242, 248, 251) !default;
$uxpl-green-base: rgb(0, 129, 0) !default; // wcag2a compliant
$uxpl-green-hover-active: rgb(0, 155, 0) !default; // wcag2a compliant
$uxpl-green-dark-hover-active: rgb(0, 88,0) !default;
$uxpl-green-dark-hover-active: rgb(0, 88, 0) !default;
$uxpl-pink-base: rgb(194, 56, 125) !default; // wcag2a compliant
$uxpl-pink-hover-active: lighten($uxpl-pink-base, 7%) !default; // wcag2a compliant
......@@ -58,7 +58,7 @@ $uxpl-primary-accent: rgb(14, 166, 236) !default;
// +Colors - Primary
// ====================
$black: rgb(0,0,0) !default;
$black: rgb(0, 0, 0) !default;
$black-t0: rgba($black, 0.125) !default;
$black-t1: rgba($black, 0.25) !default;
$black-t2: rgba($black, 0.5) !default;
......@@ -83,7 +83,7 @@ $gray-d1: shade($gray, 20%) !default;
$gray-d2: shade($gray, 40%) !default;
$gray-d3: shade($gray, 60%) !default;
$gray-d4: shade($gray, 80%) !default;
$gray-u1: #ECF0F1;
$gray-u1: #ecf0f1;
// These define button styles similar to LMS
......@@ -228,9 +228,9 @@ $color-copy-emphasized: $gray-d2 !default;
// +Timing
// ====================
// used for animation/transition mixin syncing
$tmg-s3: 3.0s;
$tmg-s2: 2.0s;
$tmg-s1: 1.0s;
$tmg-s3: 3s;
$tmg-s2: 2s;
$tmg-s1: 1s;
$tmg-avg: 0.75s;
$tmg-f1: 0.5s;
$tmg-f2: 0.25s;
......@@ -277,10 +277,10 @@ $sidebar-color: rgb(246, 246, 246) !default;
// type
$sans-serif: $f-sans-serif;
$body-line-height: golden-ratio(.875em, 1);
$body-line-height: golden-ratio(0.875em, 1);
// carried over from LMS for xmodules
$action-primary-active-bg: #1AA1DE !default; // $m-blue
$action-primary-active-bg: #1aa1de !default; // $m-blue
$very-light-text: $white !default;
$color-background-alternate: rgb(242, 248, 251) !default;
......@@ -305,4 +305,4 @@ $state-danger-text: $black !default;
$state-danger-bg: #f2dede !default;
$state-danger-border: darken($state-danger-bg, 5%) !default;
$text-dark-black-blue: #2C3E50;
$text-dark-black-blue: #2c3e50;
cms/static/sass/views/_assets.scss
......@@ -21,7 +21,6 @@
vertical-align: bottom;
margin-right: ($baseline/5);
}
}
.no-asset-content {
......@@ -191,8 +190,6 @@
border-radius: 3px;
}
}
}
}
......@@ -230,7 +227,7 @@
padding-right: ($baseline*0.75);
}
&.nav-dd{
&.nav-dd {
// basic layout - nav items
margin: 0 -($baseline/2);
color: $blue-d2;
......@@ -268,7 +265,7 @@
}
.nav-item {
&.reset-filter{
&.reset-filter {
display:none;
}
......
common/test/test-theme/lms/static/sass/partials/base/_variables.scss
@import 'lms/static/sass/partials/base/variables';
$header-bg: rgb(0,250,0);
$footer-bg: rgb(0,250,0);
$container-bg: rgb(0,250,0);
$header-bg: rgb(0, 250, 0);
$footer-bg: rgb(0, 250, 0);
$container-bg: rgb(0, 250, 0);
lms/static/sass/course/_gradebook.scss
......@@ -35,9 +35,9 @@ div.gradebook-wrapper {
background: url('#{$static-path}/images/search-icon.png') no-repeat 9px center $gray-l6;
font-family: $sans-serif;
font-size: 11px;
box-shadow: 0 1px 4px rgba(0, 0, 0, .12) inset;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.12) inset;
@include transition(border-color .15s linear 0s);
@include transition(border-color 0.15s linear 0s);
&::-webkit-input-placeholder,
&::-moz-input-placeholder {
......@@ -114,19 +114,19 @@ div.gradebook-wrapper {
.left-shadow {
left: 0;
background-image: -webkit-gradient(linear, left, $shadow-l1, $transparent 20%), -webkit-gradient(linear, left, $shadow-l1, $transparent);
background-image: -webkit-linear-gradient(left, $shadow-l1, $transparent 20%), -webkit-linear-gradient(left, $shadow-l1, $transparent);
background-image: -moz-linear-gradient(left, $shadow-l1, $transparent 20%), -moz-linear-gradient(left, $shadow-l1, $transparent);
background-image: -ms-linear-gradient(left, $shadow-l1, $transparent 20%), -ms-linear-gradient(left, $shadow-l1, $transparent);
background-image: -o-linear-gradient(left, $shadow-l1, $transparent 20%), -o-linear-gradient(left, $shadow-l1, $transparent);
background-image: -webkit-linear-gradient(left, $shadow-l1, $transparent 20%), -webkit-linear-gradient(left, $shadow-l1, $transparent);
background-image: -moz-linear-gradient(left, $shadow-l1, $transparent 20%), -moz-linear-gradient(left, $shadow-l1, $transparent);
background-image: -ms-linear-gradient(left, $shadow-l1, $transparent 20%), -ms-linear-gradient(left, $shadow-l1, $transparent);
background-image: -o-linear-gradient(left, $shadow-l1, $transparent 20%), -o-linear-gradient(left, $shadow-l1, $transparent);
}
.right-shadow {
right: 0;
background-image: -webkit-gradient(linear, right, $shadow-l1, $transparent 20%), -webkit-gradient(linear, right, $shadow-l1, $transparent);
background-image: -webkit-linear-gradient(right, $shadow-l1, $transparent 20%), -webkit-linear-gradient(right, $shadow-l1, $transparent);
background-image: -moz-linear-gradient(right, $shadow-l1, $transparent 20%), -moz-linear-gradient(right, $shadow-l1, $transparent);
background-image: -ms-linear-gradient(right, $shadow-l1, $transparent 20%), -ms-linear-gradient(right, $shadow-l1, $transparent);
background-image: -o-linear-gradient(right, $shadow-l1, $transparent 20%), -o-linear-gradient(right, $shadow-l1, $transparent);
background-image: -webkit-linear-gradient(right, $shadow-l1, $transparent 20%), -webkit-linear-gradient(right, $shadow-l1, $transparent);
background-image: -moz-linear-gradient(right, $shadow-l1, $transparent 20%), -moz-linear-gradient(right, $shadow-l1, $transparent);
background-image: -ms-linear-gradient(right, $shadow-l1, $transparent 20%), -ms-linear-gradient(right, $shadow-l1, $transparent);
background-image: -o-linear-gradient(right, $shadow-l1, $transparent 20%), -o-linear-gradient(right, $shadow-l1, $transparent);
}
}
......@@ -156,18 +156,18 @@ div.gradebook-wrapper {
line-height: 10px;
font-weight: bold;
text-align: center;
box-shadow: 0 1px 0 $table-border-color inset, 0 2px 0 rgba(255, 255, 255, .7) inset;
box-shadow: 0 1px 0 $table-border-color inset, 0 2px 0 rgba(255, 255, 255, 0.7) inset;
border-left: 1px solid $gray-l3;
&:first-child {
border-radius: 5px 0 0 0;
box-shadow: 1px 1px 0 $table-border-color inset, 1px 2px 0 rgba(255, 255, 255, .7) inset;
box-shadow: 1px 1px 0 $table-border-color inset, 1px 2px 0 rgba(255, 255, 255, 0.7) inset;
border-left: none;
}
&:last-child {
border-radius: 0 3px 0 0;
box-shadow: -1px 1px 0 $table-border-color inset, -1px 2px 0 rgba(255, 255, 255, .7) inset;
box-shadow: -1px 1px 0 $table-border-color inset, -1px 2px 0 rgba(255, 255, 255, 0.7) inset;
}
.assignment {
......
lms/static/sass/course/courseware/_sidebar.scss
.course-index {
@include transition(all .2s $ease-in-out-quad 0s);
@include transition(all 0.2s $ease-in-out-quad 0s);
@include border-right(1px solid $border-color-2);
@include border-radius(3px, 0, 0, 3px);
......@@ -25,7 +25,7 @@
@include transition(all $tmg-s3 ease-in-out);
@include box-sizing(border-box);
@include linear-gradient(top, $sidebar-chapter-bg-top, $sidebar-chapter-bg-bottom);
@include transition(background-color .1s linear 0s);
@include transition(background-color 0.1s linear 0s);
display: block;
width: 100%;
......@@ -42,7 +42,7 @@
position: relative;
display: block;
padding: ($baseline*.75) $baseline ($baseline*.75) ($baseline*2);
padding: ($baseline*0.75) $baseline ($baseline*0.75) ($baseline*2);
@include text-align(left);
......
themes/red-theme/cms/static/sass/partials/cms/base/_variables.scss
// Color overrides
$white: rgb(255,255,255);
$white: rgb(255, 255, 255);
$red: #d9534f !default;
$footer-bg: $white;
......
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