From 8c15d745f1a6c023940747a9c76137846f19528d Mon Sep 17 00:00:00 2001 From: Ramona Weitzenberg <63390574+monaweitzenberg@users.noreply.github.com> Date: Tue, 26 Mar 2024 11:02:10 +0100 Subject: [PATCH 1/2] exchange color from 54616E to 3a424b --- .../images/empty-states/archived_courses.svg | 2 +- static/images/empty-states/groups.svg | 2 +- static/images/empty-states/tasks.svg | 2 +- static/images/home/advantage_4.svg | 2 +- static/images/home/advantages.svg | 2 +- static/images/messenger-info.svg | 2 +- .../registration-link-validation.js | 2 +- static/styles/homepage/index.scss | 212 ++-- .../styles/lib/bootstrap/scss/_variables.scss | 1012 ++++++++--------- static/styles/lib/colors.scss | 10 +- theme/brb/views/authentication/home.hbs | 4 +- theme/default/style.scss | 68 +- .../components/svg_archived_courses.hbs | 910 +++++++++++---- views/courses/components/svg_groups.hbs | 63 +- views/courses/components/svg_tasks.hbs | 49 +- views/lib/components/svg_error_content.hbs | 2 +- views/teams/svg_empty_teams.hbs | 20 +- 17 files changed, 1458 insertions(+), 906 deletions(-) diff --git a/static/images/empty-states/archived_courses.svg b/static/images/empty-states/archived_courses.svg index a70a14d92d..467fff15ec 100644 --- a/static/images/empty-states/archived_courses.svg +++ b/static/images/empty-states/archived_courses.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/empty-states/groups.svg b/static/images/empty-states/groups.svg index 7c548d1ccb..df9709e130 100644 --- a/static/images/empty-states/groups.svg +++ b/static/images/empty-states/groups.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/empty-states/tasks.svg b/static/images/empty-states/tasks.svg index d064ae63cb..afa964ec2d 100644 --- a/static/images/empty-states/tasks.svg +++ b/static/images/empty-states/tasks.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/home/advantage_4.svg b/static/images/home/advantage_4.svg index 7acdd6ec2c..5ef7e0408c 100644 --- a/static/images/home/advantage_4.svg +++ b/static/images/home/advantage_4.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/home/advantages.svg b/static/images/home/advantages.svg index 125e13de2d..ea0b75a189 100644 --- a/static/images/home/advantages.svg +++ b/static/images/home/advantages.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/messenger-info.svg b/static/images/messenger-info.svg index 58d8d5e2b5..315bc0399c 100644 --- a/static/images/messenger-info.svg +++ b/static/images/messenger-info.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/scripts/dataprivacy/registration-link-validation.js b/static/scripts/dataprivacy/registration-link-validation.js index c6c6ed774f..2051163e0f 100644 --- a/static/scripts/dataprivacy/registration-link-validation.js +++ b/static/scripts/dataprivacy/registration-link-validation.js @@ -38,7 +38,7 @@ window.addEventListener('DOMContentLoaded', () => { - + diff --git a/static/styles/homepage/index.scss b/static/styles/homepage/index.scss index c6d6a06c6e..8c7dfcbb98 100644 --- a/static/styles/homepage/index.scss +++ b/static/styles/homepage/index.scss @@ -1,140 +1,140 @@ -@import '../lib/bootstrap/scss/bootstrap'; +@import "../lib/bootstrap/scss/bootstrap"; @import "./blog-card"; @import "./login"; -.btn-primary.btn-outline{ - &:hover { - background-color: var(--color-primary); - border-color: var(--color-primary); - color: var(--color-white); - } - border: 1px solid var(--color-primary); - color: var(--color-primary); - background: transparent; +.btn-primary.btn-outline { + &:hover { + background-color: var(--color-primary); + border-color: var(--color-primary); + color: var(--color-white); + } + border: 1px solid var(--color-primary); + color: var(--color-primary); + background: transparent; } .nav-link { font-size: 16px; line-height: 19.2px; - &:hover, &:focus{ + &:hover, + &:focus { background-color: rgb(238, 238, 238) !important; } } -.section a.btn.btn-white-outlined{ - display: inline-block; - border: 1px solid; - text-decoration: none; - &:hover{ - background-color: var(--color-white); - color: var(--color-accent); - } +.section a.btn.btn-white-outlined { + display: inline-block; + border: 1px solid; + text-decoration: none; + &:hover { + background-color: var(--color-white); + color: var(--color-accent); + } } -.grid-align-right{ - @supports (display: grid) { - text-align: right; - } - @include media-breakpoint-down(md) { - text-align: left; - } +.grid-align-right { + @supports (display: grid) { + text-align: right; + } + @include media-breakpoint-down(md) { + text-align: left; + } } -.partner{ - border: var(--border-width) solid var(--color-gray-light); - width: 100%; - height: 100%; - padding: var(--space-md); - object-fit: contain; - background: #fff; - &:hover { - box-shadow: var(--shadow-sm); - transition: box-shadow .2s ease,transform .2s ease,z-index 0s 0s ease; - } +.partner { + border: var(--border-width) solid var(--color-gray-light); + width: 100%; + height: 100%; + padding: var(--space-md); + object-fit: contain; + background: #fff; + &:hover { + box-shadow: var(--shadow-sm); + transition: box-shadow 0.2s ease, transform 0.2s ease, z-index 0s 0s ease; + } } - thead { - border-bottom: 2px solid #54616e; - - th { - background-color: transparent; - border: none; - } - } - - td { - text-align: center; - vertical-align: middle; - font-size: 0.85em; - - &:first-child{ - text-align: left; - } - } - img.check { +thead { + border-bottom: 2px solid #3a424b; + + th { + background-color: transparent; + border: none; + } +} + +td { + text-align: center; + vertical-align: middle; + font-size: 0.85em; + + &:first-child { + text-align: left; + } +} +img.check { + width: 100% !important; + max-width: 40px !important; +} +@include media-breakpoint-down(lg) { + .btn-margin { + margin-top: 8px; + } + .prototype-button { width: 100% !important; - max-width: 40px !important; } - @include media-breakpoint-down(lg) { - .btn-margin { - margin-top: 8px; +} + +.flex-container { + display: flex; + align-items: center; + + h1 { + font-size: 50px; + + @include media-breakpoint-down(sm) { + font-size: 40px; } - .prototype-button { - width: 100% !important; + } + + p { + margin-bottom: 0; + } + .teaser { + font-size: 24px; + + @include media-breakpoint-down(sm) { + font-size: 18px; } } -.flex-container { - display: flex; - align-items: center; - - h1{ - font-size: 50px; - - @include media-breakpoint-down(sm) { - font-size: 40px; - } - } - - p { - margin-bottom: 0; - } - .teaser{ - font-size:24px; - - @include media-breakpoint-down(sm) { - font-size:18px; - } - } - - .section-img { - @include media-breakpoint-down(sm) { - width: 40vw; - } - } - .check { - width: 40px; - } + .section-img { + @include media-breakpoint-down(sm) { + width: 40vw; + } + } + .check { + width: 40px; + } } -.section-landing{ - margin-bottom: 100px; - @include media-breakpoint-down(sm) { - margin-bottom: 60px; - margin-top: 70px; - } +.section-landing { + margin-bottom: 100px; + @include media-breakpoint-down(sm) { + margin-bottom: 60px; + margin-top: 70px; + } } -.heading{ - font-size: 29px; +.heading { + font-size: 29px; } .section-heading { - font-size: 40px; - - @include media-breakpoint-down(sm) { - font-size: 35px; - } + font-size: 40px; + @include media-breakpoint-down(sm) { + font-size: 35px; + } } .alert { margin-top: 1rem !important; diff --git a/static/styles/lib/bootstrap/scss/_variables.scss b/static/styles/lib/bootstrap/scss/_variables.scss index ea88259f15..947c2c9da4 100755 --- a/static/styles/lib/bootstrap/scss/_variables.scss +++ b/static/styles/lib/bootstrap/scss/_variables.scss @@ -3,7 +3,6 @@ // Copy settings from this file into the provided `_custom.scss` to override // the Bootstrap defaults without modifying key, versioned files. - // Table of Contents // // Colors @@ -18,58 +17,55 @@ // Components @mixin _assert-ascending($map, $map-name) { - $prev-key: null; - $prev-num: null; - @each $key, $num in $map { - @if $prev-num == null { - // Do nothing - } @else if not comparable($prev-num, $num) { - @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !"; - } @else if $prev-num >= $num { - @warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !"; - } - $prev-key: $key; - $prev-num: $num; - } + $prev-key: null; + $prev-num: null; + @each $key, $num in $map { + @if $prev-num == null { + // Do nothing + } @else if not comparable($prev-num, $num) { + @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !"; + } @else if $prev-num >= $num { + @warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !"; + } + $prev-key: $key; + $prev-num: $num; + } } // General variable structure // // Variable format should follow the `$component-modifier-state-property` order. - // Colors // // Grayscale and brand colors for use across Bootstrap. -$gray-dark: #373a3c !default; -$gray: #55595c !default; -$gray-light: #818a91 !default; -$gray-lighter: #eceeef !default; -$gray-lightest: #f7f7f9 !default; -$gray-alert: #9e9e9e !default; -$brand-primary: #9e292b !default; -$brand-secondary: #54616e !default; -$brand-success: #5cb85c !default; -$brand-info: #5bc0de !default; -$brand-warning: #f0ad4e !default; -$brand-danger: #d9534f !default; -$brand-inverse: $gray-dark !default; - +$gray-dark: #373a3c !default; +$gray: #55595c !default; +$gray-light: #818a91 !default; +$gray-lighter: #eceeef !default; +$gray-lightest: #f7f7f9 !default; +$gray-alert: #9e9e9e !default; +$brand-primary: #9e292b !default; +$brand-secondary: #3a424b !default; +$brand-success: #5cb85c !default; +$brand-info: #5bc0de !default; +$brand-warning: #f0ad4e !default; +$brand-danger: #d9534f !default; +$brand-inverse: $gray-dark !default; // Options // // Quickly modify global styling by enabling or disabling optional features. -$enable-flex: true !default; -$enable-rounded: true !default; -$enable-shadows: false !default; -$enable-gradients: false !default; -$enable-transitions: false !default; -$enable-hover-media-query: false !default; -$enable-grid-classes: true !default; -$enable-print-styles: true !default; - +$enable-flex: true !default; +$enable-rounded: true !default; +$enable-shadows: false !default; +$enable-gradients: false !default; +$enable-transitions: false !default; +$enable-hover-media-query: false !default; +$enable-grid-classes: true !default; +$enable-print-styles: true !default; // Spacing // @@ -77,106 +73,111 @@ $enable-print-styles: true !default; // variables. Mostly focused on spacing. // You can add more entries to the $spacers map, should you need more variation. -$spacer: 1rem !default; +$spacer: 1rem !default; $spacer-x: $spacer !default; $spacer-y: $spacer !default; $spacers: ( - 0: ( - x: 0, - y: 0 - ), - 1: ( - x: $spacer-x, - y: $spacer-y - ), - 2: ( - x: ($spacer-x * 1.5), - y: ($spacer-y * 1.5) - ), - 3: ( - x: ($spacer-x * 3), - y: ($spacer-y * 3) - ) + 0: ( + x: 0, + y: 0, + ), + 1: ( + x: $spacer-x, + y: $spacer-y, + ), + 2: ( + x: ( + $spacer-x * 1.5, + ), + y: ( + $spacer-y * 1.5, + ), + ), + 3: ( + x: ( + $spacer-x * 3, + ), + y: ( + $spacer-y * 3, + ), + ), ) !default; $border-width: 1px !default; - // Body // // Settings for the `` element. -$body-bg: #fff !default; +$body-bg: #fff !default; $body-color: $gray-dark !default; - // Links // // Style anchor elements. -$link-color: $brand-primary !default; -$link-decoration: none !default; -$link-hover-color: darken($link-color, 15%) !default; +$link-color: $brand-primary !default; +$link-decoration: none !default; +$link-hover-color: darken($link-color, 15%) !default; $link-hover-decoration: underline !default; - // Grid breakpoints // // Define the minimum dimensions at which your layout will change, // adapting to different screen sizes, for use in media queries. $grid-breakpoints: ( - xs: 0, - sm: 576px, - md: 768px, - lg: 992px, - xl: 1200px + xs: 0, + sm: 576px, + md: 768px, + lg: 992px, + xl: 1200px, ) !default; @include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); - // Grid containers // // Define the maximum width of `.container` for different screen sizes. $container-max-widths: ( - sm: 540px, - md: 720px, - lg: 960px, - xl: 1140px + sm: 540px, + md: 720px, + lg: 960px, + xl: 1140px, ) !default; @include _assert-ascending($container-max-widths, "$container-max-widths"); - // Grid columns // // Set the number of columns and specify the width of the gutters. -$grid-columns: 12 !default; -$grid-gutter-width-base: 30px !default; +$grid-columns: 12 !default; +$grid-gutter-width-base: 30px !default; $grid-gutter-widths: ( - xs: $grid-gutter-width-base, - sm: $grid-gutter-width-base, - md: $grid-gutter-width-base, - lg: $grid-gutter-width-base, - xl: $grid-gutter-width-base + xs: $grid-gutter-width-base, + sm: $grid-gutter-width-base, + md: $grid-gutter-width-base, + lg: $grid-gutter-width-base, + xl: $grid-gutter-width-base, ) !default; // Typography // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; -$font-family-serif: Georgia, "Times New Roman", Times, serif !default; -$font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; -$font-family-base: $font-family-sans-serif !default; +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + "Helvetica Neue", Arial, sans-serif !default; +$font-family-serif: Georgia, "Times New Roman", Times, serif !default; +$font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", + "Courier New", monospace !default; +$font-family-base: $font-family-sans-serif !default; // Pixel value used to responsively scale all typography. Applied to the `` element. $font-size-root: 16px !default; $font-size-base: 1rem !default; -$font-size-lg: 1.25rem !default; -$font-size-sm: .875rem !default; -$font-size-xs: .75rem !default; +$font-size-lg: 1.25rem !default; +$font-size-sm: 0.875rem !default; +$font-size-xs: 0.75rem !default; $line-height-base: 1.5 !default; @@ -198,12 +199,12 @@ $display3-weight: 300 !default; $display4-weight: 300 !default; $headings-margin-bottom: ($spacer / 2) !default; -$headings-font-family: inherit !default; -$headings-font-weight: 500 !default; -$headings-line-height: 1.1 !default; -$headings-color: inherit !default; +$headings-font-family: inherit !default; +$headings-font-weight: 500 !default; +$headings-line-height: 1.1 !default; +$headings-color: inherit !default; -$lead-font-size: 1.25rem !default; +$lead-font-size: 1.25rem !default; $lead-font-weight: 300 !default; $small-font-size: 80% !default; @@ -213,177 +214,182 @@ $text-muted-alert: $gray-alert !default; $abbr-border-color: $gray-light !default; $text-muted-alert: $gray-alert !default; -$blockquote-small-color: $gray-light !default; -$blockquote-font-size: ($font-size-base * 1.25) !default; +$blockquote-small-color: $gray-light !default; +$blockquote-font-size: ($font-size-base * 1.25) !default; $blockquote-border-color: $gray-lighter !default; -$blockquote-border-width: .25rem !default; +$blockquote-border-width: 0.25rem !default; -$hr-border-color: rgba(0,0,0,.1) !default; +$hr-border-color: rgba(0, 0, 0, 0.1) !default; $hr-border-width: $border-width !default; -$mark-padding: .2em !default; +$mark-padding: 0.2em !default; $dt-font-weight: bold !default; -$kbd-box-shadow: inset 0 -.1rem 0 rgba(0,0,0,.25) !default; +$kbd-box-shadow: inset 0 -0.1rem 0 rgba(0, 0, 0, 0.25) !default; $nested-kbd-font-weight: bold !default; $list-inline-padding: 5px !default; - // Components // // Define common padding and border radius sizes and more. -$line-height-lg: (4 / 3) !default; -$line-height-sm: 1.5 !default; +$line-height-lg: (4 / 3) !default; +$line-height-sm: 1.5 !default; -$border-radius: .25rem !default; -$border-radius-lg: .3rem !default; -$border-radius-sm: .2rem !default; +$border-radius: 0.25rem !default; +$border-radius-lg: 0.3rem !default; +$border-radius-sm: 0.2rem !default; $component-active-color: #fff !default; -$component-active-bg: $brand-primary !default; - -$caret-width: .3em !default; -$caret-width-lg: $caret-width !default; +$component-active-bg: $brand-primary !default; +$caret-width: 0.3em !default; +$caret-width-lg: $caret-width !default; // Tables // // Customizes the `.table` component with basic values, each used across all table variations. -$table-cell-padding: .75rem !default; -$table-sm-cell-padding: .3rem !default; +$table-cell-padding: 0.75rem !default; +$table-sm-cell-padding: 0.3rem !default; -$table-bg: transparent !default; -$table-bg-accent: rgba(0,0,0,.05) !default; -$table-bg-hover: rgba(0,0,0,.075) !default; -$table-bg-active: $table-bg-hover !default; +$table-bg: transparent !default; +$table-bg-accent: rgba(0, 0, 0, 0.05) !default; +$table-bg-hover: rgba(0, 0, 0, 0.075) !default; +$table-bg-active: $table-bg-hover !default; -$table-border-width: $border-width !default; -$table-border-color: $gray-lighter !default; -$table-editor-border-color: $gray-dark !default; +$table-border-width: $border-width !default; +$table-border-color: $gray-lighter !default; +$table-editor-border-color: $gray-dark !default; // Buttons // // For each of Bootstrap's buttons, define text, background and border color. -$btn-padding-x: 1rem !default; -$btn-padding-y: .5rem !default; -$btn-line-height: 1.25 !default; -$btn-font-weight: normal !default; -$btn-box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075) !default; -$btn-active-box-shadow: inset 0 3px 5px rgba(0,0,0,.125) !default; +$btn-padding-x: 1rem !default; +$btn-padding-y: 0.5rem !default; +$btn-line-height: 1.25 !default; +$btn-font-weight: normal !default; +$btn-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), + 0 1px 1px rgba(0, 0, 0, 0.075) !default; +$btn-active-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) !default; -$btn-primary-color: #fff !default; -$btn-primary-bg: $brand-primary !default; -$btn-primary-border: $btn-primary-bg !default; +$btn-primary-color: #fff !default; +$btn-primary-bg: $brand-primary !default; +$btn-primary-border: $btn-primary-bg !default; -$btn-secondary-color: $gray-dark !default; -$btn-secondary-bg: #fff !default; -$btn-secondary-border: #ccc !default; +$btn-secondary-color: $gray-dark !default; +$btn-secondary-bg: #fff !default; +$btn-secondary-border: #ccc !default; -$btn-alert-info: #0A7AC9 !default; -$btn-alert-info-bg: $btn-alert-info !default; -$btn-alert-info-border: $btn-alert-info !default; +$btn-alert-info: #0a7ac9 !default; +$btn-alert-info-bg: $btn-alert-info !default; +$btn-alert-info-border: $btn-alert-info !default; -$btn-info-color: #fff !default; -$btn-info-bg: $brand-info !default; -$btn-info-border: $btn-info-bg !default; +$btn-info-color: #fff !default; +$btn-info-bg: $brand-info !default; +$btn-info-border: $btn-info-bg !default; -$btn-success-color: #fff !default; -$btn-success-bg: $brand-success !default; -$btn-success-border: $btn-success-bg !default; +$btn-success-color: #fff !default; +$btn-success-bg: $brand-success !default; +$btn-success-border: $btn-success-bg !default; -$btn-warning-color: #fff !default; -$btn-warning-bg: $brand-warning !default; -$btn-warning-border: $btn-warning-bg !default; +$btn-warning-color: #fff !default; +$btn-warning-bg: $brand-warning !default; +$btn-warning-border: $btn-warning-bg !default; -$btn-danger-color: #fff !default; -$btn-danger-bg: $brand-danger !default; -$btn-danger-border: $btn-danger-bg !default; +$btn-danger-color: #fff !default; +$btn-danger-bg: $brand-danger !default; +$btn-danger-border: $btn-danger-bg !default; -$btn-link-disabled-color: $gray-light !default; +$btn-link-disabled-color: $gray-light !default; -$btn-padding-x-sm: .5rem !default; -$btn-padding-y-sm: .25rem !default; +$btn-padding-x-sm: 0.5rem !default; +$btn-padding-y-sm: 0.25rem !default; -$btn-padding-x-lg: 1.5rem !default; -$btn-padding-y-lg: .75rem !default; +$btn-padding-x-lg: 1.5rem !default; +$btn-padding-y-lg: 0.75rem !default; -$btn-block-spacing-y: .5rem !default; -$btn-toolbar-margin: .5rem !default; +$btn-block-spacing-y: 0.5rem !default; +$btn-toolbar-margin: 0.5rem !default; // Allows for customizing button radius independently from global border radius -$btn-border-radius: $border-radius !default; -$btn-border-radius-lg: $border-radius-lg !default; -$btn-border-radius-sm: $border-radius-sm !default; - +$btn-border-radius: $border-radius !default; +$btn-border-radius-lg: $border-radius-lg !default; +$btn-border-radius-sm: $border-radius-sm !default; // Forms -$input-padding-x: .75rem !default; -$input-padding-y: .5rem !default; -$input-line-height: 1.25 !default; +$input-padding-x: 0.75rem !default; +$input-padding-y: 0.5rem !default; +$input-line-height: 1.25 !default; -$input-bg: #fff !default; -$input-bg-disabled: $gray-lighter !default; +$input-bg: #fff !default; +$input-bg-disabled: $gray-lighter !default; -$input-color: $gray !default; -$input-border-color: rgba(0,0,0,.15) !default; -$input-btn-border-width: $border-width !default; // For form controls and buttons -$input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default; +$input-color: $gray !default; +$input-border-color: rgba(0, 0, 0, 0.15) !default; +$input-btn-border-width: $border-width !default; // For form controls and buttons +$input-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) !default; -$input-border-radius: $border-radius !default; -$input-border-radius-lg: $border-radius-lg !default; -$input-border-radius-sm: $border-radius-sm !default; +$input-border-radius: $border-radius !default; +$input-border-radius-lg: $border-radius-lg !default; +$input-border-radius-sm: $border-radius-sm !default; -$input-bg-focus: $input-bg !default; -$input-border-focus: #66afe9 !default; -$input-box-shadow-focus: $input-box-shadow, 0 0 8px rgba(102,175,233,.6) !default; -$input-color-focus: $input-color !default; +$input-bg-focus: $input-bg !default; +$input-border-focus: #66afe9 !default; +$input-box-shadow-focus: $input-box-shadow, 0 0 8px rgba(102, 175, 233, 0.6) !default; +$input-color-focus: $input-color !default; -$input-color-placeholder: #999 !default; +$input-color-placeholder: #999 !default; -$input-padding-x-sm: .5rem !default; -$input-padding-y-sm: .25rem !default; +$input-padding-x-sm: 0.5rem !default; +$input-padding-y-sm: 0.25rem !default; -$input-padding-x-lg: 1.5rem !default; -$input-padding-y-lg: .75rem !default; +$input-padding-x-lg: 1.5rem !default; +$input-padding-y-lg: 0.75rem !default; -$input-height: (($font-size-base * $line-height-base) + ($input-padding-y * 2)) !default; -$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default; -$input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default; +$input-height: ( + ($font-size-base * $line-height-base) + ($input-padding-y * 2) +) !default; +$input-height-lg: ( + ($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) +) !default; +$input-height-sm: ( + ($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) +) !default; -$form-group-margin-bottom: $spacer-y !default; +$form-group-margin-bottom: $spacer-y !default; -$input-group-addon-bg: $gray-lighter !default; +$input-group-addon-bg: $gray-lighter !default; $input-group-addon-border-color: $input-border-color !default; -$cursor-disabled: not-allowed !default; +$cursor-disabled: not-allowed !default; -$custom-control-gutter: 1.5rem !default; +$custom-control-gutter: 1.5rem !default; $custom-control-spacer-x: 1rem !default; -$custom-control-spacer-y: .25rem !default; +$custom-control-spacer-y: 0.25rem !default; -$custom-control-indicator-size: 1rem !default; -$custom-control-indicator-bg: #ddd !default; -$custom-control-indicator-bg-size: 50% 50% !default; -$custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba(0,0,0,.1) !default; +$custom-control-indicator-size: 1rem !default; +$custom-control-indicator-bg: #ddd !default; +$custom-control-indicator-bg-size: 50% 50% !default; +$custom-control-indicator-box-shadow: inset 0 0.25rem 0.25rem rgba(0, 0, 0, 0.1) !default; -$custom-control-disabled-cursor: $cursor-disabled !default; -$custom-control-disabled-indicator-bg: #eee !default; -$custom-control-disabled-description-color: #767676 !default; +$custom-control-disabled-cursor: $cursor-disabled !default; +$custom-control-disabled-indicator-bg: #eee !default; +$custom-control-disabled-description-color: #767676 !default; -$custom-control-checked-indicator-color: #fff !default; -$custom-control-checked-indicator-bg: #0074d9 !default; +$custom-control-checked-indicator-color: #fff !default; +$custom-control-checked-indicator-bg: #0074d9 !default; $custom-control-checked-indicator-box-shadow: none !default; -$custom-control-focus-indicator-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9 !default; +$custom-control-focus-indicator-box-shadow: 0 0 0 0.075rem #fff, + 0 0 0 0.2rem #0074d9 !default; -$custom-control-active-indicator-color: #fff !default; -$custom-control-active-indicator-bg: #84c6ff !default; +$custom-control-active-indicator-color: #fff !default; +$custom-control-active-indicator-bg: #84c6ff !default; $custom-control-active-indicator-box-shadow: none !default; $custom-checkbox-radius: $border-radius !default; @@ -397,51 +403,51 @@ $custom-checkbox-indeterminate-box-shadow: none !default; $custom-radio-radius: 50% !default; $custom-radio-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-checked-indicator-color}'/%3E%3C/svg%3E") !default; -$custom-select-padding-x: .75rem !default; -$custom-select-padding-y: .375rem !default; -$custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator -$custom-select-color: $input-color !default; +$custom-select-padding-x: 0.75rem !default; +$custom-select-padding-y: 0.375rem !default; +$custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator +$custom-select-color: $input-color !default; $custom-select-disabled-color: $gray-light !default; -$custom-select-bg: #fff !default; -$custom-select-disabled-bg: $gray-lighter !default; -$custom-select-bg-size: 8px 10px !default; // In pixels because image dimensions +$custom-select-bg: #fff !default; +$custom-select-disabled-bg: $gray-lighter !default; +$custom-select-bg-size: 8px 10px !default; // In pixels because image dimensions $custom-select-indicator-color: #333 !default; -$custom-select-indicator: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") !default; -$custom-select-border-width: $input-btn-border-width !default; -$custom-select-border-color: $input-border-color !default; +$custom-select-indicator: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") !default; +$custom-select-border-width: $input-btn-border-width !default; +$custom-select-border-color: $input-border-color !default; $custom-select-border-radius: $border-radius !default; $custom-select-focus-border-color: #51a7e8 !default; -$custom-select-focus-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5) !default; +$custom-select-focus-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), + 0 0 5px rgba(81, 167, 232, 0.5) !default; -$custom-select-sm-padding-y: .2rem !default; +$custom-select-sm-padding-y: 0.2rem !default; $custom-select-sm-font-size: 75% !default; -$custom-file-height: 2.5rem !default; -$custom-file-width: 14rem !default; -$custom-file-focus-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9 !default; - -$custom-file-padding-x: .5rem !default; -$custom-file-padding-y: 1rem !default; -$custom-file-line-height: 1.5 !default; -$custom-file-color: #555 !default; -$custom-file-bg: #fff !default; -$custom-file-border-width: $border-width !default; -$custom-file-border-color: #ddd !default; +$custom-file-height: 2.5rem !default; +$custom-file-width: 14rem !default; +$custom-file-focus-box-shadow: 0 0 0 0.075rem #fff, 0 0 0 0.2rem #0074d9 !default; + +$custom-file-padding-x: 0.5rem !default; +$custom-file-padding-y: 1rem !default; +$custom-file-line-height: 1.5 !default; +$custom-file-color: #555 !default; +$custom-file-bg: #fff !default; +$custom-file-border-width: $border-width !default; +$custom-file-border-color: #ddd !default; $custom-file-border-radius: $border-radius !default; -$custom-file-box-shadow: inset 0 .2rem .4rem rgba(0,0,0,.05) !default; -$custom-file-button-color: $custom-file-color !default; -$custom-file-button-bg: #eee !default; +$custom-file-box-shadow: inset 0 0.2rem 0.4rem rgba(0, 0, 0, 0.05) !default; +$custom-file-button-color: $custom-file-color !default; +$custom-file-button-bg: #eee !default; $custom-file-text: ( - placeholder: ( - en: "Choose file..." - ), - button-label: ( - en: "Browse" - ) + placeholder: ( + en: "Choose file...", + ), + button-label: ( + en: "Browse", + ), ) !default; - // Form validation icons $form-icon-success-color: $brand-success !default; $form-icon-success: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-success-color}' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E") !default; @@ -452,427 +458,409 @@ $form-icon-warning: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://ww $form-icon-danger-color: $brand-danger !default; $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$form-icon-danger-color}' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E") !default; - // Dropdowns // // Dropdown menu container and contents. -$dropdown-min-width: 10rem !default; -$dropdown-padding-y: .5rem !default; -$dropdown-margin-top: .125rem !default; -$dropdown-bg: #fff !default; -$dropdown-border-color: rgba(0,0,0,.15) !default; -$dropdown-border-width: $border-width !default; -$dropdown-divider-bg: #e5e5e5 !default; -$dropdown-box-shadow: 0 .5rem 1rem rgba(0,0,0,.175) !default; +$dropdown-min-width: 10rem !default; +$dropdown-padding-y: 0.5rem !default; +$dropdown-margin-top: 0.125rem !default; +$dropdown-bg: #fff !default; +$dropdown-border-color: rgba(0, 0, 0, 0.15) !default; +$dropdown-border-width: $border-width !default; +$dropdown-divider-bg: #e5e5e5 !default; +$dropdown-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.175) !default; -$dropdown-link-color: $secondaryColor !default; -$dropdown-link-hover-color: darken($secondaryColor, 20%) !default; -$dropdown-link-hover-bg: #f5f5f5 !default; +$dropdown-link-color: $secondaryColor !default; +$dropdown-link-hover-color: darken($secondaryColor, 20%) !default; +$dropdown-link-hover-bg: #f5f5f5 !default; -$dropdown-link-active-color: $component-active-color !default; -$dropdown-link-active-bg: $component-active-bg !default; +$dropdown-link-active-color: $component-active-color !default; +$dropdown-link-active-bg: $component-active-bg !default; -$dropdown-link-disabled-color: $gray-light !default; +$dropdown-link-disabled-color: $gray-light !default; -$dropdown-item-padding-x: 1.5rem !default; +$dropdown-item-padding-x: 1.5rem !default; -$dropdown-header-color: $gray-light !default; +$dropdown-header-color: $gray-light !default; // Z-index master list // // Warning: Avoid customizing these values. They're used for a bird's eye view // of components dependent on the z-axis and are designed to all work together. -$zindex-dropdown-backdrop: 990 !default; -$zindex-navbar: 1000 !default; -$zindex-dropdown: 1000 !default; -$zindex-popover: 1060 !default; -$zindex-tooltip: 1070 !default; -$zindex-navbar-fixed: 1030 !default; -$zindex-navbar-sticky: 1030 !default; -$zindex-modal-bg: 1040 !default; -$zindex-modal: 1050 !default; - +$zindex-dropdown-backdrop: 990 !default; +$zindex-navbar: 1000 !default; +$zindex-dropdown: 1000 !default; +$zindex-popover: 1060 !default; +$zindex-tooltip: 1070 !default; +$zindex-navbar-fixed: 1030 !default; +$zindex-navbar-sticky: 1030 !default; +$zindex-modal-bg: 1040 !default; +$zindex-modal: 1050 !default; // Navbar -$navbar-border-radius: $border-radius !default; -$navbar-padding-x: $spacer !default; -$navbar-padding-y: ($spacer / 2) !default; +$navbar-border-radius: $border-radius !default; +$navbar-padding-x: $spacer !default; +$navbar-padding-y: ($spacer / 2) !default; -$navbar-brand-padding-y: .25rem !default; +$navbar-brand-padding-y: 0.25rem !default; -$navbar-divider-padding-y: .425rem !default; +$navbar-divider-padding-y: 0.425rem !default; -$navbar-toggler-padding-x: .75rem !default; -$navbar-toggler-padding-y: .5rem !default; -$navbar-toggler-font-size: $font-size-lg !default; -$navbar-toggler-border-radius: $btn-border-radius !default; -$navbar-toggler-padding-x: .75rem !default; -$navbar-toggler-padding-y: .5rem !default; +$navbar-toggler-padding-x: 0.75rem !default; +$navbar-toggler-padding-y: 0.5rem !default; +$navbar-toggler-font-size: $font-size-lg !default; +$navbar-toggler-border-radius: $btn-border-radius !default; +$navbar-toggler-padding-x: 0.75rem !default; +$navbar-toggler-padding-y: 0.5rem !default; -$navbar-dark-color: rgba(255,255,255,.5) !default; -$navbar-dark-hover-color: rgba(255,255,255,.75) !default; -$navbar-dark-active-color: rgba(255,255,255,1) !default; -$navbar-dark-disabled-color: rgba(255,255,255,.25) !default; +$navbar-dark-color: rgba(255, 255, 255, 0.5) !default; +$navbar-dark-hover-color: rgba(255, 255, 255, 0.75) !default; +$navbar-dark-active-color: rgba(255, 255, 255, 1) !default; +$navbar-dark-disabled-color: rgba(255, 255, 255, 0.25) !default; $navbar-dark-toggler-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E") !default; -$navbar-dark-toggler-border: rgba(255,255,255,.1) !default; +$navbar-dark-toggler-border: rgba(255, 255, 255, 0.1) !default; -$navbar-light-color: rgba(0,0,0,.5) !default; -$navbar-light-hover-color: rgba(0,0,0,.7) !default; -$navbar-light-active-color: rgba(0,0,0,.9) !default; -$navbar-light-disabled-color: rgba(0,0,0,.3) !default; +$navbar-light-color: rgba(0, 0, 0, 0.5) !default; +$navbar-light-hover-color: rgba(0, 0, 0, 0.7) !default; +$navbar-light-active-color: rgba(0, 0, 0, 0.9) !default; +$navbar-light-disabled-color: rgba(0, 0, 0, 0.3) !default; $navbar-light-toggler-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E") !default; -$navbar-light-toggler-border: rgba(0,0,0,.1) !default; +$navbar-light-toggler-border: rgba(0, 0, 0, 0.1) !default; // Navs -$nav-item-margin: .2rem !default; -$nav-item-inline-spacer: 1rem !default; -$nav-link-padding: .5em 1em !default; -$nav-link-hover-bg: $gray-lighter !default; -$nav-disabled-link-color: $gray-light !default; +$nav-item-margin: 0.2rem !default; +$nav-item-inline-spacer: 1rem !default; +$nav-link-padding: 0.5em 1em !default; +$nav-link-hover-bg: $gray-lighter !default; +$nav-disabled-link-color: $gray-light !default; $nav-disabled-link-hover-color: $gray-light !default; -$nav-disabled-link-hover-bg: transparent !default; - -$nav-tabs-border-color: #ddd !default; -$nav-tabs-border-width: $border-width !default; -$nav-tabs-border-radius: $border-radius !default; -$nav-tabs-link-hover-border-color: $gray-lighter !default; -$nav-tabs-active-link-hover-color: $gray !default; -$nav-tabs-active-link-hover-bg: $body-bg !default; -$nav-tabs-active-link-hover-border-color: #ddd !default; -$nav-tabs-justified-link-border-color: #ddd !default; +$nav-disabled-link-hover-bg: transparent !default; + +$nav-tabs-border-color: #ddd !default; +$nav-tabs-border-width: $border-width !default; +$nav-tabs-border-radius: $border-radius !default; +$nav-tabs-link-hover-border-color: $gray-lighter !default; +$nav-tabs-active-link-hover-color: $gray !default; +$nav-tabs-active-link-hover-bg: $body-bg !default; +$nav-tabs-active-link-hover-border-color: #ddd !default; +$nav-tabs-justified-link-border-color: #ddd !default; $nav-tabs-justified-active-link-border-color: $body-bg !default; -$nav-pills-border-radius: $border-radius !default; +$nav-pills-border-radius: $border-radius !default; $nav-pills-active-link-color: $component-active-color !default; -$nav-pills-active-link-bg: $component-active-bg !default; - +$nav-pills-active-link-bg: $component-active-bg !default; // Pagination -$pagination-padding-x: .75rem !default; -$pagination-padding-y: .5rem !default; -$pagination-padding-x-sm: .75rem !default; -$pagination-padding-y-sm: .275rem !default; -$pagination-padding-x-lg: 1.5rem !default; -$pagination-padding-y-lg: .75rem !default; +$pagination-padding-x: 0.75rem !default; +$pagination-padding-y: 0.5rem !default; +$pagination-padding-x-sm: 0.75rem !default; +$pagination-padding-y-sm: 0.275rem !default; +$pagination-padding-x-lg: 1.5rem !default; +$pagination-padding-y-lg: 0.75rem !default; +$pagination-color: $link-color !default; +$pagination-bg: #fff !default; +$pagination-border-width: $border-width !default; +$pagination-border-color: #ddd !default; -$pagination-color: $link-color !default; -$pagination-bg: #fff !default; -$pagination-border-width: $border-width !default; -$pagination-border-color: #ddd !default; +$pagination-hover-color: $link-hover-color !default; +$pagination-hover-bg: $gray-lighter !default; +$pagination-hover-border: #ddd !default; -$pagination-hover-color: $link-hover-color !default; -$pagination-hover-bg: $gray-lighter !default; -$pagination-hover-border: #ddd !default; - -$pagination-active-color: #fff !default; -$pagination-active-bg: $brand-primary !default; -$pagination-active-border: $brand-primary !default; - -$pagination-disabled-color: $gray-light !default; -$pagination-disabled-bg: #fff !default; -$pagination-disabled-border: #ddd !default; +$pagination-active-color: #fff !default; +$pagination-active-bg: $brand-primary !default; +$pagination-active-border: $brand-primary !default; +$pagination-disabled-color: $gray-light !default; +$pagination-disabled-bg: #fff !default; +$pagination-disabled-border: #ddd !default; // Jumbotron -$jumbotron-padding: 2rem !default; -$jumbotron-bg: $gray-lighter !default; - +$jumbotron-padding: 2rem !default; +$jumbotron-bg: $gray-lighter !default; // Form states and alerts // // Define colors for form feedback states and, by default, alerts. -$state-success-text: #3c763d !default; -$state-success-bg: #dff0d8 !default; -$state-success-border: darken($state-success-bg, 5%) !default; +$state-success-text: #3c763d !default; +$state-success-bg: #dff0d8 !default; +$state-success-border: darken($state-success-bg, 5%) !default; -$state-info-text: #31708f !default; -$state-info-bg: #d9edf7 !default; -$state-info-border: darken($state-info-bg, 7%) !default; +$state-info-text: #31708f !default; +$state-info-bg: #d9edf7 !default; +$state-info-border: darken($state-info-bg, 7%) !default; -$state-warning-text: #8a6d3b !default; -$state-warning-bg: #fcf8e3 !default; -$mark-bg: $state-warning-bg !default; -$state-warning-border: darken($state-warning-bg, 5%) !default; +$state-warning-text: #8a6d3b !default; +$state-warning-bg: #fcf8e3 !default; +$mark-bg: $state-warning-bg !default; +$state-warning-border: darken($state-warning-bg, 5%) !default; -$state-warning-v2-text: rgb(0,0,0) !default; -$state-warning-v2-bg: rgba(255, 131, 17, 0.12) !default; -$state-warning-v2-border: darken($state-warning-v2-bg, 5%) !default; +$state-warning-v2-text: rgb(0, 0, 0) !default; +$state-warning-v2-bg: rgba(255, 131, 17, 0.12) !default; +$state-warning-v2-border: darken($state-warning-v2-bg, 5%) !default; -$state-danger-text: #a94442 !default; -$state-danger-bg: #f2dede !default; -$state-danger-border: darken($state-danger-bg, 5%) !default; - -$state-announcement-bg: #d9edf7 !default; -$state-announcement-border: #d9edf7 !default; -$state-announcement-text: #1b1b1b !default; +$state-danger-text: #a94442 !default; +$state-danger-bg: #f2dede !default; +$state-danger-border: darken($state-danger-bg, 5%) !default; +$state-announcement-bg: #d9edf7 !default; +$state-announcement-border: #d9edf7 !default; +$state-announcement-text: #1b1b1b !default; // Cards -$card-spacer-x: 1.25rem !default; -$card-spacer-y: .75rem !default; -$card-border-width: 1px !default; -$card-border-radius: $border-radius !default; -$card-border-color: rgba(0,0,0,.125) !default; -$card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width}) !default; -$card-cap-bg: #f5f5f5 !default; -$card-bg: #fff !default; +$card-spacer-x: 1.25rem !default; +$card-spacer-y: 0.75rem !default; +$card-border-width: 1px !default; +$card-border-radius: $border-radius !default; +$card-border-color: rgba(0, 0, 0, 0.125) !default; +$card-border-radius-inner: calc( + #{$card-border-radius} - #{$card-border-width} +) !default; +$card-cap-bg: #f5f5f5 !default; +$card-bg: #fff !default; -$card-link-hover-color: #fff !default; +$card-link-hover-color: #fff !default; $card-img-overlay-padding: 1.25rem !default; -$card-deck-margin: .625rem !default; +$card-deck-margin: 0.625rem !default; $card-columns-sm-up-column-gap: 1.25rem !default; - // Tooltips -$tooltip-max-width: 200px !default; -$tooltip-color: #fff !default; -$tooltip-bg: #000 !default; -$tooltip-opacity: .9 !default; -$tooltip-padding-y: 3px !default; -$tooltip-padding-x: 8px !default; -$tooltip-margin: 3px !default; - -$tooltip-arrow-width: 5px !default; -$tooltip-arrow-color: $tooltip-bg !default; +$tooltip-max-width: 200px !default; +$tooltip-color: #fff !default; +$tooltip-bg: #000 !default; +$tooltip-opacity: 0.9 !default; +$tooltip-padding-y: 3px !default; +$tooltip-padding-x: 8px !default; +$tooltip-margin: 3px !default; +$tooltip-arrow-width: 5px !default; +$tooltip-arrow-color: $tooltip-bg !default; // Popovers -$popover-inner-padding: 1px !default; -$popover-bg: #fff !default; -$popover-max-width: 276px !default; -$popover-border-width: $border-width !default; -$popover-border-color: rgba(0,0,0,.2) !default; -$popover-box-shadow: 0 5px 10px rgba(0,0,0,.2) !default; +$popover-inner-padding: 1px !default; +$popover-bg: #fff !default; +$popover-max-width: 276px !default; +$popover-border-width: $border-width !default; +$popover-border-color: rgba(0, 0, 0, 0.2) !default; +$popover-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2) !default; -$popover-title-bg: darken($popover-bg, 3%) !default; -$popover-title-padding-x: 14px !default; -$popover-title-padding-y: 8px !default; +$popover-title-bg: darken($popover-bg, 3%) !default; +$popover-title-padding-x: 14px !default; +$popover-title-padding-y: 8px !default; -$popover-content-padding-x: 14px !default; -$popover-content-padding-y: 9px !default; +$popover-content-padding-x: 14px !default; +$popover-content-padding-y: 9px !default; -$popover-arrow-width: 10px !default; -$popover-arrow-color: $popover-bg !default; - -$popover-arrow-outer-width: ($popover-arrow-width + 1px) !default; -$popover-arrow-outer-color: fade-in($popover-border-color, .05) !default; +$popover-arrow-width: 10px !default; +$popover-arrow-color: $popover-bg !default; +$popover-arrow-outer-width: ($popover-arrow-width + 1px) !default; +$popover-arrow-outer-color: fade-in($popover-border-color, 0.05) !default; // Tags -$tag-default-bg: $gray-light !default; -$tag-primary-bg: $brand-primary !default; -$tag-success-bg: $brand-success !default; -$tag-info-bg: $brand-info !default; -$tag-warning-bg: $brand-warning !default; -$tag-danger-bg: $brand-danger !default; - -$tag-color: #fff !default; -$tag-link-hover-color: #fff !default; -$tag-font-size: 75% !default; -$tag-font-weight: bold !default; -$tag-padding-x: .4em !default; -$tag-padding-y: .25em !default; - -$tag-pill-padding-x: .6em !default; +$tag-default-bg: $gray-light !default; +$tag-primary-bg: $brand-primary !default; +$tag-success-bg: $brand-success !default; +$tag-info-bg: $brand-info !default; +$tag-warning-bg: $brand-warning !default; +$tag-danger-bg: $brand-danger !default; + +$tag-color: #fff !default; +$tag-link-hover-color: #fff !default; +$tag-font-size: 75% !default; +$tag-font-weight: bold !default; +$tag-padding-x: 0.4em !default; +$tag-padding-y: 0.25em !default; + +$tag-pill-padding-x: 0.6em !default; // Use a higher than normal value to ensure completely rounded edges when // customizing padding or font-size on labels. -$tag-pill-border-radius: 10rem !default; +$tag-pill-border-radius: 10rem !default; // Modals // Padding applied to the modal body -$modal-inner-padding: 15px !default; +$modal-inner-padding: 15px !default; -$modal-dialog-margin: 10px !default; +$modal-dialog-margin: 10px !default; $modal-dialog-sm-up-margin-y: 30px !default; -$modal-title-padding: 15px !default; -$modal-title-line-height: $line-height-base !default; - -$modal-content-bg: #fff !default; -$modal-content-border-color: rgba(0,0,0,.2) !default; -$modal-content-border-width: $border-width !default; -$modal-content-xs-box-shadow: 0 3px 9px rgba(0,0,0,.5) !default; -$modal-content-sm-up-box-shadow: 0 5px 15px rgba(0,0,0,.5) !default; +$modal-title-padding: 15px !default; +$modal-title-line-height: $line-height-base !default; -$modal-backdrop-bg: #000 !default; -$modal-backdrop-opacity: .5 !default; -$modal-header-border-color: #e5e5e5 !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-content-bg: #fff !default; +$modal-content-border-color: rgba(0, 0, 0, 0.2) !default; +$modal-content-border-width: $border-width !default; +$modal-content-xs-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5) !default; +$modal-content-sm-up-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5) !default; -$modal-lg: 900px !default; -$modal-md: 600px !default; -$modal-sm: 300px !default; +$modal-backdrop-bg: #000 !default; +$modal-backdrop-opacity: 0.5 !default; +$modal-header-border-color: #e5e5e5 !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-lg: 900px !default; +$modal-md: 600px !default; +$modal-sm: 300px !default; // Alerts // // Define alert colors, border radius, and padding. -$alert-padding-x: 1.25rem !default; -$alert-padding-y: .75rem !default; -$alert-border-radius: $border-radius !default; -$alert-link-font-weight: bold !default; -$alert-border-width: $border-width !default; +$alert-padding-x: 1.25rem !default; +$alert-padding-y: 0.75rem !default; +$alert-border-radius: $border-radius !default; +$alert-link-font-weight: bold !default; +$alert-border-width: $border-width !default; -$alert-success-bg: $state-success-bg !default; -$alert-success-text: $state-success-text !default; -$alert-success-border: $state-success-border !default; +$alert-success-bg: $state-success-bg !default; +$alert-success-text: $state-success-text !default; +$alert-success-border: $state-success-border !default; -$alert-info-bg: $state-info-bg !default; -$alert-info-text: $state-info-text !default; -$alert-info-border: $state-info-border !default; +$alert-info-bg: $state-info-bg !default; +$alert-info-text: $state-info-text !default; +$alert-info-border: $state-info-border !default; -$alert-warning-bg: $state-warning-bg !default; -$alert-warning-text: $state-warning-text !default; -$alert-warning-border: $state-warning-border !default; +$alert-warning-bg: $state-warning-bg !default; +$alert-warning-text: $state-warning-text !default; +$alert-warning-border: $state-warning-border !default; -$alert-warning-v2-bg: $state-warning-v2-bg !default; -$alert-warning-v2-text: $state-warning-v2-text !default; -$alert-warning-v2-border: $state-warning-v2-border !default; +$alert-warning-v2-bg: $state-warning-v2-bg !default; +$alert-warning-v2-text: $state-warning-v2-text !default; +$alert-warning-v2-border: $state-warning-v2-border !default; -$alert-danger-bg: $state-danger-bg !default; -$alert-danger-text: $state-danger-text !default; -$alert-danger-border: $state-danger-border !default; - -$alert-announcement-bg: $state-announcement-bg !default; -$alert-announcement-border: $state-announcement-border !default; -$alert-announcement-text: $state-announcement-text !default; +$alert-danger-bg: $state-danger-bg !default; +$alert-danger-text: $state-danger-text !default; +$alert-danger-border: $state-danger-border !default; +$alert-announcement-bg: $state-announcement-bg !default; +$alert-announcement-border: $state-announcement-border !default; +$alert-announcement-text: $state-announcement-text !default; // Progress bars -$progress-bg: #eee !default; -$progress-bar-color: #0074d9 !default; -$progress-border-radius: $border-radius !default; -$progress-box-shadow: inset 0 .1rem .1rem rgba(0,0,0,.1) !default; - -$progress-bar-bg: $brand-primary !default; -$progress-bar-success-bg: $brand-success !default; -$progress-bar-warning-bg: $brand-warning !default; -$progress-bar-danger-bg: $brand-danger !default; -$progress-bar-info-bg: $brand-info !default; +$progress-bg: #eee !default; +$progress-bar-color: #0074d9 !default; +$progress-border-radius: $border-radius !default; +$progress-box-shadow: inset 0 0.1rem 0.1rem rgba(0, 0, 0, 0.1) !default; +$progress-bar-bg: $brand-primary !default; +$progress-bar-success-bg: $brand-success !default; +$progress-bar-warning-bg: $brand-warning !default; +$progress-bar-danger-bg: $brand-danger !default; +$progress-bar-info-bg: $brand-info !default; // List group -$list-group-bg: #fff !default; -$list-group-border-color: #ddd !default; -$list-group-border-width: $border-width !default; -$list-group-border-radius: $border-radius !default; +$list-group-bg: #fff !default; +$list-group-border-color: #ddd !default; +$list-group-border-width: $border-width !default; +$list-group-border-radius: $border-radius !default; -$list-group-hover-bg: #f5f5f5 !default; -$list-group-active-color: $component-active-color !default; -$list-group-active-bg: $component-active-bg !default; -$list-group-active-border: $list-group-active-bg !default; -$list-group-active-text-color: lighten($list-group-active-bg, 40%) !default; +$list-group-hover-bg: #f5f5f5 !default; +$list-group-active-color: $component-active-color !default; +$list-group-active-bg: $component-active-bg !default; +$list-group-active-border: $list-group-active-bg !default; +$list-group-active-text-color: lighten($list-group-active-bg, 40%) !default; -$list-group-disabled-color: $gray-light !default; -$list-group-disabled-bg: $gray-lighter !default; +$list-group-disabled-color: $gray-light !default; +$list-group-disabled-bg: $gray-lighter !default; $list-group-disabled-text-color: $list-group-disabled-color !default; -$list-group-link-color: #555 !default; -$list-group-link-hover-color: $list-group-link-color !default; +$list-group-link-color: #555 !default; +$list-group-link-hover-color: $list-group-link-color !default; $list-group-link-heading-color: #333 !default; -$list-group-item-padding-x: 1.25rem !default; -$list-group-item-padding-y: .75rem !default; +$list-group-item-padding-x: 1.25rem !default; +$list-group-item-padding-y: 0.75rem !default; $list-group-item-heading-margin-bottom: 5px !default; - // Image thumbnails -$thumbnail-padding: .25rem !default; -$thumbnail-bg: $body-bg !default; -$thumbnail-border-width: $border-width !default; -$thumbnail-border-color: #ddd !default; -$thumbnail-border-radius: $border-radius !default; -$thumbnail-box-shadow: 0 1px 2px rgba(0,0,0,.075) !default; - +$thumbnail-padding: 0.25rem !default; +$thumbnail-bg: $body-bg !default; +$thumbnail-border-width: $border-width !default; +$thumbnail-border-color: #ddd !default; +$thumbnail-border-radius: $border-radius !default; +$thumbnail-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) !default; // Figures $figure-caption-font-size: 90% !default; - // Breadcrumbs -$breadcrumb-padding-y: .75rem !default; -$breadcrumb-padding-x: 1rem !default; -$breadcrumb-item-padding: .5rem !default; - -$breadcrumb-bg: $gray-lighter !default; -$breadcrumb-divider-color: $gray-light !default; -$breadcrumb-active-color: $gray-light !default; -$breadcrumb-divider: "/" !default; +$breadcrumb-padding-y: 0.75rem !default; +$breadcrumb-padding-x: 1rem !default; +$breadcrumb-item-padding: 0.5rem !default; +$breadcrumb-bg: $gray-lighter !default; +$breadcrumb-divider-color: $gray-light !default; +$breadcrumb-active-color: $gray-light !default; +$breadcrumb-divider: "/" !default; // Media objects -$media-margin-top: 15px !default; -$media-heading-margin-bottom: 5px !default; -$media-alignment-padding-x: 10px !default; - +$media-margin-top: 15px !default; +$media-heading-margin-bottom: 5px !default; +$media-alignment-padding-x: 10px !default; // Carousel -$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default; +$carousel-text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) !default; -$carousel-control-color: #fff !default; -$carousel-control-width: 15% !default; -$carousel-control-sm-up-size: 30px !default; -$carousel-control-opacity: .5 !default; -$carousel-control-font-size: 20px !default; +$carousel-control-color: #fff !default; +$carousel-control-width: 15% !default; +$carousel-control-sm-up-size: 30px !default; +$carousel-control-opacity: 0.5 !default; +$carousel-control-font-size: 20px !default; -$carousel-indicators-width: 60% !default; +$carousel-indicators-width: 60% !default; -$carousel-indicator-size: 10px !default; -$carousel-indicator-active-size: 12px !default; -$carousel-indicator-active-bg: #fff !default; -$carousel-indicator-border-color: #fff !default; +$carousel-indicator-size: 10px !default; +$carousel-indicator-active-size: 12px !default; +$carousel-indicator-active-bg: #fff !default; +$carousel-indicator-border-color: #fff !default; -$carousel-caption-width: 70% !default; -$carousel-caption-sm-up-width: 60% !default; -$carousel-caption-color: #fff !default; - -$carousel-icon-width: 20px !default; +$carousel-caption-width: 70% !default; +$carousel-caption-sm-up-width: 60% !default; +$carousel-caption-color: #fff !default; +$carousel-icon-width: 20px !default; // Close -$close-font-weight: bold !default; -$close-color: #000 !default; -$close-text-shadow: 0 1px 0 #fff !default; - +$close-font-weight: bold !default; +$close-color: #000 !default; +$close-text-shadow: 0 1px 0 #fff !default; // Code -$code-font-size: 90% !default; -$code-padding-x: .4rem !default; -$code-padding-y: .2rem !default; -$code-color: #bd4147 !default; -$code-bg: #f7f7f9 !default; +$code-font-size: 90% !default; +$code-padding-x: 0.4rem !default; +$code-padding-y: 0.2rem !default; +$code-color: #bd4147 !default; +$code-bg: #f7f7f9 !default; -$kbd-color: #fff !default; -$kbd-bg: #333 !default; +$kbd-color: #fff !default; +$kbd-bg: #333 !default; -$pre-bg: #f7f7f9 !default; -$pre-color: $gray-dark !default; -$pre-border-color: #ccc !default; -$pre-scrollable-max-height: 340px !default; +$pre-bg: #f7f7f9 !default; +$pre-color: $gray-dark !default; +$pre-border-color: #ccc !default; +$pre-scrollable-max-height: 340px !default; diff --git a/static/styles/lib/colors.scss b/static/styles/lib/colors.scss index ce4e19fa00..417bb220cc 100644 --- a/static/styles/lib/colors.scss +++ b/static/styles/lib/colors.scss @@ -1,12 +1,12 @@ $colorDanger: #ff1134; -$colorSuccess: #13BA98; +$colorSuccess: #13ba98; $colorBeige: #e6e2e2; $colorGrey: rgba(238, 238, 238, 0.5); -$colorLightGrey: rgba(0,0,0,0.07); +$colorLightGrey: rgba(0, 0, 0, 0.07); $colorDarkerGrey: #555555; -$colorSemiTransparent: rgba(0,0,0,0.45); +$colorSemiTransparent: rgba(0, 0, 0, 0.45); $colorWhite: #fff; -$colorInfo: #0A7AC9; -$colorTertiary: #54616e; +$colorInfo: #0a7ac9; +$colorTertiary: #3a424b; $fontColor: #373a3c; diff --git a/theme/brb/views/authentication/home.hbs b/theme/brb/views/authentication/home.hbs index f01a16f5c3..019085c317 100644 --- a/theme/brb/views/authentication/home.hbs +++ b/theme/brb/views/authentication/home.hbs @@ -101,9 +101,9 @@ - + - + diff --git a/theme/default/style.scss b/theme/default/style.scss index 91456c2d8f..aad434af8e 100644 --- a/theme/default/style.scss +++ b/theme/default/style.scss @@ -1,6 +1,6 @@ $primaryColor: #9e292b; -$secondaryColor:#54616e; -$accentColor: #E98404; +$secondaryColor: #3a424b; +$accentColor: #e98404; $logoGradient: linear-gradient(35deg, #9e292b 35%, #f6a800); @@ -8,44 +8,46 @@ $colorBeige: #e6e2e2; $colorGrey: rgba(232, 232, 232, 0.5); $logoBackground: url("/images/logo/cloud-transparent-mono.svg") no-repeat center; -$logoBackgroundTablet: url("/images/logo/cloud-transparent-mono-48-48.svg") no-repeat center; -$logoBackgroundMobile: url("/images/logo/logo-dbildungsMobile.svg") no-repeat center; +$logoBackgroundTablet: url("/images/logo/cloud-transparent-mono-48-48.svg") + no-repeat center; +$logoBackgroundMobile: url("/images/logo/logo-dbildungsMobile.svg") no-repeat + center; -aside.nav-sidebar{ - .sc-branding{ - padding: 0; - .cloud-logo{ - width: 100%; - margin: 0; - padding: 30px; - } - .sc-title { - display: none; - } - } +aside.nav-sidebar { + .sc-branding { + padding: 0; + .cloud-logo { + width: 100%; + margin: 0; + padding: 30px; + } + .sc-title { + display: none; + } + } - @media (max-width: 991px) { - .sc-branding{ - padding: 0; - .cloud-logo{ - background: $logoBackgroundTablet !important; - height: 32px; - } - } - } + @media (max-width: 991px) { + .sc-branding { + padding: 0; + .cloud-logo { + background: $logoBackgroundTablet !important; + height: 32px; + } + } + } } @media (max-width: 575px) { - .cloud-logo { - background: $logoBackgroundMobile !important; - } + .cloud-logo { + background: $logoBackgroundMobile !important; + } } -.primary-color{ - color: $primaryColor; - display: none; +.primary-color { + color: $primaryColor; + display: none; } .secondary-color { - color: $secondaryColor; - display: none; + color: $secondaryColor; + display: none; } diff --git a/views/courses/components/svg_archived_courses.hbs b/views/courses/components/svg_archived_courses.hbs index d7367c6acd..8f2b39f499 100644 --- a/views/courses/components/svg_archived_courses.hbs +++ b/views/courses/components/svg_archived_courses.hbs @@ -1,210 +1,700 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/views/courses/components/svg_groups.hbs b/views/courses/components/svg_groups.hbs index 61856c8ef0..9738811fce 100644 --- a/views/courses/components/svg_groups.hbs +++ b/views/courses/components/svg_groups.hbs @@ -1,11 +1,52 @@ - - {{$t "courses._course.groups.img_alt.noCreatedGroups"}} - - - - - - - - - + + {{$t "courses._course.groups.img_alt.noCreatedGroups"}} + + + + + + + + + \ No newline at end of file diff --git a/views/courses/components/svg_tasks.hbs b/views/courses/components/svg_tasks.hbs index e860b38012..c67537e702 100644 --- a/views/courses/components/svg_tasks.hbs +++ b/views/courses/components/svg_tasks.hbs @@ -1,9 +1,40 @@ - - {{$t "courses._course.tasks.img_alt.noPosedTasks"}} - - - - - - - + + {{$t "courses._course.tasks.img_alt.noPosedTasks"}} + + + + + + + \ No newline at end of file diff --git a/views/lib/components/svg_error_content.hbs b/views/lib/components/svg_error_content.hbs index f8b6699760..dccfb769a0 100644 --- a/views/lib/components/svg_error_content.hbs +++ b/views/lib/components/svg_error_content.hbs @@ -29,7 +29,7 @@ - + diff --git a/views/teams/svg_empty_teams.hbs b/views/teams/svg_empty_teams.hbs index 69830ab21d..ff01f7c2d5 100644 --- a/views/teams/svg_empty_teams.hbs +++ b/views/teams/svg_empty_teams.hbs @@ -46,12 +46,12 @@ - - + + - + @@ -246,7 +246,7 @@ - + @@ -329,7 +329,7 @@ - + @@ -355,14 +355,14 @@ - + - + - + @@ -392,7 +392,7 @@ - + @@ -508,7 +508,7 @@ - + From 07db37cab75b108fc15fbfb2fc2e76141d4050e7 Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Tue, 2 Apr 2024 14:26:48 +0200 Subject: [PATCH 2/2] adjust secondary color, add different gray dark colors for themes --- static/styles/lib/bootstrap/scss/_custom.scss | 2 +- static/styles/lib/bootstrap/scss/_variables.scss | 2 +- theme/brb/style.scss | 3 ++- theme/default/style.scss | 1 + theme/n21/style.scss | 3 ++- theme/thr/style.scss | 3 ++- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/static/styles/lib/bootstrap/scss/_custom.scss b/static/styles/lib/bootstrap/scss/_custom.scss index aa6620107f..167a89212e 100755 --- a/static/styles/lib/bootstrap/scss/_custom.scss +++ b/static/styles/lib/bootstrap/scss/_custom.scss @@ -20,7 +20,7 @@ // Colors // // Grayscale and brand colors for use across Bootstrap. -$gray-dark: #1b1b1b !default; +$gray-dark: $grayDarkColor !default; $gray: #55595c !default; $gray-light: #818a91 !default; $gray-lighter: #eceeef !default; diff --git a/static/styles/lib/bootstrap/scss/_variables.scss b/static/styles/lib/bootstrap/scss/_variables.scss index 947c2c9da4..5116d78854 100755 --- a/static/styles/lib/bootstrap/scss/_variables.scss +++ b/static/styles/lib/bootstrap/scss/_variables.scss @@ -40,7 +40,7 @@ // // Grayscale and brand colors for use across Bootstrap. -$gray-dark: #373a3c !default; +$gray-dark: #3a424b !default; $gray: #55595c !default; $gray-light: #818a91 !default; $gray-lighter: #eceeef !default; diff --git a/theme/brb/style.scss b/theme/brb/style.scss index bdd79ac2c1..1bf676d2ae 100644 --- a/theme/brb/style.scss +++ b/theme/brb/style.scss @@ -1,6 +1,7 @@ $primaryColor: #0a9396; -$secondaryColor: #38677a; +$secondaryColor: #294c5a; $accentColor: #E4032E; +$grayDarkColor: #294c5a; // :export { // primaryColor: $primaryColor; diff --git a/theme/default/style.scss b/theme/default/style.scss index aad434af8e..125809a6d4 100644 --- a/theme/default/style.scss +++ b/theme/default/style.scss @@ -1,6 +1,7 @@ $primaryColor: #9e292b; $secondaryColor: #3a424b; $accentColor: #e98404; +$grayDarkColor: #3a424b; $logoGradient: linear-gradient(35deg, #9e292b 35%, #f6a800); diff --git a/theme/n21/style.scss b/theme/n21/style.scss index 8b44c0b884..4d3ee8b4ee 100644 --- a/theme/n21/style.scss +++ b/theme/n21/style.scss @@ -1,7 +1,8 @@ $primaryColor: #2876D0; -$secondaryColor: #355478; +$secondaryColor: #0F3551; $accentColor: #970000; +$grayDarkColor: #0F3551; $logoGradient: linear-gradient(45deg, $primaryColor 30%, $primaryColor); diff --git a/theme/thr/style.scss b/theme/thr/style.scss index 759204741d..7bc0f37315 100644 --- a/theme/thr/style.scss +++ b/theme/thr/style.scss @@ -1,7 +1,8 @@ $primaryColor: #2876D0; -$secondaryColor: #185888; +$secondaryColor: #0f3551; $accentColor: #f56b00; +$grayDarkColor: #0f3551; $logoGradient: linear-gradient(45deg, $primaryColor, $primaryColor);