From ce9bcba16dcab25424968273d0828675d986011a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 3 Sep 2022 22:11:18 -0400 Subject: [PATCH] feat: paper skin got renamed to materia --- public/scss/admin/admin.scss | 11 ++++++++--- public/scss/admin/settings.scss | 9 +++++++++ public/scss/admin/vars.scss | 22 +++++++++++++++++++++- src/meta/css.js | 12 +++++++----- 4 files changed, 45 insertions(+), 9 deletions(-) diff --git a/public/scss/admin/admin.scss b/public/scss/admin/admin.scss index 65f9c0d677..c5c094f536 100644 --- a/public/scss/admin/admin.scss +++ b/public/scss/admin/admin.scss @@ -1,6 +1,4 @@ -// @import "./paper/variables"; // TODO: bootwatch paper doesnt exist in 5.x -// @import "./paper/bootswatch"; // TODO: bootwatch paper doesnt exist in 5.x - @import "./mixins"; +@import "./mixins"; @import "./header"; @import "./mobile"; @@ -52,6 +50,13 @@ body { .btn { border-radius: 0; } + .btn-outline-secondary { + color: $gray-700; + box-shadow: 0 1px 4px rgba(0, 0, 0, .4) !important; + &:hover { + background-color: $gray-200 !important; + } + } // .floating-button can either be a container or the button itself .floating-button { diff --git a/public/scss/admin/settings.scss b/public/scss/admin/settings.scss index bdc14f2e7f..a0bdb22b48 100644 --- a/public/scss/admin/settings.scss +++ b/public/scss/admin/settings.scss @@ -6,6 +6,15 @@ list-style-type: none; font-size: 16px; padding-left: 20px; + li:not(:last-child) { + margin-bottom: 5px; + } + a { + text-decoration: none; + &:hover{ + text-decoration: underline; + } + } } } diff --git a/public/scss/admin/vars.scss b/public/scss/admin/vars.scss index b37e4041a7..49f478f138 100644 --- a/public/scss/admin/vars.scss +++ b/public/scss/admin/vars.scss @@ -19,5 +19,25 @@ $font-family-system: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; $font-family-sans-serif: font-family-system; +$light: #f5f5f5; -$light: #f5f5f5; \ No newline at end of file +// options +$enable-gradients: false; +// no caret on dropdown-toggle +$enable-caret: false; + +$font-size-base: 1rem !default; +$font-weight-base: 400 !default; + +// Buttons +$input-btn-padding-y: .4rem !default; +$input-btn-padding-x: 1rem !default; + +// Forms + +$input-padding-y: 0.4rem !default; +$input-padding-x: 0 !default; +$input-padding-y-sm: 0 !default; +$input-padding-x-sm: 0 !default; +$input-padding-y-lg: ($font-size-base * 1.25) !default; +$input-padding-x-lg: 0 !default; \ No newline at end of file diff --git a/src/meta/css.js b/src/meta/css.js index 1ca7f15619..af1014bc14 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -42,13 +42,15 @@ const buildImports = { }, admin: function (source) { return [ - '@import "admin/vars.scss";', + '@import "admin/vars";', + '@import "bootswatch/dist/materia/variables";', '@import "bootstrap/scss/bootstrap";', - '@import "mixins.scss";', - '@import "generics.scss";', - '@import "responsive-utilities.scss";', + '@import "bootswatch/dist/materia/bootswatch";', + '@import "mixins";', + '@import "generics";', + '@import "responsive-utilities";', '@import "fontawesome";', - '@import "admin/admin.scss";', + '@import "admin/admin";', source, '@import "jquery-ui.scss";', '@import "@adactive/bootstrap-tagsinput/src/bootstrap-tagsinput";',