diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss index 59770d30a1..e2dbfea12d 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss @@ -130,11 +130,13 @@ background:white } + /* FIXME: needs converting to valid SASS a&:hover, a&.primary:hover{ border-color:$color-teal; color:$color-teal; } + */ } /* free tagging tags from taggit */ @@ -155,10 +157,12 @@ content:"u"; padding-right:0.5em; } + /* FIXME: needs converting to valid SASS a&:hover{ background-color:$color-teal-darker; color:white; } + */ .taglist &{ margin-right:0.8em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 7f615fe6fa..98b370ef25 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -535,13 +535,12 @@ ul.inline li:first-child, li.inline:first-child{ .tagit-choice{ border:0; } - - ul& input[type="text"]{ - padding: 0.2em 0.5em !important; /* having to use important, FML*/ - } - ul& li.tagit-choice-editable{ - padding:0 23px 0 0 !important; /* having to use important, FML*/ - } +} +ul.tagit input[type="text"]{ + padding: 0.2em 0.5em !important; /* having to use important, FML*/ +} +ul.tagit li.tagit-choice-editable{ + padding:0 23px 0 0 !important; /* having to use important, FML*/ } .tagit-close{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss index 6915a46a53..2a5c8be721 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss @@ -12,7 +12,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'wagtail'; - src: url("#{$css-root}fonts/wagtail.svg#wagtail") format("svg"), + src: url("#{$css-root}fonts/wagtail.svg#wagtail") format("svg"); } } @@ -60,7 +60,7 @@ } -.icon-cogs:before, { +.icon-cogs:before { content: "a"; } .icon-doc-empty-inverse:before { diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss index cacedcc01d..b15d662354 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss @@ -5,10 +5,12 @@ ul.listing{ .listing{ margin-bottom:2em; + /* FIXME: needs converting to valid SASS ul&{ border-top:1px dashed $color-input-border; margin-bottom:2em; } + */ ul{ @include unlist(); } @@ -22,9 +24,11 @@ ul.listing{ font-size:0.95em; } + /* FIXME: needs converting to valid SASS table&{ width:100%; } + */ td, th{ padding:1.5em 1em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss index 56d796b967..72dadefd35 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss @@ -1,16 +1,16 @@ -@import "/wagtailadmin/scss/variables.scss"; -@import "/wagtailadmin/scss/mixins.scss"; -@import "/wagtailadmin/scss/grid.scss"; +@import "variables.scss"; +@import "mixins.scss"; +@import "grid.scss"; -@import "/wagtailadmin/scss/components/explorer.scss"; -@import "/wagtailadmin/scss/components/icons.scss"; -@import "/wagtailadmin/scss/components/tabs.scss"; -@import "/wagtailadmin/scss/components/dropdowns.scss"; -@import "/wagtailadmin/scss/components/modals.scss"; -@import "/wagtailadmin/scss/components/forms.scss"; -@import "/wagtailadmin/scss/components/listing.scss"; -@import "/wagtailadmin/scss/components/messages.scss"; -@import "/wagtailadmin/scss/components/formatters.scss"; +@import "components/explorer.scss"; +@import "components/icons.scss"; +@import "components/tabs.scss"; +@import "components/dropdowns.scss"; +@import "components/modals.scss"; +@import "components/forms.scss"; +@import "components/listing.scss"; +@import "components/messages.scss"; +@import "components/formatters.scss"; html{ background:$color-grey-4; @@ -824,16 +824,16 @@ footer, .logo{ } } .col3{ - @include col3(); + @include column(3); } .col3.addbutton{ width:auto; } .col6{ - @include col6(); + @include column(6); } .col9{ - @include col9(); + @include column(9); } } footer{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/grid.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/grid.scss index 2077b98d57..359fe49c87 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/grid.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/grid.scss @@ -1,4 +1,4 @@ -/* Utility variable — you should never need to modify this */ +/* Utility variable - you should never need to modify this */ $gridsystem_width: $grid-columns * 1px; $padding: $grid-gutter-width*0.5; @@ -60,7 +60,7 @@ $padding: $grid-gutter-width*0.5; /* Pull adds right padding */ @mixin pull($offset:1, $grid-columns:$grid-columns) { - margin-right: 100%*(@offset / $grid-columns); + margin-right: 100%*($offset / $grid-columns); } @mixin pull-padding($offset:1, $grid-columns:$grid-columns){ padding-right: 100%*($offset / $grid-columns); diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss index 9dbb1ad15f..61f7c34acd 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss @@ -1,6 +1,6 @@ -@import "/wagtailadmin/scss/variables.scss"; -@import "/wagtailadmin/scss/mixins.scss"; -@import "/wagtailadmin/scss/grid.scss"; +@import "../variables.scss"; +@import "../mixins.scss"; +@import "../grid.scss"; h1{ font-weight:300; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss index 471ffb764e..a414a44d4b 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss @@ -1,6 +1,6 @@ -@import "/wagtailadmin/scss/variables.scss"; -@import "/wagtailadmin/scss/mixins.scss"; -@import "/wagtailadmin/scss/grid.scss"; +@import "../variables.scss"; +@import "../mixins.scss"; +@import "../grid.scss"; // overrides default nice padding defined in variables.scss $desktop-nice-padding: 100px; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index c5d0de5b73..fd195fa894 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -1,6 +1,6 @@ -@import "/wagtailadmin/scss/variables.scss"; -@import "/wagtailadmin/scss/mixins.scss"; -@import "/wagtailadmin/scss/grid.scss"; +@import "../variables.scss"; +@import "../mixins.scss"; +@import "../grid.scss"; .page-editor .content-wrapper{ margin-bottom:10em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss index 73b6bebae7..f2535b20a9 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss @@ -1,5 +1,5 @@ -@import "/wagtailadmin/scss/variables.scss"; -@import "/wagtailadmin/scss/mixins.scss"; +@import "../variables.scss"; +@import "../mixins.scss"; .hallotoolbar{ position:absolute;