diff options
| author | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2023-03-16 09:48:14 +0100 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2023-05-03 16:40:36 +0200 |
| commit | dba4d6152fd8f3eaf4b5270b126051e3ff874c45 (patch) | |
| tree | 910c9de168c83bd1df76115fa5a65a8d4231de93 | |
| parent | 9d9712fd930e99f832ac63dc01ec35375094a76f (diff) | |
adjust variables handling
| -rw-r--r-- | resources/assets/stylesheets/mixins.scss | 3 | ||||
| -rw-r--r-- | resources/assets/stylesheets/scss/layouts.scss | 16 | ||||
| -rw-r--r-- | resources/assets/stylesheets/scss/variables.scss | 18 |
3 files changed, 20 insertions, 17 deletions
diff --git a/resources/assets/stylesheets/mixins.scss b/resources/assets/stylesheets/mixins.scss index a9dd78d..3e2c2f5 100644 --- a/resources/assets/stylesheets/mixins.scss +++ b/resources/assets/stylesheets/mixins.scss @@ -1,7 +1,8 @@ $image-path: "../images" !default; $icon-path: "#{$image-path}/icons" !default; +@import 'scss/variables'; + @import "mixins/misc"; -@import "mixins/colors"; @import "mixins/studip"; @import "mixins/arrow"; diff --git a/resources/assets/stylesheets/scss/layouts.scss b/resources/assets/stylesheets/scss/layouts.scss index ab15cec..f4b546d 100644 --- a/resources/assets/stylesheets/scss/layouts.scss +++ b/resources/assets/stylesheets/scss/layouts.scss @@ -1,21 +1,5 @@ // TODO: SCSSify -$page-margin: 15px; - -$sidebar-padding: 12px; -$sidebar-width: 270px; - -$content-width: 400px; -$content-margin: 12px; -$max-content-width: 4 * $sidebar-width + $page-margin; - -$footer-height: 32px; - -$site-width: ($page-margin * 2 + $sidebar-width + $sidebar-padding * 2 + $sidebar-border-width * 2 + $content-width + $content-margin * 2); -$page-width: ($sidebar-width + $sidebar-padding * 2 + $sidebar-border-width * 2 + $content-width + $content-margin * 2); - -$grid-gap: 0; - html { height: 100vh; overflow-y: auto; diff --git a/resources/assets/stylesheets/scss/variables.scss b/resources/assets/stylesheets/scss/variables.scss index 1c2efac..81bbe2d 100644 --- a/resources/assets/stylesheets/scss/variables.scss +++ b/resources/assets/stylesheets/scss/variables.scss @@ -1,5 +1,6 @@ @import '../mixins/colors.scss'; +// Typography $text-color: #000; $font-family-base: "Lato", sans-serif; @@ -42,6 +43,23 @@ $drag_and_drop_border: 1px solid $base-color; $transition-duration: .3s; +// Layout +$page-margin: 15px; + +$sidebar-padding: 12px; +$sidebar-width: 270px; + +$content-width: 400px; +$content-margin: 12px; +$max-content-width: 4 * $sidebar-width + $page-margin; + +$footer-height: 32px; + +$site-width: ($page-margin * 2 + $sidebar-width + $sidebar-padding * 2 + $sidebar-border-width * 2 + $content-width + $content-margin * 2); +$page-width: ($sidebar-width + $sidebar-padding * 2 + $sidebar-border-width * 2 + $content-width + $content-margin * 2); + +$grid-gap: 0; + :root { // The special handling for -- as #{"--"} seems to be neccessary to make // scss evaluate the color variables |