From f40435da4bbe07c09f0c97e295b9a6dafe120f97 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Sat, 2 May 2020 17:38:23 +0200 Subject: [PATCH] Remove unused classes from base and add imports to main file --- app/assets/stylesheets/application.scss | 25 ++++++- app/assets/stylesheets/base.css.scss | 88 +------------------------ 2 files changed, 25 insertions(+), 88 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 4e62ff6d..38e150ea 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -51,11 +51,22 @@ "overrides/colors", "overrides/card", "overrides/dropdown", +"overrides/growls", "overrides/inputs", "overrides/links", "overrides/list-group", "overrides/minicolors", -"overrides/navbar"; +"overrides/navbar", +"overrides/sweet-alert"; + +/** + ELEMENTS + ---------------------------------------------- + Styles directly applied to HTML elements + */ + +@import +"elements/body"; /** COMPONENTS @@ -66,11 +77,23 @@ @import "components/avatars", "components/buttons", +"components/container", "components/entry", "components/jumbotron", "components/notifications", "components/profile", "components/question", +"components/smiles", "components/userbox"; +/** + UTILITIES + ---------------------------------------------- + Classes used for very specific cases + */ + +@import +"utilities"; + + @import "base"; diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss index 0b993c18..4e4f9f9f 100644 --- a/app/assets/stylesheets/base.css.scss +++ b/app/assets/stylesheets/base.css.scss @@ -1,94 +1,8 @@ /* all custom SCSS should go into here */ -body { - overflow-y: scroll; - word-wrap: break-word; - background-color: var(--background); - padding-top: 50px; -} - @import "scss/flags"; @import "scss/variable"; @import "scss/generic"; @import "scss/answerbox"; @import "scss/comments"; -@import "scss/panel"; - -.j2-page { - padding-top: 30px; -} - -.ios-web-app { - padding-top: 1em; -} - -#load-more-btn { - margin-bottom: 1.5em; -} - -.smiles { - margin-bottom: 7px; -} - -.j2-lh { - margin-top: 48px; -} - -.j2-up { - text-transform: uppercase; -} - -.j2-label { - display: inline-block; -} - -.j2-table { - display: table; -} - -.input--center { - display: table-cell; - vertical-align: middle; -} - -.sweet-overlay { - z-index: 1031; -} - -#create-group { - margin-top: 5px; -} - -.j2-delete { - color: theme-color('danger'); - text-decoration: none; -} - -.j2-navbar { - margin-bottom: 0px; -} - -@include media-breakpoint-down(xs) { - .j2-col-reset { - padding-left: 0px; - padding-right: 0px; - } -} - -#growls.default{ - top:64px; - right:10px -} - -.links { - padding-bottom: 10px; -} - -#profile { - border-color: transparent; - border-width: 0px; -} - -.heading-about { - margin-top: 0px; -} +@import "scss/panel"; \ No newline at end of file