Commit ef14d157 authored by Simon Knox's avatar Simon Knox

Merge branch 'update-sassc-master' into 'master'

Update sassc gem to 2.4.0

See merge request gitlab-org/gitlab!29187
parents b26cf332 8ddbee40
...@@ -1144,9 +1144,8 @@ GEM ...@@ -1144,9 +1144,8 @@ GEM
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.0.1) sassc (2.4.0)
ffi (~> 1.9) ffi (~> 1.9)
rake
sassc-rails (2.1.0) sassc-rails (2.1.0)
railties (>= 4.0.0) railties (>= 4.0.0)
sassc (>= 2.0) sassc (>= 2.0)
......
...@@ -138,10 +138,10 @@ hr { ...@@ -138,10 +138,10 @@ hr {
margin-right: -15px; margin-right: -15px;
margin-left: -15px; margin-left: -15px;
} }
.col, .col-sm-12,
.col-sm-5,
.col-sm-7, .col-sm-7,
.col-sm-12 { .col-sm-5,
.col {
position: relative; position: relative;
width: 100%; width: 100%;
padding-right: 15px; padding-right: 15px;
...@@ -160,12 +160,12 @@ hr { ...@@ -160,12 +160,12 @@ hr {
} }
@media (min-width: 576px) { @media (min-width: 576px) {
.col-sm-5 { .col-sm-5 {
flex: 0 0 41.66667%; flex: 0 0 41.6666666667%;
max-width: 41.66667%; max-width: 41.6666666667%;
} }
.col-sm-7 { .col-sm-7 {
flex: 0 0 58.33333%; flex: 0 0 58.3333333333%;
max-width: 58.33333%; max-width: 58.3333333333%;
} }
.col-sm-12 { .col-sm-12 {
flex: 0 0 100%; flex: 0 0 100%;
......
...@@ -138,10 +138,10 @@ hr { ...@@ -138,10 +138,10 @@ hr {
margin-right: -15px; margin-right: -15px;
margin-left: -15px; margin-left: -15px;
} }
.col, .col-sm-12,
.col-sm-5,
.col-sm-7, .col-sm-7,
.col-sm-12 { .col-sm-5,
.col {
position: relative; position: relative;
width: 100%; width: 100%;
padding-right: 15px; padding-right: 15px;
...@@ -160,12 +160,12 @@ hr { ...@@ -160,12 +160,12 @@ hr {
} }
@media (min-width: 576px) { @media (min-width: 576px) {
.col-sm-5 { .col-sm-5 {
flex: 0 0 41.66667%; flex: 0 0 41.6666666667%;
max-width: 41.66667%; max-width: 41.6666666667%;
} }
.col-sm-7 { .col-sm-7 {
flex: 0 0 58.33333%; flex: 0 0 58.3333333333%;
max-width: 58.33333%; max-width: 58.3333333333%;
} }
.col-sm-12 { .col-sm-12 {
flex: 0 0 100%; flex: 0 0 100%;
......
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