Skip to content

Update SASS ( 3.3.5), Bourbon (4.0.2), Neat (1.6.0) #3462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
talbs merged 10 commits into from
Jun 12, 2014
Merged

Update SASS ( 3.3.5), Bourbon (4.0.2), Neat (1.6.0) #3462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f3dd8ae
Update SASS pipeline to generate source maps
andy-armstrong Apr 23, 2014
e8ca25f
Set sass spec version requirement to 3.3.5.
May 28, 2014
eca836c
updating Neat gem file to version 1.6.0
talbs Apr 25, 2014
cf63512
updating Bourbon gem file to version 4.0.1
talbs Apr 25, 2014
ae86c2a
setting Bourbon spec version requirement to 4.0.1 and Neat spec versi…
talbs Jun 5, 2014
71ea2fe
updating static common/static/sass bourbon/neat files
talbs Jun 5, 2014
5150b03
updating Bourbon gem file to version 4.0.2 and Bourbon spec version r…
talbs Jun 10, 2014
02b0725
correcting for Bourbon deprecated inline-block() mixin
talbs Jun 10, 2014
44982ae
correcting for updated Bourbon radial-gradient mixin syntax
talbs Jun 10, 2014
786655f
correcting poorly scoped Sass variables set in xmodules' .scss files …
talbs Jun 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://rubygems.org'
gem 'rake', '~> 10.0.3'
gem 'sass', '3.2.12'
gem 'bourbon', '~> 3.1.8'
gem 'neat', '~> 1.4.0'
gem 'sass', '3.3.5'
gem 'bourbon', '~> 4.0.2'
gem 'neat', '~> 1.6.0'
gem 'colorize', '~> 0.5.8'
gem 'launchy', '~> 2.1.2'
gem 'sys-proctable', '~> 0.9.3'
Expand Down
20 changes: 10 additions & 10 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.3.5)
bourbon (3.1.8)
sass (>= 3.2.0)
bourbon (4.0.2)
sass (~> 3.3)
thor
colorize (0.5.8)
dalli (2.6.4)
ffi (1.9.0)
launchy (2.1.2)
addressable (~> 2.3)
neat (1.4.0)
bourbon (>= 2.1)
sass (>= 3.2)
neat (1.6.0)
bourbon (>= 3.1)
sass (>= 3.3)
rake (10.0.4)
rb-fsevent (0.9.3)
rb-inotify (0.9.2)
ffi (>= 0.5.0)
sass (3.2.12)
sass (3.3.5)
sys-proctable (0.9.3)
thor (0.18.1)
thor (0.19.1)

PLATFORMS
ruby

DEPENDENCIES
bourbon (~> 3.1.8)
bourbon (~> 4.0.2)
colorize (~> 0.5.8)
dalli (~> 2.6.4)
launchy (~> 2.1.2)
neat (~> 1.4.0)
neat (~> 1.6.0)
rake (~> 10.0.3)
rb-fsevent (~> 0.9.3)
rb-inotify (~> 0.9)
sass (= 3.2.12)
sass (= 3.3.5)
sys-proctable (~> 0.9.3)
26 changes: 13 additions & 13 deletions common/lib/xmodule/xmodule/css/annotatable/display.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* TODO: move top-level variables to a common _variables.scss.
/* TODO: move top-level variables to a common _variables.scss.
* NOTE: These variables were only added here because when this was integrated with the CMS,
* SASS compilation errors were triggered because the CMS didn't have the same variables defined
* that the LMS did, so the quick fix was to localize the LMS variables not shared by the CMS.
* -Abarrett and Vshnayder
*/
$border-color: #C8C8C8;
$body-font-size: em(14);
$annotatable--border-color: #C8C8C8;
$annotatable--body-font-size: em(14);

