diff --git a/src/styles/main.sass b/src/styles/main.sass index 7d7f19c..ea4bf9f 100644 --- a/src/styles/main.sass +++ b/src/styles/main.sass @@ -1,9 +1,11 @@ -// Boi-tstrap +// Bootstrap variables and utilities. @import "../../node_modules/bootstrap/scss/functions" @import "../../node_modules/bootstrap/scss/variables" @import "../../node_modules/bootstrap/scss/mixins" -@import ../../../pillar/src/styles/config +// Pillar variables and utilities. +@import "../../../pillar/src/styles/config" +@import "../../../pillar/src/styles/utils" $primary: $color-primary @@ -16,6 +18,10 @@ $link-color: $primary $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, Helvetica, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" $font-size-base: .9rem +$dropdown-border-width: 0 +$dropdown-box-shadow: 0 10px 25px rgba($black, .1) + +// Bootstrap components. @import "../../node_modules/bootstrap/scss/root" @import "../../node_modules/bootstrap/scss/reboot" @@ -54,52 +60,53 @@ $font-size-base: .9rem @import "../../node_modules/bootstrap/scss/utilities" @import "../../node_modules/bootstrap/scss/print" -@import ../../../pillar/src/styles/normalize -@import ../../../pillar/src/styles/utils -@import ../../../pillar/src/styles/apps_base -@import ../../../pillar/src/styles/error -@import ../../../pillar/src/styles/components/base +// Pillar components. +@import "../../../pillar/src/styles/apps_base" +@import "../../../pillar/src/styles/error" -@import ../../../pillar/src/styles/components/jumbotron -@import ../../../pillar/src/styles/components/alerts -@import ../../../pillar/src/styles/components/navbar -@import ../../../pillar/src/styles/components/footer -@import ../../../pillar/src/styles/components/shortcode -@import ../../../pillar/src/styles/components/statusbar -@import ../../../pillar/src/styles/components/search +@import "../../../pillar/src/styles/components/base" -@import ../../../pillar/src/styles/components/flyout -@import ../../../pillar/src/styles/components/forms -@import ../../../pillar/src/styles/components/inputs -@import ../../../pillar/src/styles/components/buttons -@import ../../../pillar/src/styles/components/popover -@import ../../../pillar/src/styles/components/tooltip -@import ../../../pillar/src/styles/components/checkbox -@import ../../../pillar/src/styles/components/overlay -@import ../../../pillar/src/styles/components/card +@import "../../../pillar/src/styles/components/jumbotron" +@import "../../../pillar/src/styles/components/alerts" +@import "../../../pillar/src/styles/components/navbar" +@import "../../../pillar/src/styles/components/dropdown" +@import "../../../pillar/src/styles/components/footer" +@import "../../../pillar/src/styles/components/shortcode" +@import "../../../pillar/src/styles/components/statusbar" +@import "../../../pillar/src/styles/components/search" -@import ../../../pillar/src/styles/comments -@import ../../../pillar/src/styles/notifications +@import "../../../pillar/src/styles/components/flyout" +@import "../../../pillar/src/styles/components/forms" +@import "../../../pillar/src/styles/components/inputs" +@import "../../../pillar/src/styles/components/buttons" +@import "../../../pillar/src/styles/components/popover" +@import "../../../pillar/src/styles/components/tooltip" +@import "../../../pillar/src/styles/components/checkbox" +@import "../../../pillar/src/styles/components/overlay" +@import "../../../pillar/src/styles/components/card" + +@import "../../../pillar/src/styles/comments" +@import "../../../pillar/src/styles/notifications" /* Blender Cloud specific styles */ -@import ../../../pillar/src/styles/_project -@import ../../../pillar/src/styles/_project-sharing -@import ../../../pillar/src/styles/_project-dashboard -@import ../../../pillar/src/styles/_user +@import "../../../pillar/src/styles/_project" +@import "../../../pillar/src/styles/_project-sharing" +@import "../../../pillar/src/styles/_project-dashboard" +@import "../../../pillar/src/styles/_user" @import _welcome @import _homepage @import _services @import _about -@import ../../../pillar/src/styles/_search -@import ../../../pillar/src/styles/_organizations +@import "../../../pillar/src/styles/_search" +@import "../../../pillar/src/styles/_organizations" /* services, about, etc */ -@import ../../../pillar/src/styles/_pages +@import "../../../pillar/src/styles/_pages" /* plugins are included here, don't include in base unless needed by other pillar apps */ -@import ../../../pillar/src/styles/plugins/_jstree -@import ../../../pillar/src/styles/plugins/_js_select2 +@import "../../../pillar/src/styles/plugins/_jstree" +@import "../../../pillar/src/styles/plugins/_js_select2" /* CSS for pillar-font comes from fontello.com using static/assets/font/config.json */