diff --git a/resources/assets/stylesheets/scss/header.scss b/resources/assets/stylesheets/scss/header.scss index 36ae554cff010d2fc421d565ee9fc515bcb923cf..bcd76b761b59118fb01b82ae322cc47afe663198 100644 --- a/resources/assets/stylesheets/scss/header.scss +++ b/resources/assets/stylesheets/scss/header.scss @@ -1,5 +1,3 @@ -@import "./layouts.scss"; - /* --- header.css ----------------------------------------------------------- */ #main-header { box-sizing: border-box; diff --git a/resources/assets/stylesheets/scss/layouts.scss b/resources/assets/stylesheets/scss/layouts.scss index 0fc1b9d21ccc545ee44ec43809cb9beeacb364c1..27be3c41fd66f1c95b062be6c84cd00e35da950e 100644 --- a/resources/assets/stylesheets/scss/layouts.scss +++ b/resources/assets/stylesheets/scss/layouts.scss @@ -1,7 +1,5 @@ // TODO: SCSSify -@import "./variables.scss"; - $page-margin: 15px; $content-width: 400px; diff --git a/resources/assets/stylesheets/scss/variables.scss b/resources/assets/stylesheets/scss/variables.scss index 517949b62e2dba69601d1a7f4e43224ab642be02..96b8cf62ea450c790bc10df1c9c565478b9430ee 100644 --- a/resources/assets/stylesheets/scss/variables.scss +++ b/resources/assets/stylesheets/scss/variables.scss @@ -44,7 +44,6 @@ $drag_and_drop_border: 1px solid $base-color; // The special handling for -- as #{"--"} seems to be neccessary to make // scss evaluate the color variables #{"--"}active-color: $active-color; - #{"--"}active-color: $active-color; #{"--"}activity-color: $activity-color; #{"--"}activity-color-20: $activity-color-20; #{"--"}activity-color-40: $activity-color-40; diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss index d294ae52dbf879f0a266ddb56442c47537bb4a87..804a42249824a58faa6e0ee1fe3e24745c8b4595 100644 --- a/resources/assets/stylesheets/studip.scss +++ b/resources/assets/stylesheets/studip.scss @@ -46,6 +46,7 @@ @import "scss/forum"; @import "scss/gradebook"; @import "scss/grid"; +@import "scss/layouts"; @import "scss/header"; @import "scss/headings"; @import "scss/helpbar"; @@ -54,7 +55,6 @@ @import "scss/index"; @import "scss/fullscreen"; @import "scss/globalsearch"; -@import "scss/layouts"; @import "scss/links"; @import "scss/lists"; @import "scss/messages";