.annotatable-wrapper {
position: relative;
Expand All @@ -23,7 +23,7 @@ $body-font-size: em(14);
.annotatable-section {
position: relative;
padding: .5em 1em;
border: 1px solid $border-color;
border: 1px solid $annotatable--border-color;
border-radius: .5em;
margin-bottom: .5em;

Expand All @@ -34,7 +34,7 @@ $body-font-size: em(14);
a { font-weight: normal; }
}
.annotatable-section-body {
border-top: 1px solid $border-color;
border-top: 1px solid $annotatable--border-color;
margin-top: .5em;
padding-top: .5em;
@include clearfix;
Expand All @@ -45,9 +45,9 @@ $body-font-size: em(14);
margin-left: 4em;
b { font-weight: bold; }
i { font-style: italic; }
code {
code {
display: inline;
white-space: pre;
white-space: pre;
font-family: Courier New, monospace;
}
}
Expand Down Expand Up @@ -105,7 +105,7 @@ $body-font-size: em(14);
}

.ui-tooltip.qtip.ui-tooltip {
font-size: $body-font-size;
font-size: $annotatable--body-font-size;
border: 1px solid #333;
border-radius: 1em;
background-color: rgba(0,0,0,.85);
Expand All @@ -123,7 +123,7 @@ $body-font-size: em(14);
border-bottom: 2px solid #333;
font-weight: bold;
}
.ui-tooltip-icon {
.ui-tooltip-icon {
right: 10px;
background: #333;
}
Expand All @@ -140,16 +140,16 @@ $body-font-size: em(14);
padding: 0 10px 10px 10px;
background-color: transparent;
border-color: transparent;
}
p {
color: inherit;
}
p {
color: inherit;
line-height: normal;
}
}

.ui-tooltip.qtip.ui-tooltip-annotatable {
max-width: 375px;
.ui-tooltip-content {
.ui-tooltip-content {
padding: 0 10px;
.annotatable-comment {
display: block;
Expand Down
33 changes: 17 additions & 16 deletions common/lib/xmodule/xmodule/css/capa/display.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$annotation-yellow: rgba(255,255,10,0.3);

h2 {
margin-top: 0;
margin-bottom: 15px;
Expand Down Expand Up @@ -156,7 +158,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;
Expand All @@ -165,7 +167,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;
Expand All @@ -178,7 +180,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;
Expand All @@ -191,7 +193,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;
Expand All @@ -209,7 +211,7 @@ div.problem {
}

p.answer {
@include inline-block();
display: inline-block;
margin-bottom: 0;
margin-left: $baseline/2;

Expand Down Expand Up @@ -244,7 +246,7 @@ div.problem {
margin-bottom: 0;

&.math {
@include inline-block;
display: inline-block;
padding: 6px;
min-width: 30px;
border: 1px solid #e3e3e3;
Expand All @@ -256,7 +258,7 @@ div.problem {

span {
&.unanswered, &.ui-icon-bullet {
@include inline-block();
display: inline-block;
position: relative;
top: 4px;
width: 14px;
Expand All @@ -265,7 +267,7 @@ div.problem {
}

&.processing, &.ui-icon-processing {
@include inline-block();
display: inline-block;
position: relative;
top: 6px;
width: 25px;
Expand All @@ -274,7 +276,7 @@ div.problem {
}

&.correct, &.ui-icon-check {
@include inline-block();
display: inline-block;
position: relative;
top: 3px;
width: 25px;
Expand All @@ -283,7 +285,7 @@ div.problem {
}

&.partially-correct {
@include inline-block();
display: inline-block;
position: relative;
top: 6px;
width: 25px;
Expand All @@ -292,7 +294,7 @@ div.problem {
}

&.incorrect, &.incomplete, &.ui-icon-close {
@include inline-block();
display: inline-block;
position: relative;
top: 3px;
width: 20px;
Expand Down Expand Up @@ -623,7 +625,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;
Expand Down Expand Up @@ -929,7 +931,6 @@ div.problem {
}

.annotation-input {
$yellow: rgba(255,255,10,0.3);
margin: 0 0 1em 0;
border: 1px solid #ccc;
border-radius: 1em;
Expand Down Expand Up @@ -957,8 +958,8 @@ div.problem {

.block-highlight {
padding: .5em;
border: 1px solid darken($yellow, 10%);
background-color: $yellow;
border: 1px solid darken($annotation-yellow, 10%);
background-color: $annotation-yellow;
color: #333;
font-style: normal;
}
Expand All @@ -982,7 +983,7 @@ div.problem {
cursor: pointer;

&.selected {
background-color: $yellow;
background-color: $annotation-yellow;
}
}
.tag-status {
Expand Down
Loading