diff --git a/frontend/src/assets/scss/custom/_variables.scss b/frontend/src/assets/scss/custom/_variables.scss index 8d698702c..a17320d1d 100644 --- a/frontend/src/assets/scss/custom/_variables.scss +++ b/frontend/src/assets/scss/custom/_variables.scss @@ -1,10 +1,8 @@ - -// // Variables -// // Global settings @import "gradido-custom/global"; + // $enable-caret: true !default; // $enable-rounded: true !default; // $enable-shadows: true !default; @@ -13,9 +11,9 @@ // $enable-grid-classes: true !default; // $enable-print-styles: true !default; - // Color system @import "gradido-custom/color"; + // $white: #fff !default; // $gray-100: #f6f9fc !default; // $gray-200: #e9ecef !default; @@ -27,7 +25,7 @@ // $gray-800: #32325d !default; // Line heading color // $gray-900: #212529 !default; // $black: #000 !default; -// + // $grays: () !default; // $grays: map-merge(( // "100": $gray-100, @@ -40,7 +38,7 @@ // "800": $gray-800, // "900": $gray-900 // ), $grays); -// + // $blue: #5e72e4 !default; // $indigo: #5603ad !default; // $purple: #8965e0 !default; @@ -51,7 +49,7 @@ // $green: #2dce89 !default; // $teal: #11cdef !default; // $cyan: #2bffc6 !default; -// + // $colors: () !default; // $colors: map-merge(( // "blue": $blue, @@ -70,7 +68,7 @@ // "lighter": $gray-200, // "gray-dark": $gray-800 // ), $colors); -// + // $default: #172b4d !default; // $primary: #5e72e4 !default; // $secondary: #f7fafc !default; @@ -81,7 +79,7 @@ // $light: $gray-500 !default; // $dark: $gray-900 !default; // $darker: darken($gray-900, 15%) !default; -// + // $facebook: #3b5999 !default; // $twitter: #1da1f2 !default; // $google-plus: #dd4b39 !default; @@ -91,7 +89,7 @@ // $slack: #3aaf85 !default; // $dribbble: #ea4c89 !default; // $github: #222222 !default; -// + // $theme-colors: () !default; // $theme-colors: map-merge(( // "default": $default, @@ -106,7 +104,7 @@ // "dark": $dark, // "darker": $darker // ), $theme-colors); -// + // $brand-colors: () !default; // $brand-colors: map-merge(( // "facebook": $facebook, @@ -119,7 +117,7 @@ // "dribbble": $dribbble, // "github": $github // ), $brand-colors); -// + // $shape-colors: () !default; // $shape-colors: map-merge(( // "default": #32325d, @@ -127,9 +125,9 @@ // "secondary": #24b47e, // "neutral": #e9ecef, // "blue-gray": #b2cbe1, -// + // ), $shape-colors); -// + // $shapes-primary-colors: () !default; // $shapes-primary-colors: map-merge(( // "step-1-gradient-bg": #281483, @@ -141,7 +139,7 @@ // "span-4-bg": #25ddf5, // "span-5-bg": #1fa2ff // ), $shapes-primary-colors); -// + // $shapes-default-colors: () !default; // $shapes-default-colors: map-merge(( // "step-1-gradient-bg": #7795f8, @@ -153,7 +151,7 @@ // "span-4-bg": #76eea7, // "span-5-bg": #6adaff // ), $shapes-default-colors); -// + // $shapes-light-colors: () !default; // $shapes-light-colors: map-merge(( // "step-1-gradient-bg": #b2cbe1, @@ -165,7 +163,7 @@ // "span-4-bg": #74e4a2, // "span-5-bg": #008169 // ), $shapes-light-colors); -// + // $shapes-dark-colors: () !default; // $shapes-dark-colors: map-merge(( // "step-1-gradient-bg": #32325d, @@ -177,30 +175,29 @@ // "span-4-bg": #d782d9, // "span-5-bg": #008169 // ), $shapes-dark-colors); -// -// + // // Translucent color variations // $translucent-color-opacity: .6 !default; -// + // // Set a specific jump point for requesting color jumps // $theme-color-interval: 8% !default; -// -// // The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255. + +// // The yiq lightness value that determines when the lightness of color changes +// from "dark" to "light". Acceptable values are between 0 and 255. // $yiq-contrasted-threshold: 200 !default; -// + // // Customize the light and dark text colors for use in our YIQ color contrast function. // $yiq-text-dark: $gray-900 !default; // $yiq-text-light: $white !default; -// + // // Action colors -// + // $star-rating-color: $gray-400 !default; // $star-rating-color-active: $yellow !default; -// + // $favorite-color: $yellow !default; // $like-color: $blue !default; // $love-color: $red !default; -// // Body @import "gradido-custom/body"; @@ -208,10 +205,9 @@ // $body-bg: #f8f9fe !default; // $body-color: $gray-700 !default; - - // Sections @import "gradido-custom/sections"; + // $section-colors: () !default; // $section-colors: map-merge(( // "primary": $body-bg, @@ -223,14 +219,15 @@ // Links @import "gradido-custom/links"; + // $link-color: $primary !default; // $link-decoration: none !default; // $link-hover-color: darken($link-color, 15%) !default; // $link-hover-decoration: none !default; - // Grid breakpoints @import "gradido-custom/grid-breakpoint"; + // $grid-breakpoints: ( // xs: 0, // sm: 576px, @@ -238,19 +235,17 @@ // lg: 992px, // xl: 1200px // ); -// + // @include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); // @include _assert-starts-at-zero($grid-breakpoints); -// -// + // // Grid containers // // // // Define the maximum width of `.container` for different screen sizes. - - // Spacing @import "gradido-custom/spacing"; + // $spacer: 1rem !default; // $spacers: () !default; // $spacers: map-merge(( @@ -274,10 +269,9 @@ // 8: ($spacer * 8), // 9: ($spacer * 10) // ), $spacers); -// -// + // // This variable affects the `.h-*` and `.w-*` classes. -// + // $sizes: () !default; // $sizes: map-merge(( // 25: 25%, @@ -288,406 +282,406 @@ // Components @import "gradido-custom/components"; + // $shape-height-xl: 1.5 !default; // $shape-height-lg: 1.5 !default; // $shape-height-sm: 1.5 !default; -// + // $border-width: 1px !default; // $border-color: $gray-200 !default; -// + // $border-radius: .375rem !default; // $border-radius-xl: .5rem !default; // $border-radius-lg: .4375rem !default; // $border-radius-sm: .25rem !default; -// + // $box-shadow-sm: 0 0 .5rem rgba($gray-600, .075) !default; // $box-shadow: 0 0 2rem 0 rgba($gray-600, .15) !default; // $box-shadow-lg: 0 0 3rem rgba($gray-600, .175) !default; -// + // $component-active-color: $white !default; // $component-active-bg: theme-color("primary") !default; // $component-active-border-color: theme-color("primary") !default; -// + // $component-hover-color: $gray-300 !default; // $component-hover-bg: $gray-300 !default; // $component-hover-border-color: $gray-300 !default; -// + // $caret-width: .3em !default; // $transition-base: all .15s ease !default; // $transition-fade: opacity .15s linear !default; // $transition-collapse: height .35s ease !default; - // Fonts @import "gradido-custom/fonts"; + // $font-family-sans-serif: Open Sans, sans-serif !default; // $font-family-base: $font-family-sans-serif !default; -// + // $font-size-base: 1rem !default; // Assumes the browser default, typically `16px` // $font-size-xl: ($font-size-base * 1.5); // $font-size-lg: ($font-size-base * 1.25); // $font-size-sm: ($font-size-base * .875); // $font-size-xs: ($font-size-base * .75); -// + // $font-weight-light: 300 !default; // $font-weight-normal: 400 !default; // $font-weight-bold: 600 !default; // $font-weight-extra-bold: 700 !default; -// + // $font-weight-base: $font-weight-normal !default; // $line-height-base: 1.5 !default; // $shape-height-base: 1.5 !default; -// -// + // $h1-font-size: $font-size-base * 1.625 !default; // $h2-font-size: $font-size-base * 1.25 !default; // $h3-font-size: $font-size-base * 1.0625 !default; // $h4-font-size: $font-size-base * .9375 !default; // $h5-font-size: $font-size-base * .8125 !default; // $h6-font-size: $font-size-base * .625 !default; -// -// + // $headings-margin-bottom: ($spacer / 2); // $headings-font-family: inherit !default; // $headings-font-weight: $font-weight-bold !default; // $headings-line-height: 1.5 !default; // $headings-color: $gray-800 !default; -// + // $heading-letter-spacing: .025em !default; // $heading-font-size: .95rem !default; // $heading-text-transform: uppercase !default; // $heading-font-weight: $headings-font-weight !default; -// + // $heading-title-letter-spacing: .025em !default; // $heading-title-font-size: 1.375rem !default; // $heading-title-font-weight: $font-weight-bold !default; // $heading-title-text-transform: uppercase !default; -// + // $heading-section-letter-spacing: .025em !default; // $heading-section-font-size: 1.375rem !default; // $heading-section-font-weight: $font-weight-bold !default; // $heading-section-text-transform: uppercase !default; -// + // $display1-size: 3.3rem !default; // $display2-size: 2.75rem !default; // $display3-size: 2.1875rem !default; // $display4-size: 1.6275rem !default; -// + // $display1-weight: $font-weight-bold !default; // $display2-weight: $font-weight-bold !default; // $display3-weight: $font-weight-bold !default; // $display4-weight: $font-weight-bold !default; // $display-line-height: $headings-line-height !default; -// + // $paragraph-font-size: 1rem !default; // $paragraph-font-weight: 300 !default; // $paragraph-line-height: 1.7 !default; -// + // $lead-font-size: ($paragraph-font-size * 1.25) !default; // $lead-font-weight: 300 !default; -// + // $small-font-size: 80% !default; -// + // $text-muted: $gray-600 !default; -// + // $blockquote-small-color: $gray-600 !default; // $blockquote-font-size: ($font-size-base * 1.25) !default; -// + // $hr-border-color: rgba($black, .1); // $hr-border-width: $border-width !default; -// -// $mark-padding: .2em !default; -// -// $dt-font-weight: $font-weight-bold !default; -// -// $list-inline-padding: .5rem !default; -// -// $mark-bg: #fcf8e3 !default; -// -// $hr-margin-y: $spacer * 2 !default; +// $mark-padding: .2em !default; + +// $dt-font-weight: $font-weight-bold !default; + +// $list-inline-padding: .5rem !default; + +// $mark-bg: #fcf8e3 !default; + +// $hr-margin-y: $spacer * 2 !default; // Icons @import "gradido-custom/icons"; + // $icon-size: 3rem !default; // $icon-size-xl: 5rem !default; // $icon-size-lg: 4rem !default; // $icon-size-sm: 2rem !default; - // Tables @import "gradido-custom/tables"; + // $table-cell-padding: 1rem !default; // $table-cell-padding-sm: .5rem !default; -// + // $table-bg: transparent !default; // $table-accent-bg: rgba($black, .05) !default; // $table-hover-bg: $gray-100 !default; // $table-active-bg: $table-hover-bg !default; -// + // $table-border-width: $border-width !default; // $table-border-color: $gray-200 !default; -// + // $table-head-bg: $gray-100 !default; // $table-head-color: $gray-600 !default; // $table-head-spacer-y: .75rem !default; -// + // $table-head-font-size: .65rem !default; // $table-head-font-weight: $font-weight-bold !default; // $table-head-text-transform: uppercase !default; // $table-head-letter-spacing: 1px !default; -// + // $table-body-font-size: .8125rem !default; -// + // $table-dark-bg: theme-color("default") !default; // $table-dark-accent-bg: rgba($white, .05) !default; // $table-dark-hover-bg: rgba($white, .075) !default; // $table-dark-border-color: lighten(theme-color("default"), 7%) !default; // $table-dark-color: $body-bg !default; -// + // $table-dark-head-bg: lighten(theme-color("default"), 4%) !default; // $table-dark-head-color: lighten(theme-color("default"), 35%) !default; // Buttons + Forms @import "gradido-custom/buttons-forms"; + // $input-btn-padding-y: .625rem !default; // $input-btn-padding-x: .75rem !default; // $input-btn-line-height: $shape-height-base !default; -// + // $input-btn-focus-width: 0 !default; // $input-btn-focus-color: rgba($component-active-bg, 1) !default; // $input-btn-focus-box-shadow: none !default; -// + // $input-btn-padding-y-sm: .25rem !default; // $input-btn-padding-x-sm: .5rem !default; // $input-btn-line-height-sm: $shape-height-sm !default; -// + // $input-btn-padding-y-lg: .875rem !default; // $input-btn-padding-x-lg: 1rem !default; // $input-btn-line-height-lg: $shape-height-lg !default; -// + // $input-btn-border-width: 1px !default; -// + // $input-btn-font-size-sm: .75rem !default; // $input-btn-font-size: .875rem !default; // $input-btn-font-size-lg: .875rem !default; - // Buttons @import "gradido-custom/buttons"; + // $btn-padding-y: $input-btn-padding-y !default; // $btn-padding-x: $input-btn-padding-x + 0.5 !default; // $btn-line-height: $input-btn-line-height !default; -// + // $btn-padding-y-sm: $input-btn-padding-y-sm !default; // $btn-padding-x-sm: $input-btn-padding-x-sm !default; // $btn-line-height-sm: $input-btn-line-height-sm !default; -// + // $btn-padding-y-lg: $input-btn-padding-y-lg !default; // $btn-padding-x-lg: $input-btn-padding-x-lg !default; // $btn-line-height-lg: $input-btn-line-height-lg !default; -// + // $btn-border-width: $input-btn-border-width !default; -// + // $btn-font-weight: 600 !default; -// + // $btn-text-transform: none !default; -// -// + // $btn-letter-spacing: .025em !default; // $btn-box-shadow: 0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08) !default; // $btn-hover-box-shadow: 0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08) !default; // $btn-focus-box-shadow: $btn-hover-box-shadow !default; // $btn-focus-width: $input-btn-focus-width !default; // $btn-active-box-shadow: none !default; -// -// $btn-hover-translate-y: -1px !default; +// $btn-hover-translate-y: -1px !default; // Input @import "gradido-custom/input"; + // $input-padding-y: $input-btn-padding-y !default; // $input-padding-x: $input-btn-padding-x !default; // $input-line-height: $input-btn-line-height !default; -// + // $input-padding-y-sm: $input-btn-padding-y-sm !default; // $input-padding-x-sm: $input-btn-padding-x-sm !default; // $input-line-height-sm: $input-btn-line-height-sm !default; -// + // $input-padding-y-lg: $input-btn-padding-y-lg !default; // $input-padding-x-lg: $input-btn-padding-x-lg !default; // $input-line-height-lg: $input-btn-line-height-lg !default; -// + // $input-border-radius: $border-radius !default; // $input-border-radius-xl: $border-radius-xl !default; // $input-border-radius-lg: $border-radius-lg !default; // $input-border-radius-sm: $border-radius-sm !default; -// + // $input-bg: $white !default; // $input-disabled-bg: $gray-200 !default; -// + // $input-muted-bg: #F7FAFE !default; // $input-focus-muted-bg: lighten($input-muted-bg, 1%) !default; // $input-alternative-box-shadow: 0 1px 3px rgba(50,50,93,.15), 0 1px 0 rgba(0,0,0,.02) !default; // $input-focus-alternative-box-shadow: 0 4px 6px rgba(50,50,93,.11),0 1px 3px rgba(0,0,0,.08) !default; -// + // $input-color: $gray-600 !default; // $input-border-color: #cad1d7 !default; // $input-border-width: $input-btn-border-width !default; // $input-box-shadow: none !default; // 0 1px 3px 0 $gray-400 !default; -// + // $input-focus-bg: $white !default; // $input-focus-border-color: rgba(50,151,211,.25) !default; // $input-focus-color: $input-color !default; // $input-focus-width: 0 !default; // $input-focus-box-shadow: none !default; //0 1px 3px 0 $gray-500 !default; -// + // $input-placeholder-color: $gray-500 !default; // $input-focus-placeholder-color: $gray-500 !default; -// -// $input-height-border: $input-border-width * 2 !default; -// -// $input-transition: all .2s cubic-bezier(0.68, -0.55, 0.265, 1.55) !default; +// $input-height-border: $input-border-width * 2 !default; + +// $input-transition: all .2s cubic-bezier(0.68, -0.55, 0.265, 1.55) !default; // Input groups @import "gradido-custom/input-groups"; + // $input-group-addon-color: $input-placeholder-color !default; // $input-group-addon-bg: $input-bg !default; // $input-group-addon-border-color: $input-border-color !default; -// + // $input-group-addon-focus-color: $input-focus-color !default; // $input-group-addon-focus-bg: $input-focus-bg !default; // $input-group-addon-focus-border-color: $input-focus-border-color !default; - // Form group @import "gradido-custom/form-groups"; -// $form-group-margin-bottom: 1.5rem !default; +// $form-group-margin-bottom: 1.5rem !default; // Custom forms @import "gradido-custom/custom-forms"; + // custom-control-gutter: 1.75rem !default; // custom-control-spacer-x: 1rem !default; // custom-control-indicator-size: 1.25rem !default; -// + // custom-control-indicator-bg: $input-bg !default; // custom-control-indicator-border-width: 1px !default; // custom-control-indicator-border-color: $input-border-color !default; // custom-control-indicator-box-shadow: none !default; -// + // custom-control-indicator-focus-box-shadow: $custom-control-indicator-box-shadow !default; -// + // custom-control-indicator-hover-color: $component-hover-color !default; // custom-control-indicator-hover-bg: $component-hover-bg !default; // custom-control-indicator-hover-border-color: $component-hover-border-color !default; -// + // custom-control-indicator-active-color: $component-active-color !default; // custom-control-indicator-active-bg: $component-active-bg !default; // custom-control-indicator-active-border-color: $component-active-border-color !default; // custom-control-indicator-active-box-shadow: $custom-control-indicator-box-shadow !default; -// + // custom-control-indicator-checked-color: $component-active-color !default; // custom-control-indicator-checked-bg: $component-active-bg !default; // custom-control-indicator-checked-border-color: $component-active-border-color !default; // custom-control-indicator-checked-box-shadow: $custom-control-indicator-box-shadow !default; // custom-control-indicator-checked-disabled-bg: rgba(theme-color("primary"), .5) !default; -// + // custom-control-indicator-disabled-bg: $gray-200 !default; // custom-control-label-disabled-color: $gray-600 !default; -// + // custom-checkbox-indicator-border-radius: $border-radius-sm !default; // //$custom-checkbox-indicator-icon-checked: str-replace(url("data:image/svg+xml !default;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default; // Custom toggle @import "gradido-custom/custom-toogle"; + // $custom-toggle-width: 50px !default; // $custom-toggle-slider-bg: $gray-200 !default; // $custom-toggle-checked-bg: theme-color("primary") !default; // Form validation @import "gradido-custom/form-validation"; + // $form-feedback-valid-bg: lighten($success, 15%) !default; // $form-feedback-valid-color: theme-color("success") !default; // $form-feedback-invalid-bg: lighten($warning, 15%) !default; // $form-feedback-invalid-color: theme-color("warning") !default; - // Allows for customizing button radius independently from global border radius -$btn-border-radius: $input-border-radius !default; -$btn-border-radius-xl: $input-border-radius-xl !default; -$btn-border-radius-lg: $input-border-radius-lg !default; -$btn-border-radius-sm: $input-border-radius !default; - +$btn-border-radius: $input-border-radius !default; +$btn-border-radius-xl: $input-border-radius-xl !default; +$btn-border-radius-lg: $input-border-radius-lg !default; +$btn-border-radius-sm: $input-border-radius !default; // Chart @import "gradido-custom/chart"; + // $chart-height: 350px !default; // $chart-height-sm: 230px !default; -// + // $chart-legend-margin-top: 2.5rem !default; // $chart-legend-font-size: $font-size-sm !default; // $chart-legend-color: $text-muted !default; // $chart-legend-height: $chart-legend-margin-top + $chart-legend-font-size * $line-height-base !default; - - - // Map @import "gradido-custom/map"; -// $map-height: 500px !default; +// $map-height: 500px !default; // No UI Slider @import "gradido-custom/nouislider"; + // $noui-target-bg: #eceeef !default; // $noui-target-thickness: 5px !default; // $noui-target-border-radius: 5px !default; // $noui-target-border-color: 0 !default; // $noui-target-box-shadow: inset 0 1px 2px rgba(90,97,105,.1) !default; -// + // $noui-slider-connect-bg: $primary !default; // $noui-slider-connect-disabled-bg: #b2b2b2 !default; -// + // $noui-handle-width: 15px !default; // $noui-handle-bg: theme-color("primary") !default; // $noui-handle-border: 0 !default; // $noui-handle-border-radius: 100% !default; -// -// $noui-origin-border-radius: 2px !default; +// $noui-origin-border-radius: 2px !default; // Dropdown @import "gradido-custom/dropdown"; + // $dropdown-bg: $white !default; // $dropdown-border-width: 0 !default; // $dropdown-border-color: rgba($black, .15) !default; // $dropdown-border-radius: $border-radius-lg !default; -// $dropdown-box-shadow: 0 50px 100px rgba(50, 50, 93, .1), 0 15px 35px rgba(50, 50, 93, .15), 0 5px 15px rgba(0, 0, 0, .1) !default; - +// $dropdown-box-shadow: 0 50px 100px rgba(50, 50, 93, .1), +// 0 15px 35px rgba(50, 50, 93, .15), +// 0 5px 15px rgba(0, 0, 0, .1) !default; // Navs @import "gradido-custom/navs"; + // $nav-link-padding-y: .25rem !default; // $nav-link-padding-x: .75rem !default; // $nav-link-color: $gray-700 !default; // $nav-link-hover-color: theme-color("primary") !default; // $nav-link-disabled-color: $gray-600 !default; -// + // $nav-pills-padding-y: .75rem !default; // $nav-pills-padding-x: 1rem !default; -// + // $nav-pills-space-x: 1rem !default; -// + // $nav-pills-bg: $white !default; // $nav-pills-border-width: 1px !default; // $nav-pills-border-color: theme-color("primary") !default; // $nav-pills-border-radius: $border-radius !default; -// + // $nav-pills-link-color: theme-color("primary") !default; // $nav-pills-link-hover-color: darken(theme-color("primary"), 5%) !default; // $nav-pills-link-active-color: color-yiq(theme-color("primary")) !default; @@ -696,25 +690,26 @@ $btn-border-radius-sm: $input-border-radius !default; // Navbar @import "gradido-custom/navbar"; + // $navbar-transition: all .15s linear !default; // $navbar-padding-y: 1rem !default; // $navbar-padding-x: 1rem !default; -// + // $navbar-nav-link-padding-x: 1rem !default; // $navbar-nav-link-padding-y: 1rem !default; -// + // $navbar-nav-link-font-size: .9rem !default; // $navbar-nav-link-font-weight: 400 !default; // $navbar-nav-link-text-transform: normal !default; // $navbar-nav-link-letter-spacing: 0 !default; // $navbar-nav-link-border-radius: $border-radius !default; -// + // $navbar-search-width: 270px !default; // $navbar-search-bg: transparent !default; -// + // $navbar-search-border-radius: 2rem !default; // $navbar-search-border-width: 2px !default; -// + // $navbar-dark-bg: transparent !default; // $navbar-dark-hover-bg: rgba(255, 255, 255, .1) !default; // $navbar-dark-active-bg: rgba(255, 255, 255, .1) !default; @@ -723,12 +718,12 @@ $btn-border-radius-sm: $input-border-radius !default; // $navbar-dark-active-color: rgba($white, .65) !default; // $navbar-dark-disabled-color: rgba($white, .25) !default; // $navbar-dark-toggler-border-color: transparent !default; -// + // $navbar-search-dark-border-color: rgba(255, 255, 255, .6) !default; // $navbar-search-dark-color: rgba(255, 255, 255, .6) !default; // $navbar-search-dark-focus-border-color: rgba(255, 255, 255, .9) !default; // $navbar-search-dark-focus-color: rgba(255, 255, 255, .9) !default; -// + // $navbar-light-bg: transparent !default; // $navbar-light-hover-bg: rgba(0, 0, 0, .1) !default; // $navbar-light-active-bg: rgba(0, 0, 0, .1) !default; @@ -738,77 +733,74 @@ $btn-border-radius-sm: $input-border-radius !default; // $navbar-light-active-color: rgba($black, .9) !default; // $navbar-light-disabled-color: rgba($black, .3) !default; // $navbar-light-toggler-border-color: transparent !default; -// + // $navbar-search-light-border-color: rgba(0, 0, 0, .6) !default; // $navbar-search-light-color: rgba(0, 0, 0, .6) !default; // $navbar-search-light-focus-border-color: rgba(0, 0, 0, .9) !default; // $navbar-search-light-focus-color: rgba(0, 0, 0, .9) !default; - - // Vertical navbar @import "gradido-custom/vertical-navbar"; + // $navbar-vertical-box-shadow: 0 0 2rem 0 rgba(136, 152, 170, .15) !important; // $navbar-vertical-width: 250px !default; // $navbar-vertical-padding-x: 1.5rem !default; // $navbar-vertical-nav-link-padding-x: 1.5rem !default; // $navbar-vertical-nav-link-padding-y: .65rem !default; -// + // $navbar-icon-min-width: 2.25rem !default; -// + // $navbar-breadcrumb-padding-y: $nav-link-padding-y !default; // $navbar-breadcrumb-padding-x: 0 !default; -// + // $navbar-light-bg: $white !default; // $navbar-light-border-color: $border-color !default; - - - // Main content @import "gradido-custom/main-content"; + // $main-content-padding-y: 40px !default; // $main-content-padding-x: 24px !default; // in px to combine with $grid-gutter-width - // Alerts @import "gradido-custom/alerts"; + // $alert-padding-y: 1rem !default; // $alert-padding-x: 1.5rem !default; // $alert-border-radius: $border-radius !default; -// + // $alert-bg-level: -2 !default; // $alert-border-level: -2 !default; // $alert-color-level: 0 !default; - // List group @import "gradido-custom/list-group"; + // $list-group-bg: $white !default; // $list-group-border-color: $border-color !default; //rgba($black, .125); // $list-group-border-width: $border-width !default; // $list-group-border-radius: $border-radius !default; -// + // $list-group-item-padding-y: 1rem !default; // $list-group-item-padding-x: 1rem !default; -// + // $list-group-hover-bg: $gray-100 !default; // $list-group-active-color: $component-active-color !default; // $list-group-active-bg: $component-active-bg !default; // $list-group-active-border-color: $list-group-active-bg !default; -// + // $list-group-disabled-color: $gray-600 !default; // $list-group-disabled-bg: $list-group-bg !default; -// + // $list-group-action-color: $gray-700 !default; // $list-group-action-hover-color: $list-group-action-color !default; -// + // $list-group-action-active-color: $list-group-action-color !default; // $list-group-action-active-bg: $gray-200 !default; - // Close @import "gradido-custom/close"; + // $close-font-size: $font-size-base * 1.5 !default; // $close-font-weight: $font-weight-bold !default; // $close-bg: transparent !default; @@ -817,9 +809,9 @@ $btn-border-radius-sm: $input-border-radius !default; // $close-hover-color: rgba(0, 0, 0, .9) !default; // $close-text-shadow: none !default; - // Popovers @import "gradido-custom/popovers"; + // $popover-font-size: $font-size-sm !default; // $popover-bg: $white !default; // $popover-max-width: 276px !default; @@ -827,39 +819,40 @@ $btn-border-radius-sm: $input-border-radius !default; // $popover-border-color: rgba($black, .05) !default; // $popover-border-radius: $border-radius-lg !default; // $popover-box-shadow: 0px .5rem 2rem 0px rgba($black, .2) !default; -// + // $popover-header-bg: $popover-bg !default; // $popover-header-color: $headings-color !default; // $popover-header-padding-y: .5rem !default; // $popover-header-padding-x: .95rem !default; -// + // $popover-body-color: $body-color !default; // $popover-body-padding-y: $popover-header-padding-y !default; // $popover-body-padding-x: $popover-header-padding-x !default; -// + // $popover-arrow-width: 1.5rem !default; // $popover-arrow-height: .75rem !default; // $popover-arrow-color: $popover-bg !default; -// -// $popover-arrow-outer-color: transparent !default; +// $popover-arrow-outer-color: transparent !default; // Badges @import "gradido-custom/badges"; + // $badge-font-size: 66% !default; // $badge-font-weight: $font-weight-bold !default; // $badge-padding-y: .35rem !default; // $badge-padding-x: .375rem !default; // $badge-border-radius: $border-radius !default; // $badge-text-transfom: uppercase; -// + // $badge-pill-padding-x: .875em !default; // $badge-pill-border-radius: 10rem !default; -// + // $badge-circle-size: 2rem !default; // Pagination @import "gradido-custom/pagination"; + // // $pagination-padding-y: .5rem !default; // // $pagination-padding-x: .75rem !default; // // $pagination-padding-y-sm: .25rem !default; @@ -867,30 +860,30 @@ $btn-border-radius-sm: $input-border-radius !default; // // $pagination-padding-y-lg: .75rem !default; // // $pagination-padding-x-lg: 1.5rem !default; // // $pagination-line-height: 1.25 !default; -// + // $pagination-color: $gray-600 !default; // $pagination-bg: $white !default; // $pagination-border-width: $border-width !default; // $pagination-border-color: $gray-300 !default; -// + // //$pagination-focus-box-shadow: $btn-hover-box-shadow !default; -// + // $pagination-hover-color: $gray-600 !default; // $pagination-hover-bg: $gray-300 !default; // $pagination-hover-border-color: $gray-300 !default; -// + // $pagination-active-color: $component-active-color !default; // $pagination-active-bg: $component-active-bg !default; // $pagination-active-border-color: $pagination-active-bg !default; // $pagination-active-box-shadow: $btn-hover-box-shadow !default; -// + // $pagination-disabled-color: $gray-600 !default; // $pagination-disabled-bg: $white !default; // $pagination-disabled-border-color: $gray-300 !default; - // Cards @import "gradido-custom/cards"; + // $card-spacer-y: 1.25rem !default; // $card-spacer-x: 1.5rem !default; // $card-border-width: $border-width !default; @@ -899,12 +892,12 @@ $btn-border-radius-sm: $input-border-radius !default; // $card-inner-border-radius: calc(#{$card-border-radius} - #{$card-border-width}) !default; // $card-cap-bg: $white !default; // $card-bg: $white !default; -// + // $card-img-overlay-padding: 1.25rem !default; -// + // //$card-group-margin: ($grid-gutter-width / 2); // //$card-deck-margin: $card-group-margin !default; -// + // $card-columns-count: 3 !default; // $card-columns-gap: 1.25rem !default; // $card-columns-margin: $card-spacer-y !default; @@ -915,21 +908,22 @@ $btn-border-radius-sm: $input-border-radius !default; // Modals @import "gradido-custom/modals"; + // $modal-inner-padding: 1.5rem !default; -// + // $modal-lg: 800px !default; // $modal-md: 500px !default; // $modal-sm: 380px !default; -// + // $modal-title-line-height: 1.1; -// + // $modal-content-bg: $white !default; // $modal-content-border-color: rgba($black, .2) !default; // $modal-content-border-width: 0 !default; // $modal-content-border-radius: $border-radius-lg !default; // $modal-content-box-shadow-xs: 0 15px 35px rgba(50,50,93,.2), 0 5px 15px rgba(0,0,0,.17); // $modal-content-box-shadow-sm-up: 0 15px 35px rgba(50,50,93,.2), 0 5px 15px rgba(0,0,0,.17); -// + // $modal-backdrop-bg: $black !default; // $modal-backdrop-opacity: .16 !default; // $modal-header-border-color: $gray-200 !default; @@ -940,41 +934,40 @@ $btn-border-radius-sm: $input-border-radius !default; // Datepicker @import "gradido-custom/datepicker"; + // $datepicker-border-radius: $card-border-radius !default; // $datepicker-dropdown-padding: 20px 22px !default; -// + // $datepicker-cell-transition: $transition-base !default; // $datepicker-cell-hover-background: lighten($gray-400, 55%); // $datepicker-cell-border-radius: 50% !default; // $datepicker-cell-width: 36px !default; // $datepicker-cell-height: 36px !default; -// + // $datepicker-disabled-cell-color: $gray-300 !default; // $datepicker-disabled-old-new-color: $gray-500 !default; -// + // $datepicker-header-cell-border-radius: $border-radius !default; -// + // $datepicker-active-color: $white !default; // $datepicker-active-background: theme-color("primary") !default; // $datepicker-active-box-shadow: none !default; -// + // $datepicker-range-background: theme-color("primary") !default; // $datepicker-range-cell-focused-background: darken($datepicker-range-background, 5%); // $datepicker-range-color: $white !default; // $datepicker-range-highlighted-bg: $gray-200 !default; -// + // $datepicker-dropdown-border: lighten($gray-400, 40%); // $datepicker-dropdown-bg: $white !default; // $datepicker-highlighted-bg: $datepicker-active-background !default; - // Footer @import "gradido-custom/footer"; // $footer-padding-y: 2.5rem; // $footer-padding-x: 0; -// -// + // $footer-link-font-size: .85rem !default; // $footer-bg: theme-color("secondary") !default; // $footer-color: $gray-600 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_alerts.scss b/frontend/src/assets/scss/custom/gradido-custom/_alerts.scss index ce2659c33..a5d3824cf 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_alerts.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_alerts.scss @@ -3,8 +3,6 @@ $alert-padding-y: 1rem !default; $alert-padding-x: 1.5rem !default; $alert-border-radius: $border-radius !default; - $alert-bg-level: -2 !default; $alert-border-level: -2 !default; $alert-color-level: 0 !default; - diff --git a/frontend/src/assets/scss/custom/gradido-custom/_badges.scss b/frontend/src/assets/scss/custom/gradido-custom/_badges.scss index 6c2f64fb1..3796a34be 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_badges.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_badges.scss @@ -1,14 +1,11 @@ - // Badges -$badge-font-size: 66% !default; -$badge-font-weight: $font-weight-bold !default; -$badge-padding-y: .35rem !default; -$badge-padding-x: .375rem !default; -$badge-border-radius: $border-radius !default; -$badge-text-transfom: uppercase; - -$badge-pill-padding-x: .875em !default; -$badge-pill-border-radius: 10rem !default; - -$badge-circle-size: 2rem !default; +$badge-font-size: 66% !default; +$badge-font-weight: $font-weight-bold !default; +$badge-padding-y: 0.35rem !default; +$badge-padding-x: 0.375rem !default; +$badge-border-radius: $border-radius !default; +$badge-text-transfom: uppercase; +$badge-pill-padding-x: 0.875em !default; +$badge-pill-border-radius: 10rem !default; +$badge-circle-size: 2rem !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_body.scss b/frontend/src/assets/scss/custom/gradido-custom/_body.scss index 02f0f4e52..df8f91f5b 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_body.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_body.scss @@ -1,5 +1,4 @@ // Body - $body-bg: #f8f9fe !default; $body-color: $gray-700 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_buttons-forms.scss b/frontend/src/assets/scss/custom/gradido-custom/_buttons-forms.scss index 5b33bdbfb..92992c070 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_buttons-forms.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_buttons-forms.scss @@ -1,23 +1,18 @@ // Buttons + Forms -$input-btn-padding-y: .625rem !default; -$input-btn-padding-x: .75rem !default; -$input-btn-line-height: $shape-height-base !default; - -$input-btn-focus-width: 0 !default; -$input-btn-focus-color: rgba($component-active-bg, 1) !default; -$input-btn-focus-box-shadow: none !default; - -$input-btn-padding-y-sm: .25rem !default; -$input-btn-padding-x-sm: .5rem !default; -$input-btn-line-height-sm: $shape-height-sm !default; - -$input-btn-padding-y-lg: .875rem !default; -$input-btn-padding-x-lg: 1rem !default; -$input-btn-line-height-lg: $shape-height-lg !default; - -$input-btn-border-width: 1px !default; - -$input-btn-font-size-sm: .75rem !default; -$input-btn-font-size: .875rem !default; -$input-btn-font-size-lg: .875rem !default; +$input-btn-padding-y: 0.625rem !default; +$input-btn-padding-x: 0.75rem !default; +$input-btn-line-height: $shape-height-base !default; +$input-btn-focus-width: 0 !default; +$input-btn-focus-color: rgba($component-active-bg, 1) !default; +$input-btn-focus-box-shadow: none !default; +$input-btn-padding-y-sm: 0.25rem !default; +$input-btn-padding-x-sm: 0.5rem !default; +$input-btn-line-height-sm: $shape-height-sm !default; +$input-btn-padding-y-lg: 0.875rem !default; +$input-btn-padding-x-lg: 1rem !default; +$input-btn-line-height-lg: $shape-height-lg !default; +$input-btn-border-width: 1px !default; +$input-btn-font-size-sm: 0.75rem !default; +$input-btn-font-size: 0.875rem !default; +$input-btn-font-size-lg: 0.875rem !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_buttons.scss b/frontend/src/assets/scss/custom/gradido-custom/_buttons.scss index 5a2e49e3e..3d16e762d 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_buttons.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_buttons.scss @@ -1,35 +1,25 @@ // Buttons -$btn-padding-y: $input-btn-padding-y !default; -$btn-padding-x: $input-btn-padding-x + 0.5 !default; -$btn-line-height: $input-btn-line-height !default; - -$btn-padding-y-sm: $input-btn-padding-y-sm !default; -$btn-padding-x-sm: $input-btn-padding-x-sm !default; -$btn-line-height-sm: $input-btn-line-height-sm !default; - -$btn-padding-y-lg: $input-btn-padding-y-lg !default; -$btn-padding-x-lg: $input-btn-padding-x-lg !default; -$btn-line-height-lg: $input-btn-line-height-lg !default; - -$btn-border-width: $input-btn-border-width !default; - -$btn-font-weight: 600 !default; - -$btn-text-transform: none !default; - - -$btn-letter-spacing: .025em !default; -$btn-box-shadow: 0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08) !default; -$btn-hover-box-shadow: 0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08) !default; -$btn-focus-box-shadow: $btn-hover-box-shadow !default; -$btn-focus-width: $input-btn-focus-width !default; -$btn-active-box-shadow: none !default; - -$btn-hover-translate-y: -1px !default; - - +$btn-padding-y: $input-btn-padding-y !default; +$btn-padding-x: $input-btn-padding-x + 0.5 !default; +$btn-line-height: $input-btn-line-height !default; +$btn-padding-y-sm: $input-btn-padding-y-sm !default; +$btn-padding-x-sm: $input-btn-padding-x-sm !default; +$btn-line-height-sm: $input-btn-line-height-sm !default; +$btn-padding-y-lg: $input-btn-padding-y-lg !default; +$btn-padding-x-lg: $input-btn-padding-x-lg !default; +$btn-line-height-lg: $input-btn-line-height-lg !default; +$btn-border-width: $input-btn-border-width !default; +$btn-font-weight: 600 !default; +$btn-text-transform: none !default; +$btn-letter-spacing: 0.025em !default; +$btn-box-shadow: 0 4px 6px rgb(50 50 93 / 11%), 0 1px 3px rgb(0 0 0 / 8%) !default; +$btn-hover-box-shadow: 0 7px 14px rgb(50 50 93 / 10%), 0 3px 6px rgb(0 0 0 / 8%) !default; +$btn-focus-box-shadow: $btn-hover-box-shadow !default; +$btn-focus-width: $input-btn-focus-width !default; +$btn-active-box-shadow: none !default; +$btn-hover-translate-y: -1px !default; .btn-outline-secondary { - color: #4385b1 !important; - } + color: #4385b1 !important; +} diff --git a/frontend/src/assets/scss/custom/gradido-custom/_cards.scss b/frontend/src/assets/scss/custom/gradido-custom/_cards.scss index 566031a26..fe112f8b7 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_cards.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_cards.scss @@ -1,19 +1,18 @@ // Cards -$card-spacer-y: 1.25rem !default; -$card-spacer-x: 1.5rem !default; -$card-border-width: $border-width !default; -$card-border-radius: $border-radius !default; -$card-border-color: rgba($black, .05) !default; -$card-inner-border-radius: calc(#{$card-border-radius} - #{$card-border-width}) !default; -$card-cap-bg: $white !default; -$card-bg: $white !default; +$card-spacer-y: 1.25rem !default; +$card-spacer-x: 1.5rem !default; +$card-border-width: $border-width !default; +$card-border-radius: $border-radius !default; +$card-border-color: rgba($black, 0.05) !default; +$card-inner-border-radius: calc(#{$card-border-radius} - #{$card-border-width}) !default; +$card-cap-bg: $white !default; +$card-bg: $white !default; +$card-img-overlay-padding: 1.25rem !default; -$card-img-overlay-padding: 1.25rem !default; +// $card-group-margin: ($grid-gutter-width / 2); +// $card-deck-margin: $card-group-margin !default; -//$card-group-margin: ($grid-gutter-width / 2); -//$card-deck-margin: $card-group-margin !default; - -$card-columns-count: 3 !default; -$card-columns-gap: 1.25rem !default; -$card-columns-margin: $card-spacer-y !default; +$card-columns-count: 3 !default; +$card-columns-gap: 1.25rem !default; +$card-columns-margin: $card-spacer-y !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_chart.scss b/frontend/src/assets/scss/custom/gradido-custom/_chart.scss index 0b497e283..95e884d49 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_chart.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_chart.scss @@ -2,7 +2,6 @@ $chart-height: 350px !default; $chart-height-sm: 230px !default; - $chart-legend-margin-top: 2.5rem !default; $chart-legend-font-size: $font-size-sm !default; $chart-legend-color: $text-muted !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_close.scss b/frontend/src/assets/scss/custom/gradido-custom/_close.scss index 41870d798..346372aa7 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_close.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_close.scss @@ -1,9 +1,9 @@ // Close -$close-font-size: $font-size-base * 1.5 !default; -$close-font-weight: $font-weight-bold !default; -$close-bg: transparent !default; -$close-hover-bg: transparent !default; -$close-color: rgba(0, 0, 0, .6) !default !default; -$close-hover-color: rgba(0, 0, 0, .9) !default; -$close-text-shadow: none !default; \ No newline at end of file +$close-font-size: $font-size-base * 1.5 !default; +$close-font-weight: $font-weight-bold !default; +$close-bg: transparent !default; +$close-hover-bg: transparent !default; +$close-color: rgb(0 0 0 / 60%) !default !default; +$close-hover-color: rgb(0 0 0 / 90%) !default; +$close-text-shadow: none !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss index b9749091a..d05706626 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss @@ -1,8 +1,6 @@ - - // Color system -$white: #fff !default; +$white: #fff !default; $gray-100: #f6f9fc !default; $gray-200: #e9ecef !default; $gray-300: #dee2e6 !default; @@ -12,177 +10,190 @@ $gray-600: #8898aa !default; // Line footer color $gray-700: #525f7f !default; // Line p color $gray-800: #32325d !default; // Line heading color $gray-900: #212529 !default; -$black: #000 !default; - +$black: #000 !default; $grays: () !default; -$grays: map-merge(( - "100": $gray-100, - "200": $gray-200, - "300": $gray-300, - "400": $gray-400, - "500": $gray-500, - "600": $gray-600, - "700": $gray-700, - "800": $gray-800, - "900": $gray-900 -), $grays); - -$blue: #5e72e4 !default; -$indigo: #5603ad !default; -$purple: #8965e0 !default; -$pink: #f3a4b5 !default; -$red: #f5365c !default; -$orange: #fb6340 !default; -$yellow: #ffd600 !default; -$green: #2dce89 !default; -$teal: #11cdef !default; -$cyan: #2bffc6 !default; - +$grays: map.merge( + ( + "100": $gray-100, + "200": $gray-200, + "300": $gray-300, + "400": $gray-400, + "500": $gray-500, + "600": $gray-600, + "700": $gray-700, + "800": $gray-800, + "900": $gray-900 + ), + $grays +); +$blue: #5e72e4 !default; +$indigo: #5603ad !default; +$purple: #8965e0 !default; +$pink: #f3a4b5 !default; +$red: #f5365c !default; +$orange: #fb6340 !default; +$yellow: #ffd600 !default; +$green: #2dce89 !default; +$teal: #11cdef !default; +$cyan: #2bffc6 !default; $colors: () !default; -$colors: map-merge(( - "blue": $blue, - "indigo": $indigo, - "purple": $purple, - "pink": $pink, - "red": $red, - "orange": $orange, - "yellow": $yellow, - "green": $green, - "teal": $teal, - "cyan": $cyan, - "white": $white, - "gray": $gray-600, - "light": $gray-400, - "lighter": $gray-200, - "gray-dark": $gray-800 -), $colors); - -$default: #172b4d !default; -$primary: #5e72e4 !default; -$secondary: #f7fafc !default; -$success: $green !default; -$info: $teal !default; -$warning: $orange !default; -$danger: $red !default; -$light: $gray-500 !default; -$dark: $gray-900 !default; -$darker: darken($gray-900, 15%) !default; - -$facebook: #3b5999 !default; -$twitter: #1da1f2 !default; -$google-plus: #dd4b39 !default; -$instagram: #e4405f !default; -$pinterest: #bd081c !default; -$youtube: #cd201f !default; -$slack: #3aaf85 !default; -$dribbble: #ea4c89 !default; -$github: #222222 !default; - +$colors: map.merge( + ( + "blue": $blue, + "indigo": $indigo, + "purple": $purple, + "pink": $pink, + "red": $red, + "orange": $orange, + "yellow": $yellow, + "green": $green, + "teal": $teal, + "cyan": $cyan, + "white": $white, + "gray": $gray-600, + "light": $gray-400, + "lighter": $gray-200, + "gray-dark": $gray-800 + ), + $colors +); +$default: #172b4d !default; +$primary: #5e72e4 !default; +$secondary: #f7fafc !default; +$success: $green !default; +$info: $teal !default; +$warning: $orange !default; +$danger: $red !default; +$light: $gray-500 !default; +$dark: $gray-900 !default; +$darker: color.adjust($gray-900, -15%) !default; +$facebook: #3b5999 !default; +$twitter: #1da1f2 !default; +$google-plus: #dd4b39 !default; +$instagram: #e4405f !default; +$pinterest: #bd081c !default; +$youtube: #cd201f !default; +$slack: #3aaf85 !default; +$dribbble: #ea4c89 !default; +$github: #222 !default; $theme-colors: () !default; -$theme-colors: map-merge(( - "default": $default, - "primary": $primary, - "secondary": $secondary, - "success": $success, - "info": $info, - "warning": $warning, - "danger": $danger, - "white": $white, - "neutral": $white, - "dark": $dark, - "darker": $darker -), $theme-colors); - +$theme-colors: map.merge( + ( + "default": $default, + "primary": $primary, + "secondary": $secondary, + "success": $success, + "info": $info, + "warning": $warning, + "danger": $danger, + "white": $white, + "neutral": $white, + "dark": $dark, + "darker": $darker + ), + $theme-colors +); $brand-colors: () !default; -$brand-colors: map-merge(( - "facebook": $facebook, - "twitter": $twitter, - "google-plus": $google-plus, - "instagram": $instagram, - "pinterest": $pinterest, - "youtube": $youtube, - "slack": $slack, - "dribbble": $dribbble, - "github": $github -), $brand-colors); - +$brand-colors: map.merge( + ( + "facebook": $facebook, + "twitter": $twitter, + "google-plus": $google-plus, + "instagram": $instagram, + "pinterest": $pinterest, + "youtube": $youtube, + "slack": $slack, + "dribbble": $dribbble, + "github": $github + ), + $brand-colors +); $shape-colors: () !default; -$shape-colors: map-merge(( - "default": #32325d, - "primary": #5533ff, - "secondary": #24b47e, - "neutral": #e9ecef, - "blue-gray": #b2cbe1, - -), $shape-colors); - +$shape-colors: map.merge( + ( + "default": #32325d, + "primary": #53f, + "secondary": #24b47e, + "neutral": #e9ecef, + "blue-gray": #b2cbe1, + ), + $shape-colors +); $shapes-primary-colors: () !default; -$shapes-primary-colors: map-merge(( - "step-1-gradient-bg": #281483, - "step-2-gradient-bg": #8f6ed5, - "step-3-gradient-bg": #d782d9, - "span-1-bg": #53f, - "span-2-bg": #4553ff, - "span-3-bg": #4f40ff, - "span-4-bg": #25ddf5, - "span-5-bg": #1fa2ff -), $shapes-primary-colors); - +$shapes-primary-colors: map.merge( + ( + "step-1-gradient-bg": #281483, + "step-2-gradient-bg": #8f6ed5, + "step-3-gradient-bg": #d782d9, + "span-1-bg": #53f, + "span-2-bg": #4553ff, + "span-3-bg": #4f40ff, + "span-4-bg": #25ddf5, + "span-5-bg": #1fa2ff + ), + $shapes-primary-colors +); $shapes-default-colors: () !default; -$shapes-default-colors: map-merge(( - "step-1-gradient-bg": #7795f8, - "step-2-gradient-bg": #6772e5, - "step-3-gradient-bg": #555abf, - "span-1-bg": #7795f8, - "span-2-bg": #7b9aff, - "span-3-bg": #6f8ff8, - "span-4-bg": #76eea7, - "span-5-bg": #6adaff -), $shapes-default-colors); - +$shapes-default-colors: map.merge( + ( + "step-1-gradient-bg": #7795f8, + "step-2-gradient-bg": #6772e5, + "step-3-gradient-bg": #555abf, + "span-1-bg": #7795f8, + "span-2-bg": #7b9aff, + "span-3-bg": #6f8ff8, + "span-4-bg": #76eea7, + "span-5-bg": #6adaff + ), + $shapes-default-colors +); $shapes-light-colors: () !default; -$shapes-light-colors: map-merge(( - "step-1-gradient-bg": #b2cbe1, - "step-2-gradient-bg": #f6f9fc, - "step-3-gradient-bg": #f6f9fc, - "span-1-bg": #b4cce1, - "span-2-bg": #c5dbef, - "span-3-bg": #b9d5ed, - "span-4-bg": #74e4a2, - "span-5-bg": #008169 -), $shapes-light-colors); - +$shapes-light-colors: map.merge( + ( + "step-1-gradient-bg": #b2cbe1, + "step-2-gradient-bg": #f6f9fc, + "step-3-gradient-bg": #f6f9fc, + "span-1-bg": #b4cce1, + "span-2-bg": #c5dbef, + "span-3-bg": #b9d5ed, + "span-4-bg": #74e4a2, + "span-5-bg": #008169 + ), + $shapes-light-colors +); $shapes-dark-colors: () !default; -$shapes-dark-colors: map-merge(( - "step-1-gradient-bg": #32325d, - "step-2-gradient-bg": #32325d, - "step-3-gradient-bg": #32325d, - "span-1-bg": #2e2e57, - "span-2-bg": #2b2b58, - "span-3-bg": #25254d, - "span-4-bg": #d782d9, - "span-5-bg": #008169 -), $shapes-dark-colors); - +$shapes-dark-colors: map.merge( + ( + "step-1-gradient-bg": #32325d, + "step-2-gradient-bg": #32325d, + "step-3-gradient-bg": #32325d, + "span-1-bg": #2e2e57, + "span-2-bg": #2b2b58, + "span-3-bg": #25254d, + "span-4-bg": #d782d9, + "span-5-bg": #008169 + ), + $shapes-dark-colors +); // Translucent color variations -$translucent-color-opacity: .6 !default; +$translucent-color-opacity: 0.6 !default; // Set a specific jump point for requesting color jumps -$theme-color-interval: 8% !default; +$theme-color-interval: 8% !default; -// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255. -$yiq-contrasted-threshold: 200 !default; +// The yiq lightness value that determines when the lightness of color changes +// from "dark" to "light". Acceptable values are between 0 and 255. +$yiq-contrasted-threshold: 200 !default; // Customize the light and dark text colors for use in our YIQ color contrast function. -$yiq-text-dark: $gray-900 !default; -$yiq-text-light: $white !default; +$yiq-text-dark: $gray-900 !default; +$yiq-text-light: $white !default; // Action colors $star-rating-color: $gray-400 !default; $star-rating-color-active: $yellow !default; - $favorite-color: $yellow !default; $like-color: $blue !default; $love-color: $red !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_components.scss b/frontend/src/assets/scss/custom/gradido-custom/_components.scss index a670f3bcf..400fc0647 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_components.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_components.scss @@ -1,31 +1,24 @@ // Components -$shape-height-xl: 1.5 !default; -$shape-height-lg: 1.5 !default; -$shape-height-sm: 1.5 !default; - -$border-width: 1px !default; -$border-color: $gray-200 !default; - -$border-radius: .375rem !default; -$border-radius-xl: .5rem !default; -$border-radius-lg: .4375rem !default; -$border-radius-sm: .25rem !default; - -$box-shadow-sm: 0 0 .5rem rgba($gray-600, .075) !default; -$box-shadow: 0 0 2rem 0 rgba($gray-600, .15) !default; -$box-shadow-lg: 0 0 3rem rgba($gray-600, .175) !default; - -$component-active-color: $white !default; -$component-active-bg: theme-color("primary") !default; +$shape-height-xl: 1.5 !default; +$shape-height-lg: 1.5 !default; +$shape-height-sm: 1.5 !default; +$border-width: 1px !default; +$border-color: $gray-200 !default; +$border-radius: 0.375rem !default; +$border-radius-xl: 0.5rem !default; +$border-radius-lg: 0.4375rem !default; +$border-radius-sm: 0.25rem !default; +$box-shadow-sm: 0 0 0.5rem rgba($gray-600, 0.075) !default; +$box-shadow: 0 0 2rem 0 rgba($gray-600, 0.15) !default; +$box-shadow-lg: 0 0 3rem rgba($gray-600, 0.175) !default; +$component-active-color: $white !default; +$component-active-bg: theme-color("primary") !default; $component-active-border-color: theme-color("primary") !default; - -$component-hover-color: $gray-300 !default; -$component-hover-bg: $gray-300 !default; +$component-hover-color: $gray-300 !default; +$component-hover-bg: $gray-300 !default; $component-hover-border-color: $gray-300 !default; - -$caret-width: .3em !default; - -$transition-base: all .15s ease !default; -$transition-fade: opacity .15s linear !default; -$transition-collapse: height .35s ease !default; +$caret-width: 0.3em !default; +$transition-base: all 0.15s ease !default; +$transition-fade: opacity 0.15s linear !default; +$transition-collapse: height 0.35s ease !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_custom-forms.scss b/frontend/src/assets/scss/custom/gradido-custom/_custom-forms.scss index 4c9fb9ff5..b0e686782 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_custom-forms.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_custom-forms.scss @@ -1,33 +1,27 @@ // Custom forms -$custom-control-gutter: 1.75rem !default; -$custom-control-spacer-x: 1rem !default; -$custom-control-indicator-size: 1.25rem !default; - -$custom-control-indicator-bg: $input-bg !default; -$custom-control-indicator-border-width: 1px !default; -$custom-control-indicator-border-color: $input-border-color !default; -$custom-control-indicator-box-shadow: none !default; - -$custom-control-indicator-focus-box-shadow: $custom-control-indicator-box-shadow !default; - -$custom-control-indicator-hover-color: $component-hover-color !default; -$custom-control-indicator-hover-bg: $component-hover-bg !default; -$custom-control-indicator-hover-border-color: $component-hover-border-color !default; - -$custom-control-indicator-active-color: $component-active-color !default; -$custom-control-indicator-active-bg: $component-active-bg !default; -$custom-control-indicator-active-border-color: $component-active-border-color !default; -$custom-control-indicator-active-box-shadow: $custom-control-indicator-box-shadow !default; - -$custom-control-indicator-checked-color: $component-active-color !default; -$custom-control-indicator-checked-bg: $component-active-bg !default; +$custom-control-gutter: 1.75rem !default; +$custom-control-spacer-x: 1rem !default; +$custom-control-indicator-size: 1.25rem !default; +$custom-control-indicator-bg: $input-bg !default; +$custom-control-indicator-border-width: 1px !default; +$custom-control-indicator-border-color: $input-border-color !default; +$custom-control-indicator-box-shadow: none !default; +$custom-control-indicator-focus-box-shadow: $custom-control-indicator-box-shadow !default; +$custom-control-indicator-hover-color: $component-hover-color !default; +$custom-control-indicator-hover-bg: $component-hover-bg !default; +$custom-control-indicator-hover-border-color: $component-hover-border-color !default; +$custom-control-indicator-active-color: $component-active-color !default; +$custom-control-indicator-active-bg: $component-active-bg !default; +$custom-control-indicator-active-border-color: $component-active-border-color !default; +$custom-control-indicator-active-box-shadow: $custom-control-indicator-box-shadow !default; +$custom-control-indicator-checked-color: $component-active-color !default; +$custom-control-indicator-checked-bg: $component-active-bg !default; $custom-control-indicator-checked-border-color: $component-active-border-color !default; -$custom-control-indicator-checked-box-shadow: $custom-control-indicator-box-shadow !default; -$custom-control-indicator-checked-disabled-bg: rgba(theme-color("primary"), .5) !default; +$custom-control-indicator-checked-box-shadow: $custom-control-indicator-box-shadow !default; +$custom-control-indicator-checked-disabled-bg: rgb(theme-color("primary") 0.5) !default; +$custom-control-indicator-disabled-bg: $gray-200 !default; +$custom-control-label-disabled-color: $gray-600 !default; +$custom-checkbox-indicator-border-radius: $border-radius-sm !default; -$custom-control-indicator-disabled-bg: $gray-200 !default; -$custom-control-label-disabled-color: $gray-600 !default; - -$custom-checkbox-indicator-border-radius: $border-radius-sm !default; -//$custom-checkbox-indicator-icon-checked: str-replace(url("data:image/svg+xml !default;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default; +// $custom-checkbox-indicator-icon-checked: str-replace(url("data:image/svg+xml !default;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_custom-toogle.scss b/frontend/src/assets/scss/custom/gradido-custom/_custom-toogle.scss index 578e2e4e0..ddf88c14c 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_custom-toogle.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_custom-toogle.scss @@ -1,5 +1,5 @@ // Custom toggle -$custom-toggle-width: 50px !default; -$custom-toggle-slider-bg: $gray-200 !default; -$custom-toggle-checked-bg: theme-color("primary") !default; +$custom-toggle-width: 50px !default; +$custom-toggle-slider-bg: $gray-200 !default; +$custom-toggle-checked-bg: theme-color("primary") !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_datepicker.scss b/frontend/src/assets/scss/custom/gradido-custom/_datepicker.scss index e4662636d..27aae2503 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_datepicker.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_datepicker.scss @@ -2,27 +2,21 @@ $datepicker-border-radius: $card-border-radius !default; $datepicker-dropdown-padding: 20px 22px !default; - $datepicker-cell-transition: $transition-base !default; -$datepicker-cell-hover-background: lighten($gray-400, 55%); +$datepicker-cell-hover-background: color.adjust($gray-400, 55%); $datepicker-cell-border-radius: 50% !default; $datepicker-cell-width: 36px !default; $datepicker-cell-height: 36px !default; - $datepicker-disabled-cell-color: $gray-300 !default; $datepicker-disabled-old-new-color: $gray-500 !default; - $datepicker-header-cell-border-radius: $border-radius !default; - $datepicker-active-color: $white !default; $datepicker-active-background: theme-color("primary") !default; -$datepicker-active-box-shadow: none !default; - +$datepicker-active-box-shadow: none !default; $datepicker-range-background: theme-color("primary") !default; -$datepicker-range-cell-focused-background: darken($datepicker-range-background, 5%); +$datepicker-range-cell-focused-background: color.adjust($datepicker-range-background, -5%); $datepicker-range-color: $white !default; $datepicker-range-highlighted-bg: $gray-200 !default; - -$datepicker-dropdown-border: lighten($gray-400, 40%); +$datepicker-dropdown-border: color.adjust($gray-400, 40%); $datepicker-dropdown-bg: $white !default; $datepicker-highlighted-bg: $datepicker-active-background !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_dropdown.scss b/frontend/src/assets/scss/custom/gradido-custom/_dropdown.scss index f26ac8c00..e699f20df 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_dropdown.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_dropdown.scss @@ -1,7 +1,9 @@ // Dropdown -$dropdown-bg: $white !default; -$dropdown-border-width: 0 !default; -$dropdown-border-color: rgba($black, .15) !default; -$dropdown-border-radius: $border-radius-lg !default; -$dropdown-box-shadow: 0 50px 100px rgba(50, 50, 93, .1), 0 15px 35px rgba(50, 50, 93, .15), 0 5px 15px rgba(0, 0, 0, .1) !default; +$dropdown-bg: $white !default; +$dropdown-border-width: 0 !default; +$dropdown-border-color: rgba($black, 0.15) !default; +$dropdown-border-radius: $border-radius-lg !default; +$dropdown-box-shadow: 0 50px 100px rgb(50 50 93 / 10%), + 0 15px 35px rgb(50 50 93 / 15%), + 0 5px 15px rgb(0 0 0 / 10%) !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_fonts.scss b/frontend/src/assets/scss/custom/gradido-custom/_fonts.scss index b9c2bf82a..473902364 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_fonts.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_fonts.scss @@ -1,88 +1,64 @@ - // Fonts -$font-family-sans-serif: Open Sans, sans-serif !default; +$font-family-sans-serif: open sans, sans-serif !default; $font-family-base: $font-family-sans-serif !default; - -$font-size-base: 1rem !default; // Assumes the browser default, typically `16px` -$font-size-xl: ($font-size-base * 1.5); -$font-size-lg: ($font-size-base * 1.25); -$font-size-sm: ($font-size-base * .875); -$font-size-xs: ($font-size-base * .75); - -$font-weight-light: 300 !default; -$font-weight-normal: 400 !default; -$font-weight-bold: 600 !default; -$font-weight-extra-bold: 700 !default; - -$font-weight-base: $font-weight-normal !default; -$line-height-base: 1.5 !default; -$shape-height-base: 1.5 !default; - - -$h1-font-size: $font-size-base * 1.625 !default; -$h2-font-size: $font-size-base * 1.25 !default; -$h3-font-size: $font-size-base * 1.0625 !default; -$h4-font-size: $font-size-base * .9375 !default; -$h5-font-size: $font-size-base * .8125 !default; -$h6-font-size: $font-size-base * .625 !default; - - -$headings-margin-bottom: ($spacer / 2); -$headings-font-family: inherit !default; -$headings-font-weight: $font-weight-bold !default; -$headings-line-height: 1.5 !default; -$headings-color: $gray-800 !default; - -$heading-letter-spacing: .025em !default; -$heading-font-size: .95rem !default; -$heading-text-transform: uppercase !default; -$heading-font-weight: $headings-font-weight !default; - -$heading-title-letter-spacing: .025em !default; -$heading-title-font-size: 1.375rem !default; -$heading-title-font-weight: $font-weight-bold !default; -$heading-title-text-transform: uppercase !default; - -$heading-section-letter-spacing: .025em !default; -$heading-section-font-size: 1.375rem !default; -$heading-section-font-weight: $font-weight-bold !default; -$heading-section-text-transform: uppercase !default; - -$display1-size: 3.3rem !default; -$display2-size: 2.75rem !default; -$display3-size: 2.1875rem !default; -$display4-size: 1.6275rem !default; - -$display1-weight: $font-weight-bold !default; -$display2-weight: $font-weight-bold !default; -$display3-weight: $font-weight-bold !default; -$display4-weight: $font-weight-bold !default; -$display-line-height: $headings-line-height !default; - -$paragraph-font-size: 1rem !default; -$paragraph-font-weight: 300 !default; -$paragraph-line-height: 1.7 !default; - -$lead-font-size: ($paragraph-font-size * 1.25) !default; -$lead-font-weight: 300 !default; - -$small-font-size: 80% !default; - -$text-muted: $gray-600 !default; - -$blockquote-small-color: $gray-600 !default; -$blockquote-font-size: ($font-size-base * 1.25) !default; - -$hr-border-color: rgba($black, .1); -$hr-border-width: $border-width !default; - -$mark-padding: .2em !default; - -$dt-font-weight: $font-weight-bold !default; - -$list-inline-padding: .5rem !default; - -$mark-bg: #fcf8e3 !default; - -$hr-margin-y: $spacer * 2 !default; +$font-size-base: 1rem !default; // Assumes the browser default, typically `16px` +$font-size-xl: ($font-size-base * 1.5); +$font-size-lg: ($font-size-base * 1.25); +$font-size-sm: ($font-size-base * 0.875); +$font-size-xs: ($font-size-base * 0.75); +$font-weight-light: 300 !default; +$font-weight-normal: 400 !default; +$font-weight-bold: 600 !default; +$font-weight-extra-bold: 700 !default; +$font-weight-base: $font-weight-normal !default; +$line-height-base: 1.5 !default; +$shape-height-base: 1.5 !default; +$h1-font-size: $font-size-base * 1.625 !default; +$h2-font-size: $font-size-base * 1.25 !default; +$h3-font-size: $font-size-base * 1.0625 !default; +$h4-font-size: $font-size-base * 0.9375 !default; +$h5-font-size: $font-size-base * 0.8125 !default; +$h6-font-size: $font-size-base * 0.625 !default; +$headings-margin-bottom: ($spacer / 2); +$headings-font-family: inherit !default; +$headings-font-weight: $font-weight-bold !default; +$headings-line-height: 1.5 !default; +$headings-color: $gray-800 !default; +$heading-letter-spacing: 0.025em !default; +$heading-font-size: 0.95rem !default; +$heading-text-transform: uppercase !default; +$heading-font-weight: $headings-font-weight !default; +$heading-title-letter-spacing: 0.025em !default; +$heading-title-font-size: 1.375rem !default; +$heading-title-font-weight: $font-weight-bold !default; +$heading-title-text-transform: uppercase !default; +$heading-section-letter-spacing: 0.025em !default; +$heading-section-font-size: 1.375rem !default; +$heading-section-font-weight: $font-weight-bold !default; +$heading-section-text-transform: uppercase !default; +$display1-size: 3.3rem !default; +$display2-size: 2.75rem !default; +$display3-size: 2.1875rem !default; +$display4-size: 1.6275rem !default; +$display1-weight: $font-weight-bold !default; +$display2-weight: $font-weight-bold !default; +$display3-weight: $font-weight-bold !default; +$display4-weight: $font-weight-bold !default; +$display-line-height: $headings-line-height !default; +$paragraph-font-size: 1rem !default; +$paragraph-font-weight: 300 !default; +$paragraph-line-height: 1.7 !default; +$lead-font-size: ($paragraph-font-size * 1.25) !default; +$lead-font-weight: 300 !default; +$small-font-size: 80% !default; +$text-muted: $gray-600 !default; +$blockquote-small-color: $gray-600 !default; +$blockquote-font-size: ($font-size-base * 1.25) !default; +$hr-border-color: rgba($black, 0.1); +$hr-border-width: $border-width !default; +$mark-padding: 0.2em !default; +$dt-font-weight: $font-weight-bold !default; +$list-inline-padding: 0.5rem !default; +$mark-bg: #fcf8e3 !default; +$hr-margin-y: $spacer * 2 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_footer.scss b/frontend/src/assets/scss/custom/gradido-custom/_footer.scss index 50bc8fecb..8cc541f2e 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_footer.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_footer.scss @@ -1,13 +1,11 @@ // Footer -$footer-padding-y: 2.5rem; -$footer-padding-x: 0; - - -$footer-link-font-size: .85rem !default; +$footer-padding-y: 2.5rem; +$footer-padding-x: 0; +$footer-link-font-size: 0.85rem !default; $footer-bg: theme-color("secondary") !default; $footer-color: $gray-600 !default; $footer-link-color: $gray-600 !default; $footer-link-hover-color: $gray-700 !default; $footer-heading-color: $gray-600 !default; -$footer-heading-font-size: $font-size-sm !default; \ No newline at end of file +$footer-heading-font-size: $font-size-sm !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_form-groups.scss b/frontend/src/assets/scss/custom/gradido-custom/_form-groups.scss index 88bbfef4a..e367b97a5 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_form-groups.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_form-groups.scss @@ -1,3 +1,3 @@ // Form group -$form-group-margin-bottom: 1.5rem !default; +$form-group-margin-bottom: 1.5rem !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_form-validation.scss b/frontend/src/assets/scss/custom/gradido-custom/_form-validation.scss index 644b49b9f..935481fb8 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_form-validation.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_form-validation.scss @@ -1,6 +1,6 @@ // Form validation -$form-feedback-valid-bg: lighten($success, 15%) !default; -$form-feedback-valid-color: theme-color("success") !default; -$form-feedback-invalid-bg: lighten($warning, 15%) !default; -$form-feedback-invalid-color: theme-color("warning") !default; +$form-feedback-valid-bg: color.adjust($success, 15%) !default; +$form-feedback-valid-color: theme-color("success") !default; +$form-feedback-invalid-bg: color.adjust($warning, 15%) !default; +$form-feedback-invalid-color: theme-color("warning") !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_forms.scss b/frontend/src/assets/scss/custom/gradido-custom/_forms.scss index e69de29bb..8b1a39374 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_forms.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_forms.scss @@ -0,0 +1 @@ +// empty diff --git a/frontend/src/assets/scss/custom/gradido-custom/_global.scss b/frontend/src/assets/scss/custom/gradido-custom/_global.scss index 14961b56a..f4f787be6 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_global.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_global.scss @@ -1,11 +1,9 @@ - // Global settings -$enable-caret: true !default; -$enable-rounded: true !default; -$enable-shadows: true !default; -$enable-gradients: false !default; -$enable-transitions: true !default; -$enable-grid-classes: true !default; -$enable-print-styles: true !default; - +$enable-caret: true !default; +$enable-rounded: true !default; +$enable-shadows: true !default; +$enable-gradients: false !default; +$enable-transitions: true !default; +$enable-grid-classes: true !default; +$enable-print-styles: true !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_grid-breakpoint.scss b/frontend/src/assets/scss/custom/gradido-custom/_grid-breakpoint.scss index 499e672a5..af4296cf6 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_grid-breakpoint.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_grid-breakpoint.scss @@ -11,7 +11,6 @@ $grid-breakpoints: ( @include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); @include _assert-starts-at-zero($grid-breakpoints); - // Grid containers -// + // Define the maximum width of `.container` for different screen sizes. diff --git a/frontend/src/assets/scss/custom/gradido-custom/_icons.scss b/frontend/src/assets/scss/custom/gradido-custom/_icons.scss index b4b520996..f20490d59 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_icons.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_icons.scss @@ -1,7 +1,6 @@ - // Icons $icon-size: 3rem !default; $icon-size-xl: 5rem !default; $icon-size-lg: 4rem !default; -$icon-size-sm: 2rem !default; \ No newline at end of file +$icon-size-sm: 2rem !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_input-groups.scss b/frontend/src/assets/scss/custom/gradido-custom/_input-groups.scss index 7824bae28..66add56f5 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_input-groups.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_input-groups.scss @@ -1,9 +1,8 @@ // Input groups -$input-group-addon-color: $input-placeholder-color !default; -$input-group-addon-bg: $input-bg !default; -$input-group-addon-border-color: $input-border-color !default; - -$input-group-addon-focus-color: $input-focus-color !default; -$input-group-addon-focus-bg: $input-focus-bg !default; -$input-group-addon-focus-border-color: $input-focus-border-color !default; +$input-group-addon-color: $input-placeholder-color !default; +$input-group-addon-bg: $input-bg !default; +$input-group-addon-border-color: $input-border-color !default; +$input-group-addon-focus-color: $input-focus-color !default; +$input-group-addon-focus-bg: $input-focus-bg !default; +$input-group-addon-focus-border-color: $input-focus-border-color !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_input.scss b/frontend/src/assets/scss/custom/gradido-custom/_input.scss index c3320ccc7..339a4ace2 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_input.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_input.scss @@ -1,45 +1,36 @@ // Input -$input-padding-y: $input-btn-padding-y !default; -$input-padding-x: $input-btn-padding-x !default; -$input-line-height: $input-btn-line-height !default; +$input-padding-y: $input-btn-padding-y !default; +$input-padding-x: $input-btn-padding-x !default; +$input-line-height: $input-btn-line-height !default; +$input-padding-y-sm: $input-btn-padding-y-sm !default; +$input-padding-x-sm: $input-btn-padding-x-sm !default; +$input-line-height-sm: $input-btn-line-height-sm !default; +$input-padding-y-lg: $input-btn-padding-y-lg !default; +$input-padding-x-lg: $input-btn-padding-x-lg !default; +$input-line-height-lg: $input-btn-line-height-lg !default; +$input-border-radius: $border-radius !default; +$input-border-radius-xl: $border-radius-xl !default; +$input-border-radius-lg: $border-radius-lg !default; +$input-border-radius-sm: $border-radius-sm !default; +$input-bg: $white !default; +$input-disabled-bg: $gray-200 !default; +$input-muted-bg: #f7fafe !default; +$input-focus-muted-bg: color.adjust($input-muted-bg, 1%) !default; +$input-alternative-box-shadow: 0 1px 3px rgb(50 50 93 / 15%), 0 1px 0 rgb(0 0 0 / 2%) !default; +$input-focus-alternative-box-shadow: 0 4px 6px rgb(50 50 93 / 11%),0 1px 3px rgb(0 0 0 / 8%) !default; +$input-color: $gray-600 !default; +$input-border-color: #cad1d7 !default; +$input-border-width: $input-btn-border-width !default; +$input-box-shadow: none !default; // 0 1px 3px 0 $gray-400 !default; -$input-padding-y-sm: $input-btn-padding-y-sm !default; -$input-padding-x-sm: $input-btn-padding-x-sm !default; -$input-line-height-sm: $input-btn-line-height-sm !default; +$input-focus-bg: $white !default; +$input-focus-border-color: rgb(50 151 211 / 25%) !default; +$input-focus-color: $input-color !default; +$input-focus-width: 0 !default; +$input-focus-box-shadow: none !default; // 0 1px 3px 0 $gray-500 !default; -$input-padding-y-lg: $input-btn-padding-y-lg !default; -$input-padding-x-lg: $input-btn-padding-x-lg !default; -$input-line-height-lg: $input-btn-line-height-lg !default; - -$input-border-radius: $border-radius !default; -$input-border-radius-xl: $border-radius-xl !default; -$input-border-radius-lg: $border-radius-lg !default; -$input-border-radius-sm: $border-radius-sm !default; - -$input-bg: $white !default; -$input-disabled-bg: $gray-200 !default; - -$input-muted-bg: #F7FAFE !default; -$input-focus-muted-bg: lighten($input-muted-bg, 1%) !default; - -$input-alternative-box-shadow: 0 1px 3px rgba(50,50,93,.15), 0 1px 0 rgba(0,0,0,.02) !default; -$input-focus-alternative-box-shadow: 0 4px 6px rgba(50,50,93,.11),0 1px 3px rgba(0,0,0,.08) !default; - -$input-color: $gray-600 !default; -$input-border-color: #cad1d7 !default; -$input-border-width: $input-btn-border-width !default; -$input-box-shadow: none !default; // 0 1px 3px 0 $gray-400 !default; - -$input-focus-bg: $white !default; -$input-focus-border-color: rgba(50,151,211,.25) !default; -$input-focus-color: $input-color !default; -$input-focus-width: 0 !default; -$input-focus-box-shadow: none !default; //0 1px 3px 0 $gray-500 !default; - -$input-placeholder-color: $gray-500 !default; -$input-focus-placeholder-color: $gray-500 !default; - -$input-height-border: $input-border-width * 2 !default; - -$input-transition: all .2s cubic-bezier(0.68, -0.55, 0.265, 1.55) !default; +$input-placeholder-color: $gray-500 !default; +$input-focus-placeholder-color: $gray-500 !default; +$input-height-border: $input-border-width * 2 !default; +$input-transition: all 0.2s cubic-bezier(0.68, -0.55, 0.265, 1.55) !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_links.scss b/frontend/src/assets/scss/custom/gradido-custom/_links.scss index 3cdd10dad..ef6988b27 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_links.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_links.scss @@ -1,6 +1,6 @@ // Links -$link-color: $primary !default; -$link-decoration: none !default; -$link-hover-color: darken($link-color, 15%) !default; -$link-hover-decoration: none !default; \ No newline at end of file +$link-color: $primary !default; +$link-decoration: none !default; +$link-hover-color: color.adjust($link-color, -15%) !default; +$link-hover-decoration: none !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_list-group.scss b/frontend/src/assets/scss/custom/gradido-custom/_list-group.scss index 0109d4644..647570cb1 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_list-group.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_list-group.scss @@ -1,23 +1,18 @@ // List group -$list-group-bg: $white !default; -$list-group-border-color: $border-color !default; //rgba($black, .125); -$list-group-border-width: $border-width !default; -$list-group-border-radius: $border-radius !default; - -$list-group-item-padding-y: 1rem !default; -$list-group-item-padding-x: 1rem !default; - -$list-group-hover-bg: $gray-100 !default; -$list-group-active-color: $component-active-color !default; -$list-group-active-bg: $component-active-bg !default; -$list-group-active-border-color: $list-group-active-bg !default; - -$list-group-disabled-color: $gray-600 !default; -$list-group-disabled-bg: $list-group-bg !default; - -$list-group-action-color: $gray-700 !default; -$list-group-action-hover-color: $list-group-action-color !default; - -$list-group-action-active-color: $list-group-action-color !default; -$list-group-action-active-bg: $gray-200 !default; +$list-group-bg: $white !default; +$list-group-border-color: $border-color !default; // rgba($black, .125); +$list-group-border-width: $border-width !default; +$list-group-border-radius: $border-radius !default; +$list-group-item-padding-y: 1rem !default; +$list-group-item-padding-x: 1rem !default; +$list-group-hover-bg: $gray-100 !default; +$list-group-active-color: $component-active-color !default; +$list-group-active-bg: $component-active-bg !default; +$list-group-active-border-color: $list-group-active-bg !default; +$list-group-disabled-color: $gray-600 !default; +$list-group-disabled-bg: $list-group-bg !default; +$list-group-action-color: $gray-700 !default; +$list-group-action-hover-color: $list-group-action-color !default; +$list-group-action-active-color: $list-group-action-color !default; +$list-group-action-active-bg: $gray-200 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_modals.scss b/frontend/src/assets/scss/custom/gradido-custom/_modals.scss index 3ef72f5bc..a372d586d 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_modals.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_modals.scss @@ -1,24 +1,20 @@ // Modals -$modal-inner-padding: 1.5rem !default; - -$modal-lg: 800px !default; -$modal-md: 500px !default; -$modal-sm: 380px !default; - -$modal-title-line-height: 1.1; - -$modal-content-bg: $white !default; -$modal-content-border-color: rgba($black, .2) !default; -$modal-content-border-width: 0 !default; -$modal-content-border-radius: $border-radius-lg !default; -$modal-content-box-shadow-xs: 0 15px 35px rgba(50,50,93,.2), 0 5px 15px rgba(0,0,0,.17); -$modal-content-box-shadow-sm-up: 0 15px 35px rgba(50,50,93,.2), 0 5px 15px rgba(0,0,0,.17); - -$modal-backdrop-bg: $black !default; -$modal-backdrop-opacity: .16 !default; -$modal-header-border-color: $gray-200 !default; -$modal-footer-border-color: $modal-header-border-color !default; -$modal-header-border-width: $modal-content-border-width !default; -$modal-footer-border-width: $modal-header-border-width !default; -$modal-header-padding: 1.25rem !default; \ No newline at end of file +$modal-inner-padding: 1.5rem !default; +$modal-lg: 800px !default; +$modal-md: 500px !default; +$modal-sm: 380px !default; +$modal-title-line-height: 1.1; +$modal-content-bg: $white !default; +$modal-content-border-color: rgba($black, 0.2) !default; +$modal-content-border-width: 0 !default; +$modal-content-border-radius: $border-radius-lg !default; +$modal-content-box-shadow-xs: 0 15px 35px rgb(50 50 93 / 20%), 0 5px 15px rgb(0 0 0 / 17%); +$modal-content-box-shadow-sm-up: 0 15px 35px rgb(50 50 93 / 20%), 0 5px 15px rgb(0 0 0 / 17%); +$modal-backdrop-bg: $black !default; +$modal-backdrop-opacity: 0.16 !default; +$modal-header-border-color: $gray-200 !default; +$modal-footer-border-color: $modal-header-border-color !default; +$modal-header-border-width: $modal-content-border-width !default; +$modal-footer-border-width: $modal-header-border-width !default; +$modal-header-padding: 1.25rem !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_navbar.scss b/frontend/src/assets/scss/custom/gradido-custom/_navbar.scss index 39bd31dd7..1f4abaf45 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_navbar.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_navbar.scss @@ -1,49 +1,41 @@ // Navbar -$navbar-transition: all .15s linear !default; -$navbar-padding-y: 1rem !default; -$navbar-padding-x: 1rem !default; - -$navbar-nav-link-padding-x: 1rem !default; -$navbar-nav-link-padding-y: 1rem !default; - -$navbar-nav-link-font-size: .9rem !default; -$navbar-nav-link-font-weight: 400 !default; -$navbar-nav-link-text-transform: normal !default; -$navbar-nav-link-letter-spacing: 0 !default; -$navbar-nav-link-border-radius: $border-radius !default; - -$navbar-search-width: 270px !default; -$navbar-search-bg: transparent !default; - -$navbar-search-border-radius: 2rem !default; -$navbar-search-border-width: 2px !default; - -$navbar-dark-bg: transparent !default; -$navbar-dark-hover-bg: rgba(255, 255, 255, .1) !default; -$navbar-dark-active-bg: rgba(255, 255, 255, .1) !default; -$navbar-dark-color: rgba($white, .95) !default; -$navbar-dark-hover-color: rgba($white, .65) !default; -$navbar-dark-active-color: rgba($white, .65) !default; -$navbar-dark-disabled-color: rgba($white, .25) !default; -$navbar-dark-toggler-border-color: transparent !default; - -$navbar-search-dark-border-color: rgba(255, 255, 255, .6) !default; -$navbar-search-dark-color: rgba(255, 255, 255, .6) !default; -$navbar-search-dark-focus-border-color: rgba(255, 255, 255, .9) !default; -$navbar-search-dark-focus-color: rgba(255, 255, 255, .9) !default; - -$navbar-light-bg: transparent !default; -$navbar-light-hover-bg: rgba(0, 0, 0, .1) !default; -$navbar-light-active-bg: rgba(0, 0, 0, .1) !default; -$navbar-light-border-color: $gray-100 !default; -$navbar-light-color: rgba($black, .5) !default; -$navbar-light-hover-color: rgba($black, .7) !default; -$navbar-light-active-color: rgba($black, .9) !default; -$navbar-light-disabled-color: rgba($black, .3) !default; +$navbar-transition: all 0.15s linear !default; +$navbar-padding-y: 1rem !default; +$navbar-padding-x: 1rem !default; +$navbar-nav-link-padding-x: 1rem !default; +$navbar-nav-link-padding-y: 1rem !default; +$navbar-nav-link-font-size: 0.9rem !default; +$navbar-nav-link-font-weight: 400 !default; +$navbar-nav-link-text-transform: normal !default; +$navbar-nav-link-letter-spacing: 0 !default; +$navbar-nav-link-border-radius: $border-radius !default; +$navbar-search-width: 270px !default; +$navbar-search-bg: transparent !default; +$navbar-search-border-radius: 2rem !default; +$navbar-search-border-width: 2px !default; +$navbar-dark-bg: transparent !default; +$navbar-dark-hover-bg: rgb(255 255 255 / 10%) !default; +$navbar-dark-active-bg: rgb(255 255 255 / 10%) !default; +$navbar-dark-color: rgba($white, 0.95) !default; +$navbar-dark-hover-color: rgba($white, 0.65) !default; +$navbar-dark-active-color: rgba($white, 0.65) !default; +$navbar-dark-disabled-color: rgba($white, 0.25) !default; +$navbar-dark-toggler-border-color: transparent !default; +$navbar-search-dark-border-color: rgb(255 255 255 / 60%) !default; +$navbar-search-dark-color: rgb(255 255 255 / 60%) !default; +$navbar-search-dark-focus-border-color: rgb(255 255 255 / 90%) !default; +$navbar-search-dark-focus-color: rgb(255 255 255 / 90%) !default; +$navbar-light-bg: transparent !default; +$navbar-light-hover-bg: rgb(0 0 0 / 10%) !default; +$navbar-light-active-bg: rgb(0 0 0 / 10%) !default; +$navbar-light-border-color: $gray-100 !default; +$navbar-light-color: rgba($black, 0.5) !default; +$navbar-light-hover-color: rgba($black, 0.7) !default; +$navbar-light-active-color: rgba($black, 0.9) !default; +$navbar-light-disabled-color: rgba($black, 0.3) !default; $navbar-light-toggler-border-color: transparent !default; - -$navbar-search-light-border-color: rgba(0, 0, 0, .6) !default; -$navbar-search-light-color: rgba(0, 0, 0, .6) !default; -$navbar-search-light-focus-border-color: rgba(0, 0, 0, .9) !default; -$navbar-search-light-focus-color: rgba(0, 0, 0, .9) !default; +$navbar-search-light-border-color: rgb(0 0 0 / 60%) !default; +$navbar-search-light-color: rgb(0 0 0 / 60%) !default; +$navbar-search-light-focus-border-color: rgb(0 0 0 / 90%) !default; +$navbar-search-light-focus-color: rgb(0 0 0 / 90%) !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_navs.scss b/frontend/src/assets/scss/custom/gradido-custom/_navs.scss index ba3083b02..050ffe419 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_navs.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_navs.scss @@ -1,23 +1,19 @@ // Navs -$nav-link-padding-y: .25rem !default; -$nav-link-padding-x: .75rem !default; -$nav-link-color: $gray-700 !default; -$nav-link-hover-color: theme-color("primary") !default; -$nav-link-disabled-color: $gray-600 !default; - -$nav-pills-padding-y: .75rem !default; -$nav-pills-padding-x: 1rem !default; - -$nav-pills-space-x: 1rem !default; - -$nav-pills-bg: $white !default; -$nav-pills-border-width: 1px !default; -$nav-pills-border-color: theme-color("primary") !default; -$nav-pills-border-radius: $border-radius !default; - -$nav-pills-link-color: theme-color("primary") !default; -$nav-pills-link-hover-color: darken(theme-color("primary"), 5%) !default; -$nav-pills-link-active-color: color-yiq(theme-color("primary")) !default; -$nav-pills-link-active-bg: theme-color("primary") !default; -$nav-pills-box-shadow: $btn-box-shadow !default; +$nav-link-padding-y: 0.25rem !default; +$nav-link-padding-x: 0.75rem !default; +$nav-link-color: $gray-700 !default; +$nav-link-hover-color: theme-color("primary") !default; +$nav-link-disabled-color: $gray-600 !default; +$nav-pills-padding-y: 0.75rem !default; +$nav-pills-padding-x: 1rem !default; +$nav-pills-space-x: 1rem !default; +$nav-pills-bg: $white !default; +$nav-pills-border-width: 1px !default; +$nav-pills-border-color: theme-color("primary") !default; +$nav-pills-border-radius: $border-radius !default; +$nav-pills-link-color: theme-color("primary") !default; +$nav-pills-link-hover-color: color.adjust(theme-color("primary"), -5%) !default; +$nav-pills-link-active-color: color-yiq(theme-color("primary")) !default; +$nav-pills-link-active-bg: theme-color("primary") !default; +$nav-pills-box-shadow: $btn-box-shadow !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_nouislider.scss b/frontend/src/assets/scss/custom/gradido-custom/_nouislider.scss index 9ce346e35..9d4bb94ca 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_nouislider.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_nouislider.scss @@ -1,17 +1,14 @@ // No UI Slider -$noui-target-bg: #eceeef !default; -$noui-target-thickness: 5px !default; -$noui-target-border-radius: 5px !default; -$noui-target-border-color: 0 !default; -$noui-target-box-shadow: inset 0 1px 2px rgba(90,97,105,.1) !default; - -$noui-slider-connect-bg: $primary !default; +$noui-target-bg: #eceeef !default; +$noui-target-thickness: 5px !default; +$noui-target-border-radius: 5px !default; +$noui-target-border-color: 0 !default; +$noui-target-box-shadow: inset 0 1px 2px rgb(90 97 105 / 10%) !default; +$noui-slider-connect-bg: $primary !default; $noui-slider-connect-disabled-bg: #b2b2b2 !default; - -$noui-handle-width: 15px !default; -$noui-handle-bg: theme-color("primary") !default; -$noui-handle-border: 0 !default; -$noui-handle-border-radius: 100% !default; - -$noui-origin-border-radius: 2px !default; +$noui-handle-width: 15px !default; +$noui-handle-bg: theme-color("primary") !default; +$noui-handle-border: 0 !default; +$noui-handle-border-radius: 100% !default; +$noui-origin-border-radius: 2px !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_pagination.scss b/frontend/src/assets/scss/custom/gradido-custom/_pagination.scss index 5ec0f81f9..f98151d0b 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_pagination.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_pagination.scss @@ -8,22 +8,20 @@ // $pagination-padding-x-lg: 1.5rem !default; // $pagination-line-height: 1.25 !default; -$pagination-color: $gray-600 !default; -$pagination-bg: $white !default; -$pagination-border-width: $border-width !default; -$pagination-border-color: $gray-300 !default; +$pagination-color: $gray-600 !default; +$pagination-bg: $white !default; +$pagination-border-width: $border-width !default; +$pagination-border-color: $gray-300 !default; -//$pagination-focus-box-shadow: $btn-hover-box-shadow !default; +// $pagination-focus-box-shadow: $btn-hover-box-shadow !default; -$pagination-hover-color: $gray-600 !default; -$pagination-hover-bg: $gray-300 !default; -$pagination-hover-border-color: $gray-300 !default; - -$pagination-active-color: $component-active-color !default; -$pagination-active-bg: $component-active-bg !default; -$pagination-active-border-color: $pagination-active-bg !default; -$pagination-active-box-shadow: $btn-hover-box-shadow !default; - -$pagination-disabled-color: $gray-600 !default; -$pagination-disabled-bg: $white !default; -$pagination-disabled-border-color: $gray-300 !default; +$pagination-hover-color: $gray-600 !default; +$pagination-hover-bg: $gray-300 !default; +$pagination-hover-border-color: $gray-300 !default; +$pagination-active-color: $component-active-color !default; +$pagination-active-bg: $component-active-bg !default; +$pagination-active-border-color: $pagination-active-bg !default; +$pagination-active-box-shadow: $btn-hover-box-shadow !default; +$pagination-disabled-color: $gray-600 !default; +$pagination-disabled-bg: $white !default; +$pagination-disabled-border-color: $gray-300 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_popovers.scss b/frontend/src/assets/scss/custom/gradido-custom/_popovers.scss index b667a294b..b5395f1d7 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_popovers.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_popovers.scss @@ -1,24 +1,20 @@ // Popovers -$popover-font-size: $font-size-sm !default; -$popover-bg: $white !default; -$popover-max-width: 276px !default; -$popover-border-width: 1px !default; -$popover-border-color: rgba($black, .05) !default; -$popover-border-radius: $border-radius-lg !default; -$popover-box-shadow: 0px .5rem 2rem 0px rgba($black, .2) !default; - -$popover-header-bg: $popover-bg !default; -$popover-header-color: $headings-color !default; -$popover-header-padding-y: .5rem !default; -$popover-header-padding-x: .95rem !default; - -$popover-body-color: $body-color !default; -$popover-body-padding-y: $popover-header-padding-y !default; -$popover-body-padding-x: $popover-header-padding-x !default; - -$popover-arrow-width: 1.5rem !default; -$popover-arrow-height: .75rem !default; -$popover-arrow-color: $popover-bg !default; - -$popover-arrow-outer-color: transparent !default; +$popover-font-size: $font-size-sm !default; +$popover-bg: $white !default; +$popover-max-width: 276px !default; +$popover-border-width: 1px !default; +$popover-border-color: rgba($black, 0.05) !default; +$popover-border-radius: $border-radius-lg !default; +$popover-box-shadow: 0 0.5rem 2rem 0 rgba($black, 0.2) !default; +$popover-header-bg: $popover-bg !default; +$popover-header-color: $headings-color !default; +$popover-header-padding-y: 0.5rem !default; +$popover-header-padding-x: 0.95rem !default; +$popover-body-color: $body-color !default; +$popover-body-padding-y: $popover-header-padding-y !default; +$popover-body-padding-x: $popover-header-padding-x !default; +$popover-arrow-width: 1.5rem !default; +$popover-arrow-height: 0.75rem !default; +$popover-arrow-color: $popover-bg !default; +$popover-arrow-outer-color: transparent !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_sections.scss b/frontend/src/assets/scss/custom/gradido-custom/_sections.scss index 02f0f4e52..df8f91f5b 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_sections.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_sections.scss @@ -1,5 +1,4 @@ // Body - $body-bg: #f8f9fe !default; $body-color: $gray-700 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_spacing.scss b/frontend/src/assets/scss/custom/gradido-custom/_spacing.scss index 8b4cf5019..fa855a9aa 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_spacing.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_spacing.scss @@ -1,37 +1,41 @@ - // Spacing $spacer: 1rem !default; $spacers: () !default; -$spacers: map-merge(( - -9: -($spacer * 10), - -8: -($spacer * 8), - -7: -($spacer * 6), - -6: -($spacer * 4.5), - -5: -($spacer * 3), - -4: -($spacer * 1.5), - -3: -$spacer, - -2: -($spacer * .5), - -1: -($spacer * .25), - 0: 0, - 1: ($spacer * .25), - 2: ($spacer * .5), - 3: $spacer, - 4: ($spacer * 1.5), - 5: ($spacer * 3), - 6: ($spacer * 4.5), - 7: ($spacer * 6), - 8: ($spacer * 8), - 9: ($spacer * 10) -), $spacers); - +$spacers: map.merge( + ( + -9: - ($spacer * 10), + -8: - ($spacer * 8), + -7: - ($spacer * 6), + -6: - ($spacer * 4.5), + -5: - ($spacer * 3), + -4: - ($spacer * 1.5), + -3: - $spacer, + -2: - ($spacer * 0.5), + -1: - ($spacer * 0.25), + 0: 0, + 1: ($spacer * 0.25), + 2: ($spacer * 0.5), + 3: $spacer, + 4: ($spacer * 1.5), + 5: ($spacer * 3), + 6: ($spacer * 4.5), + 7: ($spacer * 6), + 8: ($spacer * 8), + 9: ($spacer * 10) + ), + $spacers +); // This variable affects the `.h-*` and `.w-*` classes. $sizes: () !default; -$sizes: map-merge(( - 25: 25%, - 50: 50%, - 75: 75%, - 100: 100% -), $sizes); \ No newline at end of file +$sizes: map.merge( + ( + 25: 25%, + 50: 50%, + 75: 75%, + 100: 100% + ), + $sizes +); diff --git a/frontend/src/assets/scss/custom/gradido-custom/_tables.scss b/frontend/src/assets/scss/custom/gradido-custom/_tables.scss index 64eb6056a..8ce2f49bd 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_tables.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_tables.scss @@ -1,32 +1,25 @@ // Tables -$table-cell-padding: 1rem !default; -$table-cell-padding-sm: .5rem !default; - -$table-bg: transparent !default; -$table-accent-bg: rgba($black, .05) !default; -$table-hover-bg: $gray-100 !default; -$table-active-bg: $table-hover-bg !default; - -$table-border-width: $border-width !default; -$table-border-color: $gray-200 !default; - -$table-head-bg: $gray-100 !default; -$table-head-color: $gray-600 !default; -$table-head-spacer-y: .75rem !default; - -$table-head-font-size: .65rem !default; -$table-head-font-weight: $font-weight-bold !default; -$table-head-text-transform: uppercase !default; -$table-head-letter-spacing: 1px !default; - -$table-body-font-size: .8125rem !default; - -$table-dark-bg: theme-color("default") !default; -$table-dark-accent-bg: rgba($white, .05) !default; -$table-dark-hover-bg: rgba($white, .075) !default; -$table-dark-border-color: lighten(theme-color("default"), 7%) !default; -$table-dark-color: $body-bg !default; - -$table-dark-head-bg: lighten(theme-color("default"), 4%) !default; -$table-dark-head-color: lighten(theme-color("default"), 35%) !default; \ No newline at end of file +$table-cell-padding: 1rem !default; +$table-cell-padding-sm: 0.5rem !default; +$table-bg: transparent !default; +$table-accent-bg: rgba($black, 0.05) !default; +$table-hover-bg: $gray-100 !default; +$table-active-bg: $table-hover-bg !default; +$table-border-width: $border-width !default; +$table-border-color: $gray-200 !default; +$table-head-bg: $gray-100 !default; +$table-head-color: $gray-600 !default; +$table-head-spacer-y: 0.75rem !default; +$table-head-font-size: 0.65rem !default; +$table-head-font-weight: $font-weight-bold !default; +$table-head-text-transform: uppercase !default; +$table-head-letter-spacing: 1px !default; +$table-body-font-size: 0.8125rem !default; +$table-dark-bg: theme-color("default") !default; +$table-dark-accent-bg: rgba($white, 0.05) !default; +$table-dark-hover-bg: rgba($white, 0.075) !default; +$table-dark-border-color: color.adjust(theme-color("default"), 7%) !default; +$table-dark-color: $body-bg !default; +$table-dark-head-bg: color.adjust(theme-color("default"), 4%) !default; +$table-dark-head-color: color.adjust(theme-color("default"), 35%) !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_tooltips.scss b/frontend/src/assets/scss/custom/gradido-custom/_tooltips.scss index ea7868fef..63f9ea078 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_tooltips.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_tooltips.scss @@ -1,3 +1,3 @@ // Tooltips -$tooltip-font-size: $font-size-sm !default; +$tooltip-font-size: $font-size-sm !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_vertical-navbar.scss b/frontend/src/assets/scss/custom/gradido-custom/_vertical-navbar.scss index 6df40a4d6..4b05084e8 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_vertical-navbar.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_vertical-navbar.scss @@ -1,15 +1,12 @@ // Vertical navbar -$navbar-vertical-box-shadow: 0 0 2rem 0 rgba(136, 152, 170, .15) !important; +$navbar-vertical-box-shadow: 0 0 2rem 0 rgb(136 152 170 / 15%) !important; $navbar-vertical-width: 250px !default; $navbar-vertical-padding-x: 1.5rem !default; -$navbar-vertical-nav-link-padding-x: 1.5rem !default; -$navbar-vertical-nav-link-padding-y: .65rem !default; - +$navbar-vertical-nav-link-padding-x: 1.5rem !default; +$navbar-vertical-nav-link-padding-y: 0.65rem !default; $navbar-icon-min-width: 2.25rem !default; - $navbar-breadcrumb-padding-y: $nav-link-padding-y !default; $navbar-breadcrumb-padding-x: 0 !default; - $navbar-light-bg: $white !default; $navbar-light-border-color: $border-color !default; diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index 9bc3231c4..dba0f01da 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -1,14 +1,13 @@ - // Bootstrap (4.5.3) functions @import "~bootstrap/scss/functions"; - @import "custom/variables"; -// @import "~bootstrap/scss/variables"; wird am + +// @import "~bootstrap/scss/variables"; wird am // ende der custom/variables angehangen - + // Bootstrap (4.5.3) mixins -@import "~bootstrap/scss/mixins"; +@import "~bootstrap/scss/mixins"; // Bootstrap (4.5.3) components @@ -22,13 +21,16 @@ @import "~bootstrap/scss/close"; @import "~bootstrap/scss/code"; @import "~bootstrap/scss/custom-forms"; -@import "~bootstrap/scss/dropdown"; + +// @import "~bootstrap/scss/dropdown"; @import "~bootstrap/scss/forms"; -@import "~bootstrap/scss/functions"; + +// @import "~bootstrap/scss/functions"; @import "~bootstrap/scss/grid"; @import "~bootstrap/scss/input-group"; @import "~bootstrap/scss/list-group"; -@import "~bootstrap/scss/mixins"; + +// @import "~bootstrap/scss/mixins"; @import "~bootstrap/scss/modal"; @import "~bootstrap/scss/nav"; @import "~bootstrap/scss/navbar"; @@ -48,94 +50,111 @@ @import "~bootstrap/scss/bootstrap"; // Bootstrap-vue (2.21.1) scss -@import '~bootstrap-vue/src/index.scss'; - +@import "~bootstrap-vue/src/index"; .alert-success { - color: #155724; - background-color: #d4edda; - border-color: #c3e6cb; -} -.alert-danger { - color: #721c24; - background-color: #f8d7da; - border-color: #f5c6cb; + color: #155724; + background-color: #d4edda; + border-color: #c3e6cb; } +.alert-danger { + color: #721c24; + background-color: #f8d7da; + border-color: #f5c6cb; +} .b-toast-danger .toast .toast-header { - color: #721c24; - background-color: rgba(248,215,218,.85); - border-bottom-color: rgba(245,198,203,.85); + color: #721c24; + background-color: rgb(248 215 218 / 85%); + border-bottom-color: rgb(245 198 203 / 85%); } -.b-toast-danger .toast .toast-body{ - background-color: rgba(252,237,238,.85); - border-color: rgba(245,198,203,.85); - color: #721c24; + +.b-toast-danger .toast .toast-body { + background-color: rgb(252 237 238 / 85%); + border-color: rgb(245 198 203 / 85%); + color: #721c24; } .b-toast-success .toast .toast-header { - color: #155724; - background-color: rgba(212,237,218,.58); - border-bottom-color: rgba(195,230,203,.85); -} -.b-toast-success .toast .toast-body{ - color: #155724; - background-color: rgba(212,237,218,.85); - border-bottom-color: rgba(195,230,203,.85); + color: #155724; + background-color: rgb(212 237 218 / 58%); + border-bottom-color: rgb(195 230 203 / 85%); } +.b-toast-success .toast .toast-body { + color: #155724; + background-color: rgb(212 237 218 / 85%); + border-bottom-color: rgb(195 230 203 / 85%); +} - .btn-primary pim { - background-color: #5a7b02; - border-color: #5e72e4; - } - a, - .copyright { - color: #5a7b02; - } - .font1_2em { - font-size: 1.2em; - } - .font2em { - font-size: 1.5em; - } - .gradido-global-color-text { - color: #3d443b; - } - .gradido-global-color-accent { - color: #047006; - } - .gradido-global-color-6e0a9c9e { - color: #000; - } - .gradido-global-color-2d0fb154 { - color: #047006; - } - .gradido-global-color-16efe88c { - color: #7ebc55; - } - .gradido-global-color-1939326 { - color: #f6fff6; - } - .gradido-global-color-9d79fc1 { - color: #047006; - } - .gradido-global-color-6347f4d { - color: #5a7b02; - } - .gradido-global-color-4fbc19a { - color: #014034; - } - .gradido-global-color-d341874 { - color: #b6d939; - } - .gradido-global-color-619d338 { - color: #8ebfb1; - } - .gradido-global-color-44819a9 { - color: #026873; - } - .gradido-global-color-gray { - color: #858383; - } \ No newline at end of file +// .btn-primary pim { +.btn-primary { + background-color: #5a7b02; + border-color: #5e72e4; +} + +a, +.copyright { + color: #5a7b02; +} + +.font12em { + font-size: 1.2em; +} + +.font2em { + font-size: 1.5em; +} + +.gradido-global-color-text { + color: #3d443b; +} + +.gradido-global-color-accent { + color: #047006; +} + +.gradido-global-color-6e0a9c9e { + color: #000; +} + +.gradido-global-color-2d0fb154 { + color: #047006; +} + +.gradido-global-color-16efe88c { + color: #7ebc55; +} + +.gradido-global-color-1939326 { + color: #f6fff6; +} + +.gradido-global-color-9d79fc1 { + color: #047006; +} + +.gradido-global-color-6347f4d { + color: #5a7b02; +} + +.gradido-global-color-4fbc19a { + color: #014034; +} + +.gradido-global-color-d341874 { + color: #b6d939; +} + +.gradido-global-color-619d338 { + color: #8ebfb1; +} + +.gradido-global-color-44819a9 { + color: #026873; +} + +.gradido-global-color-gray { + color: #858383; +} diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 20943d14a..4341791f0 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -53,8 +53,8 @@ export default { } diff --git a/frontend/src/components/UserCard.vue b/frontend/src/components/UserCard.vue index 04e1c927e..728883109 100755 --- a/frontend/src/components/UserCard.vue +++ b/frontend/src/components/UserCard.vue @@ -50,4 +50,3 @@ export default { }, } - diff --git a/frontend/src/components/UserCard_FormUserMail.vue b/frontend/src/components/UserCard_FormUserMail.vue index f21d8ffa3..b042a1961 100644 --- a/frontend/src/components/UserCard_FormUserMail.vue +++ b/frontend/src/components/UserCard_FormUserMail.vue @@ -61,4 +61,3 @@ export default { }, } - diff --git a/frontend/src/layouts/ContentFooter.vue b/frontend/src/layouts/ContentFooter.vue index 9d45cddb6..de49e8635 100755 --- a/frontend/src/layouts/ContentFooter.vue +++ b/frontend/src/layouts/ContentFooter.vue @@ -72,4 +72,3 @@ export default { }, } - diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue index eeb954a0c..44d6e7e6b 100644 --- a/frontend/src/pages/ForgotPassword.vue +++ b/frontend/src/pages/ForgotPassword.vue @@ -96,4 +96,3 @@ export default { }, } - diff --git a/frontend/src/pages/RegisterCommunity.vue b/frontend/src/pages/RegisterCommunity.vue index 17f500e07..736a4282f 100644 --- a/frontend/src/pages/RegisterCommunity.vue +++ b/frontend/src/pages/RegisterCommunity.vue @@ -56,4 +56,3 @@ export default { mixins: [getCommunityInfoMixin], } - diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue index 830107a99..1790802d4 100644 --- a/frontend/src/pages/ResetPassword.vue +++ b/frontend/src/pages/ResetPassword.vue @@ -118,4 +118,3 @@ export default { }, } -