get c-common.scss parseable by node-sass
This is the hardest one, it was not too bad though. Things I found you need to do: 1. You can't have a "//" comment on the same line in .sass syntax so the following line: .foo //a comment about foo would need to be: //a comment about #foo .foo 2. in .sass, you have to use double quotes for @import so: @import 'foo' becomes: @import "foo" things you do NOT have to do: 1. don't have to add the extension or the underscore in front of filename for @import. e.g, DON'T have to convert: @import "foo" to: @import "_foo.scss" 2: don't have to convert the leading colon syntax of super old sass to colon between syntax e.g: .foo :width 100% is just fine (Hallelujah on not having to do those 2, it makes this a lot smaller of a change) test plan: `npm install node-sass` then within the /app/stylesheets directory, run this command and see that it works: ../../node_modules/.bin/node-sass --include-path variants/new_styles_high_contrast base/c-common.scss Change-Id: I73e382560e3dcbf55c32e97bb245b5ec262d4cb0 Reviewed-on: https://gerrit.instructure.com/38414 Reviewed-by: Jeremy Stanley <jeremy@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> Product-Review: Ryan Shaw <ryan@instructure.com> QA-Review: Ryan Shaw <ryan@instructure.com>
This commit is contained in:
parent
ade0ad9fcf
commit
9f6efcf5b5
|
@ -71,7 +71,8 @@
|
||||||
float: right
|
float: right
|
||||||
font-size: 12px
|
font-size: 12px
|
||||||
margin-right: $right_side_margin
|
margin-right: $right_side_margin
|
||||||
margin-bottom: 4px /*make room for the drop shadow*/
|
/*make room for the drop shadow*/
|
||||||
|
margin-bottom: 4px
|
||||||
padding: 0 11px
|
padding: 0 11px
|
||||||
@if $use_high_contrast
|
@if $use_high_contrast
|
||||||
background-color: #555
|
background-color: #555
|
||||||
|
@ -147,7 +148,8 @@
|
||||||
background-color: $menu-background-color
|
background-color: $menu-background-color
|
||||||
|
|
||||||
.menu-item-drop
|
.menu-item-drop
|
||||||
left: 0 // bring it back on screen so you can see it
|
// bring it back on screen so you can see it
|
||||||
|
left: 0
|
||||||
|
|
||||||
.menu-item-drop
|
.menu-item-drop
|
||||||
border: 1px solid $menu-border-color
|
border: 1px solid $menu-border-color
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
width: $right_side_width - ($right_side_margin * 2)
|
width: $right_side_width - ($right_side_margin * 2)
|
||||||
color: $right_side_text_color
|
color: $right_side_text_color
|
||||||
min-height: 20px
|
min-height: 20px
|
||||||
z-index: 10 // puts it equal with #main, used so datepickers that pop up from #right-side pop up on top
|
// puts it equal with #main, used so datepickers that pop up from #right-side pop up on top
|
||||||
|
z-index: 10
|
||||||
margin: $right_side_margin $right_side_margin 0
|
margin: $right_side_margin $right_side_margin 0
|
||||||
|
|
||||||
hr
|
hr
|
||||||
|
@ -60,8 +61,9 @@
|
||||||
&:last-child a
|
&:last-child a
|
||||||
border-bottom: none
|
border-bottom: none
|
||||||
box-shadow: none
|
box-shadow: none
|
||||||
|
|
||||||
small // this is for things like "nothing for the next week"
|
// this is for things like "nothing for the next week"
|
||||||
|
small
|
||||||
padding: 3px 0 0px 31px
|
padding: 3px 0 0px 31px
|
||||||
display: block
|
display: block
|
||||||
color: #666
|
color: #666
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
@import "compass_replacements"
|
@import "compass_replacements"
|
||||||
@import 'misc'
|
@import "misc"
|
||||||
@import 'blue'
|
@import "blue"
|
||||||
@import 'bubbles'
|
@import "bubbles"
|
||||||
|
|
|
@ -26,7 +26,8 @@
|
||||||
left: 0
|
left: 0
|
||||||
width: 100%
|
width: 100%
|
||||||
|
|
||||||
#flash_message_buffer // contains copies of all static messages so that we reserve enough height in the ui
|
// contains copies of all static messages so that we reserve enough height in the ui
|
||||||
|
#flash_message_buffer
|
||||||
visibility: hidden
|
visibility: hidden
|
||||||
|
|
||||||
#flash_message_holder
|
#flash_message_holder
|
||||||
|
@ -240,7 +241,7 @@
|
||||||
float: right
|
float: right
|
||||||
font-size: 10px
|
font-size: 10px
|
||||||
font-weight: normal
|
font-weight: normal
|
||||||
|
|
||||||
&[class*=icon-]:before, &[class^=icon-]:before
|
&[class*=icon-]:before, &[class^=icon-]:before
|
||||||
font-size: 16px
|
font-size: 16px
|
||||||
vertical-align: middle
|
vertical-align: middle
|
||||||
|
@ -557,12 +558,12 @@ ul.group_list
|
||||||
:margin 0px 20px
|
:margin 0px 20px
|
||||||
:color #444
|
:color #444
|
||||||
:position relative
|
:position relative
|
||||||
|
|
||||||
// adding override to link appearance, as javascript depends on there being a .link class here
|
// adding override to link appearance, as javascript depends on there being a .link class here
|
||||||
a.link
|
a.link
|
||||||
:background-image none
|
:background-image none
|
||||||
:padding 0
|
:padding 0
|
||||||
|
|
||||||
p
|
p
|
||||||
:margin-top 0
|
:margin-top 0
|
||||||
|
|
||||||
|
@ -585,9 +586,9 @@ ul.group_list
|
||||||
:color #aaa
|
:color #aaa
|
||||||
&.selected
|
&.selected
|
||||||
:background-color #ccc
|
:background-color #ccc
|
||||||
|
|
||||||
a[class*=icon-], a[class^=icon-]
|
a[class*=icon-], a[class^=icon-]
|
||||||
|
|
||||||
&:before
|
&:before
|
||||||
:font-size 16px
|
:font-size 16px
|
||||||
:line-height 16px
|
:line-height 16px
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
// there is magic that happens here, see the docs at the top of assets.yml for more info
|
// there is magic that happens here, see the docs at the top of assets.yml for more info
|
||||||
@import 'variant_variables'
|
@import "variant_variables"
|
||||||
|
|
||||||
$iconSpritePath: "canvas_does_not_use_boostraps_default_sprit_based_icons_so_this_is_meaningless" !default
|
$iconSpritePath: "canvas_does_not_use_boostraps_default_sprit_based_icons_so_this_is_meaningless" !default
|
||||||
$iconWhiteSpritePath: $iconSpritePath !default
|
$iconWhiteSpritePath: $iconSpritePath !default
|
||||||
|
|
||||||
@import 'vendor/bootstrap/variables'
|
@import "vendor/bootstrap/variables"
|
||||||
@import 'vendor/jqueryui/variables'
|
@import "vendor/jqueryui/variables"
|
||||||
|
|
||||||
|
|
||||||
$right_side_width: 286px
|
$right_side_width: 286px
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
// there is magic that happens here, see the docs at the top of assets.yml for more info
|
// there is magic that happens here, see the docs at the top of assets.yml for more info
|
||||||
@import 'variant_variables';
|
@import "variant_variables";
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in New Issue