From f3faa0df2ca0166d7e3cd7933b36cda1c038f37d Mon Sep 17 00:00:00 2001 From: Yura Bondarenko Date: Thu, 17 Jun 2021 16:57:48 +0200 Subject: [PATCH 1/4] 80154: Revert to default Bootstrap grays --- src/styles/_bootstrap_variables.scss | 10 ++-------- .../custom/styles/_theme_sass_variable_overrides.scss | 11 ++--------- .../dspace/styles/_theme_sass_variable_overrides.scss | 10 +++------- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss index 58f599c516..db4387dc30 100644 --- a/src/styles/_bootstrap_variables.scss +++ b/src/styles/_bootstrap_variables.scss @@ -12,12 +12,6 @@ $image-path: "../assets/images" !default; /** Bootstrap Variables **/ /* Colors */ -$gray-base: #000 !default; -$gray-900: lighten($gray-base, 13.5%) !default; // #222 -$gray-800: lighten($gray-base, 26.6%) !default; // #444 -$gray-700: lighten($gray-base, 46.6%) !default; // #777 -$gray-600: lighten($gray-base, 73.3%) !default; // #bbb -$gray-100: lighten($gray-base, 93.5%) !default; // #eee /* Reassign color vars to semantic color scheme */ $blue: #2B4E72 !default; @@ -29,12 +23,12 @@ $dark: darken($blue, 17%) !default; $theme-colors: ( primary: $blue, - secondary: $gray-700, + secondary: #495057, // Bootstrap $gray-700 success: $green, info: $cyan, warning: $yellow, danger: $red, - light: $gray-100, + light: #f8f9fa, // Bootstrap $gray-100 dark: $dark ) !default; /* Fonts */ diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss index 9f69b17ebd..30d806ecda 100644 --- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss +++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss @@ -5,13 +5,6 @@ // $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; // -// $gray-base: #000 !default; -// $gray-900: lighten($gray-base, 13.5%) !default; // #222 -// $gray-800: lighten($gray-base, 26.6%) !default; // #444 -// $gray-700: lighten($gray-base, 46.6%) !default; // #777 -// $gray-600: lighten($gray-base, 73.3%) !default; // #bbb -// $gray-100: lighten($gray-base, 93.5%) !default; // #eee -// // $blue: #2B4E72 !default; // $green: #94BA65 !default; // $cyan: #006666 !default; @@ -21,12 +14,12 @@ // // $theme-colors: ( // primary: $blue, -// secondary: $gray-700, +// secondary: #495057, // Bootstrap $gray-700 // success: $green, // info: $cyan, // warning: $yellow, // danger: $red, -// light: $gray-100, +// light: #f8f9fa, // Bootstrap $gray-100 // dark: $dark // ) !default; // diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss index 70aa0b1850..64daf347b4 100644 --- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss +++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss @@ -6,10 +6,6 @@ @import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;1,200;1,300;1,400;1,600;1,700;1,800&display=swap'); $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; -$gray-100: #e8ebf3 !default; -$gray-400: #ced4da !default; -$gray-600: #959595 !default; -$gray-800: #444444 !default; $navbar-dark-color: #FFFFFF; @@ -21,10 +17,10 @@ $yellow: #ec9433 !default; $red: #CF4444 !default; $dark: #43515f !default; -$body-color: $gray-800 !default; +$body-color: #343a40 !default; // Bootstrap $gray-800 -$table-accent-bg: $gray-100 !default; -$table-hover-bg: $gray-400 !default; +$table-accent-bg: #f8f9fa !default; // Bootstrap $gray-100 +$table-hover-bg: #ced4da !default; // Bootstrap $gray-400 $yiq-contrasted-threshold: 170 !default; From 3a8e658d54a8b7bdae4d73037e999a9aadfbec82 Mon Sep 17 00:00:00 2001 From: Yura Bondarenko Date: Fri, 18 Jun 2021 15:24:16 +0200 Subject: [PATCH 2/4] 80154: Keep using Bootstrap variables --- src/styles/_bootstrap_variables.scss | 6 ++++-- .../custom/styles/_theme_sass_variable_overrides.scss | 7 +++++-- .../dspace/styles/_theme_sass_variable_overrides.scss | 11 +++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss index db4387dc30..41a304af39 100644 --- a/src/styles/_bootstrap_variables.scss +++ b/src/styles/_bootstrap_variables.scss @@ -12,6 +12,8 @@ $image-path: "../assets/images" !default; /** Bootstrap Variables **/ /* Colors */ +$gray-700: #495057; !default // Bootstrap $gray-700 +$gray-100: #f8f9fa; !default // $gray-100 /* Reassign color vars to semantic color scheme */ $blue: #2B4E72 !default; @@ -23,12 +25,12 @@ $dark: darken($blue, 17%) !default; $theme-colors: ( primary: $blue, - secondary: #495057, // Bootstrap $gray-700 + secondary: $gray-700, success: $green, info: $cyan, warning: $yellow, danger: $red, - light: #f8f9fa, // Bootstrap $gray-100 + light: $gray-100, dark: $dark ) !default; /* Fonts */ diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss index 30d806ecda..0711268582 100644 --- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss +++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss @@ -5,6 +5,9 @@ // $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; // +// $gray-700: #495057; !default // Bootstrap $gray-700 +// $gray-100: #f8f9fa; !default // $gray-100 +// // $blue: #2B4E72 !default; // $green: #94BA65 !default; // $cyan: #006666 !default; @@ -14,12 +17,12 @@ // // $theme-colors: ( // primary: $blue, -// secondary: #495057, // Bootstrap $gray-700 +// secondary: $gray-700, // success: $green, // info: $cyan, // warning: $yellow, // danger: $red, -// light: #f8f9fa, // Bootstrap $gray-100 +// light: $gray-100, // dark: $dark // ) !default; // diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss index 64daf347b4..b6fddce24a 100644 --- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss +++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss @@ -17,10 +17,13 @@ $yellow: #ec9433 !default; $red: #CF4444 !default; $dark: #43515f !default; -$body-color: #343a40 !default; // Bootstrap $gray-800 +$gray-800: #343a40; !default +$gray-400: #ced4da; !default +$gray-100: #f8f9fa; !default -$table-accent-bg: #f8f9fa !default; // Bootstrap $gray-100 -$table-hover-bg: #ced4da !default; // Bootstrap $gray-400 +$body-color: $gray-800 !default; // Bootstrap $gray-800 + +$table-accent-bg: $gray-100 !default; // Bootstrap $gray-100 +$table-hover-bg: $gray-400 !default; // Bootstrap $gray-400 $yiq-contrasted-threshold: 170 !default; - From 7c609820b19a98229353a004e1bd71fad1f93ebc Mon Sep 17 00:00:00 2001 From: Yura Bondarenko Date: Fri, 18 Jun 2021 15:31:30 +0200 Subject: [PATCH 3/4] 80154: Fix semicolon placement --- src/styles/_bootstrap_variables.scss | 4 ++-- .../custom/styles/_theme_sass_variable_overrides.scss | 4 ++-- .../dspace/styles/_theme_sass_variable_overrides.scss | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss index 41a304af39..4c631a294a 100644 --- a/src/styles/_bootstrap_variables.scss +++ b/src/styles/_bootstrap_variables.scss @@ -12,8 +12,8 @@ $image-path: "../assets/images" !default; /** Bootstrap Variables **/ /* Colors */ -$gray-700: #495057; !default // Bootstrap $gray-700 -$gray-100: #f8f9fa; !default // $gray-100 +$gray-700: #495057 !default; // Bootstrap $gray-700 +$gray-100: #f8f9fa !default; // $gray-100 /* Reassign color vars to semantic color scheme */ $blue: #2B4E72 !default; diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss index 0711268582..f1387aa619 100644 --- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss +++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss @@ -5,8 +5,8 @@ // $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; // -// $gray-700: #495057; !default // Bootstrap $gray-700 -// $gray-100: #f8f9fa; !default // $gray-100 +// $gray-700: #495057 !default; // Bootstrap $gray-700 +// $gray-100: #f8f9fa !default; // $gray-100 // // $blue: #2B4E72 !default; // $green: #94BA65 !default; diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss index b6fddce24a..9257bc46dd 100644 --- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss +++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss @@ -17,9 +17,9 @@ $yellow: #ec9433 !default; $red: #CF4444 !default; $dark: #43515f !default; -$gray-800: #343a40; !default -$gray-400: #ced4da; !default -$gray-100: #f8f9fa; !default +$gray-800: #343a40 !default; +$gray-400: #ced4da !default; +$gray-100: #f8f9fa !default; $body-color: $gray-800 !default; // Bootstrap $gray-800 From a617e04290bc13a9aafad75bd580e7251bdfdc91 Mon Sep 17 00:00:00 2001 From: Yura Bondarenko Date: Tue, 22 Jun 2021 09:03:53 +0200 Subject: [PATCH 4/4] 80154: Change badge-light to badge-info --- .../mydspace-item-submitter/item-submitter.component.html | 2 +- src/app/shared/object-list/type-badge/type-badge.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html index 47674025ca..1e8524e5ec 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html +++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html @@ -1,3 +1,3 @@
- {{'submission.workflow.tasks.generic.submitter' | translate}} : {{(submitter$ | async)?.name}} + {{'submission.workflow.tasks.generic.submitter' | translate}} : {{(submitter$ | async)?.name}}
diff --git a/src/app/shared/object-list/type-badge/type-badge.component.html b/src/app/shared/object-list/type-badge/type-badge.component.html index 18aeeb4bca..0c2bd7544e 100644 --- a/src/app/shared/object-list/type-badge/type-badge.component.html +++ b/src/app/shared/object-list/type-badge/type-badge.component.html @@ -1,3 +1,3 @@
- {{ typeMessage | translate }} + {{ typeMessage | translate }}