diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss index 05a24082ed..8465112c2f 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss @@ -1,16 +1,16 @@ -@import "variables.scss"; -@import "mixins.scss"; -@import "grid.scss"; +@import "/wagtailadmin/scss/variables.scss"; +@import "/wagtailadmin/scss/mixins.scss"; +@import "/wagtailadmin/scss/grid.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"; +@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"; html{ background:$color-grey-4; @@ -823,16 +823,16 @@ footer, .logo{ } } .col3{ - .col3(); + @include col3(); } .col3.addbutton{ width:auto; } .col6{ - .col6(); + @include col6(); } .col9{ - .col9(); + @include col9(); } } footer{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss index 8312dc70ba..9dbb1ad15f 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss @@ -1,6 +1,6 @@ -@import "variables.scss"; -@import "mixins.scss"; -@import "grid.scss"; +@import "/wagtailadmin/scss/variables.scss"; +@import "/wagtailadmin/scss/mixins.scss"; +@import "/wagtailadmin/scss/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 cc7064eb0e..7ba0eeb374 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss @@ -1,6 +1,6 @@ -@import "variables.scss"; -@import "mixins.scss"; -@import "grid.scss"; +@import "/wagtailadmin/scss/variables.scss"; +@import "/wagtailadmin/scss/mixins.scss"; +@import "/wagtailadmin/scss/grid.scss"; $desktop-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 0cb79e81fc..e36e6f15e0 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 "variables.scss"; -@import "mixins.scss"; -@import "grid.scss"; +@import "/wagtailadmin/scss/variables.scss"; +@import "/wagtailadmin/scss/mixins.scss"; +@import "/wagtailadmin/scss/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 b95e0fe6da..73b6bebae7 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 "variables.scss"; -@import "mixins.scss"; +@import "/wagtailadmin/scss/variables.scss"; +@import "/wagtailadmin/scss/mixins.scss"; .hallotoolbar{ position:absolute;