Merge pull request #1702 from TexasDigitalLibrary/revert-1698-1663_16…

…64-color-contrast Revert 1698 1663 1664 color contrast
TexasDigitalLibrary · Apr 17, 2023 · 4781163 · 4781163
2 parents 0d60d4b + e2b37fc
commit 4781163
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 334 deletions.
diff --git a/src/main/java/org/tdl/vireo/config/constant/ConfigurationName.java b/src/main/java/org/tdl/vireo/config/constant/ConfigurationName.java
@@ -49,46 +49,25 @@ public class ConfigurationName {
     // Theme settings
     /** Background main color */
     public final static String THEME_PATH = "theme_path";
-
-    /** Text main color */
-    public final static String TEXT_MAIN_COLOR = "text_main_color";
 
     /** Background main color */
     public final static String BACKGROUND_MAIN_COLOR = "background_main_color";
 
     /** Background highlight color */
     public final static String BACKGROUND_HIGHLIGHT_COLOR = "background_highlight_color";
 
-    /** Background text color */
-    public final static String BACKGROUND_TEXT_COLOR = "background_text_color";
-
     /** Submission Step Button main color when in "on" state */
     public final static String BUTTON_MAIN_COLOR_ON = "button_main_color_on";
 
     /** Submission Step Button highlight color when in "on" state */
     public final static String BUTTON_HIGHLIGHT_COLOR_ON = "button_highlight_color_on";
 
-    /** Submission Step Button text color when in "on" state */
-    public final static String BUTTON_TEXT_COLOR_ON = "button_text_color_on";
-
     /** Submission Step Button main color when in "off" state */
     public final static String BUTTON_MAIN_COLOR_OFF = "button_main_color_off";
 
     /** Submission Step Button highlight color when in "off" state */
     public final static String BUTTON_HIGHLIGHT_COLOR_OFF = "button_highlight_color_off";
 
-    /** Submission Step Button text color when in "off" state */
-    public final static String BUTTON_TEXT_COLOR_OFF = "button_text_color_off";
-
-    /** Admin main navigation tab background color */
-    public final static String ADMIN_TAB_MAIN_COLOR = "admin_tab_main_color";
-
-    /** Admin selected navigation tab background color */
-    public final static String ADMIN_TAB_SELECTED_COLOR = "admin_tab_selected_color";
-
-    /** Admin navigation tab text color*/
-    public final static String ADMIN_TAB_TEXT_COLOR = "admin_tab_text_color";
-
     /** Custom CSS */
     public final static String LEFT_LOGO = "left_logo";
 

diff --git a/src/main/java/org/tdl/vireo/service/VireoThemeManagerService.java b/src/main/java/org/tdl/vireo/service/VireoThemeManagerService.java
@@ -24,7 +24,7 @@ public class VireoThemeManagerService extends SimpleThemeManagerService implemen
 
     @Override
     public Map<String, String> getThemeProperties() {
-        String[] themePropertyNames = {"text_main_color", "background_main_color", "background_highlight_color", "background_text_color", "button_main_color_on", "button_highlight_color_on", "button_text_color_on", "button_main_color_off", "button_highlight_color_off", "button_text_color_off", "admin_tab_main_color", "admin_tab_selected_color", "admin_tab_text_color"};
+        String[] themePropertyNames = { "background_main_color", "background_highlight_color", "button_main_color_on", "button_highlight_color_on", "button_main_color_off", "button_highlight_color_off" };
         List<String> themePropertyNamesList = Arrays.asList(themePropertyNames);
         List<Configuration> themeConfigurations = configurationRepo.getAllByType("lookAndFeel");
         HashMap<String, String> themeProperties = new HashMap<String, String>();

diff --git a/src/main/resources/settings/SYSTEM_Defaults.json b/src/main/resources/settings/SYSTEM_Defaults.json
@@ -85,44 +85,23 @@
     {
       "theme_path":"configuration/theme/"
     },
-    {
-      "text_main_color":"#757575"
-    },
     {
       "background_main_color":"#1b333f"
     },
     {
       "background_highlight_color":"#43606e"
     },
-    {
-      "background_text_color":"#ffffff"
-    },
     {
       "button_main_color_on":"#1b333f"
     },
     {
       "button_highlight_color_on":"#43606e"
     },
     {
-      "button_text_color_on":"#ffffff"
-    },
-    {
-      "button_main_color_off":"#424D46"
-    },
-    {
-      "button_highlight_color_off":"#697A70"
-    },
-    {
-      "button_text_color_off":"#ffffff"
-    },
-    {
-      "admin_tab_main_color":"#adbdaa"
-    },
-    {
-      "admin_tab_selected_color":"#ffffff"
+      "button_main_color_off":"#92aa9c"
     },
     {
-      "admin_tab_text_color":"#1D3541"
+      "button_highlight_color_off":"#adbdaa"
     },
     {
       "left_logo":"resources/images/default-left-logo.png"

diff --git a/src/main/webapp/app/resources/styles/sass/app.scss b/src/main/webapp/app/resources/styles/sass/app.scss
@@ -12,7 +12,7 @@ html {
 
 body {
   font-family: "Trebuchet MS", Verdana, Geneva, Arial, Helvetica, Sans-Serif;
-  color: $text_main_color;
+  color: #70706f;
   margin-right: 0 !important;
   padding-right: 0 !important;
   height: 100%;
@@ -76,18 +76,19 @@ main footer {
 }
 
 .tab-nav li {
-  background: $admin_tab_main_color;
+  background: $button_highlight_color_off;
   padding: 0 10px;
   margin-right: 15px;
   min-width: 75px;
   text-align: center;
-  color: $admin_tab_text_color;
+  color: #1D3541;
   font-size: 1.75em;
   font-weight: bolder;
   display: inline-block;
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
   box-shadow: inset 0 -5px 7px -5px rgba(0, 0, 0, 0.75);
+  text-shadow: 0 0 10px rgba(255, 255, 245, 1), -1px -1px 0 rgba(250, 250, 235, 0.25), 1px 1px 0 rgba(250, 250, 235, 0.5);
 }
 
 .tab-nav li.settings-tab {
@@ -100,7 +101,8 @@ main footer {
 .tab-nav li.active,
 .tab-nav li:hover {
   cursor: pointer;
-  background: $admin_tab_selected_color;
+  background: #FFFFFF;
+  text-shadow: 0 0 0 #FFFFFF;
   box-shadow: inset 0 0 0 #FFFFFF;
 }
 
@@ -111,7 +113,8 @@ main footer {
 .tab-nav li a {
   height: 45px;
   color: inherit;
-  background-color:transparent !important;
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
 }
 
 .tab-nav li.settings-tab a {
@@ -583,7 +586,7 @@ togglebutton {
 }
 
 .toggle-button .btn.active {
-  background-color: #697A70;
+  background-color: #a2ccb5;
   color: #FFFFFF;
   border: 1px solid #70706f;
   outline: none;
@@ -681,26 +684,26 @@ h4 {
   padding-top: 35px;
   width: 250px;
   height: 150px;
-  color: #696969;
+  color: #a6a6a6;
   border-radius: 5px;
   transition: all 0.35s ease-in;
 }
 
 .trash-drop-zone.dragging {
   transition: all 0.35s ease-in;
-  border-color: #696969;
+  border-color: #a6a6a6;
 }
 
 .trash-drop-zone .glyphicon-trash {
   transition: all 0.35s ease-in;
   color: #fefefe;
-  text-shadow: 1px 0 5px #696969;
+  text-shadow: 1px 0 5px #a6a6a6;
   font-size: 70px;
 }
 
 .trash-drop-zone.dragging .glyphicon-trash {
   transition: all 0.35s ease-in;
-  color: #696969;
+  color: #a6a6a6;
   text-shadow: 1px 0 5px #fefefe;
   font-size: 70px;
 }
@@ -712,20 +715,20 @@ h4 {
   padding-top: 35px;
   max-width: 250px;
   height: 150px;
-  color: #696969;
+  color: #a6a6a6;
   border-radius: 5px;
   transition: all 0.35s ease-in;
 }
 
 .upload-drop-zone.dragging-accept {
   transition: all 0.35s ease-in;
-  border-color: #696969;
+  border-color: #a6a6a6;
 }
 
 .upload-drop-zone .glyphicon-upload {
   transition: all 0.35s ease-in;
   color: #fefefe;
-  text-shadow: 1px 0 5px #696969;
+  text-shadow: 1px 0 5px #a6a6a6;
   font-size: 70px;
 }
 
@@ -736,7 +739,7 @@ h4 {
 .upload-drop-zone.dragging .glyphicon-upload,
 .upload-drop-zone.reject .glyphicon-ban-circle {
   transition: all 0.35s ease-in;
-  color: #696969;
+  color: #a6a6a6;
   text-shadow: 1px 0 5px #fefefe;
   font-size: 70px;
 }
@@ -953,22 +956,6 @@ input[type=color]:focus {
 /**************************
 * LOOK AND FEEL ACCORDION *
 ***************************/
-.look-and-feel-h1 {
-  font-size: 18px;
-  font-style: bold;
-  margin-bottom: .2em;
-}
-
-.look-and-feel-h2 {
-  font-size: 14px;
-  margin-bottom: 1.5em;
-}
-
-.look-and-feel-h1 .glyphicon.glyphicon-info-sign {
-  vertical-align: text-top;
-  font-size: 12px;
-}
-
 .look-and-feel .color-reset {
   text-indent: 0;
   font-size: 0.85em;
@@ -985,12 +972,11 @@ input[type=color]:focus {
 }
 
 .look-and-feel .color-input {
-  height: 42px;
-  min-width: 78px;
+  height: 37px;
 }
 
 .look-and-feel .color-selector {
-  max-width: 100px;
+  max-width: 200px;
 }
 
 .look-and-feel label.color-selector-swatch {
@@ -1208,17 +1194,17 @@ input[type=color]:focus {
 
 .triptych-panel .list-group-item:hover {
   cursor: pointer;
-  color: $text_main_color;
+  color: #70706f;
   background: #efefef;
 }
 
 .triptych-panel.previously-active .list-group-item.selected {
-  color: $text_main_color;
+  color: #70706f;
   background: #E6ECE8;
 }
 
 .triptych-panel .list-group-item.selected {
-  color: $text_main_color;
+  color: #fff;
   background: #92AA9C;
 }
 
@@ -1437,7 +1423,6 @@ input[type=color]:focus {
  * NOTES *
  *********/
 .note {
-  color: #474747;
   position: relative;
   max-width: 225px;
   padding: 15px 15px 35px 35px;

diff --git a/src/main/webapp/app/resources/styles/sass/directives/_tooltip.scss b/src/main/webapp/app/resources/styles/sass/directives/_tooltip.scss
@@ -37,7 +37,6 @@
   background: -webkit-linear-gradient(to bottom, rgba(31, 58, 71, 0.95), rgba(80, 114, 129, 0.95));
   background: -ms-linear-gradient(to bottom, rgba(31, 58, 71, 0.95), rgba(80, 114, 129, 0.95));
   background: linear-gradient(to bottom, rgba(31, 58, 71, 0.95), rgba(80, 114, 129, 0.95));
-  opacity: 1 !important;
 }
 
 .tooltip .popover-content a,

diff --git a/src/main/webapp/app/resources/styles/sass/overrides/_bootstrap.scss b/src/main/webapp/app/resources/styles/sass/overrides/_bootstrap.scss
@@ -6,10 +6,10 @@
 // $gray-light:             lighten($gray-base, 46.7%) !default; // #777
 // $gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
 
-$brand-primary:         darken(#367DC4, 6.5%) !default; // #337ab7
+$brand-primary:         darken(#428bca, 6.5%) !default; // #337ab7
 // $brand-success:         #5cb85c !default;
-$brand-info:            #357AB9 !default;
+// $brand-info:            #5bc0de !default;
 // $brand-warning:         #f0ad4e !default;
-$brand-danger:          #C15453 !default;
+$brand-danger:          #CD7674 !default;
 
-$icon-font-path: "../fonts/bootstrap/" !default;
+$icon-font-path: "../fonts/bootstrap/" !default;
diff --git a/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss b/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss
@@ -18,7 +18,7 @@ submissiondialog div.dialog {
 }
 @media (min-width: 1540px) {
   submissiondialog div.dialog {
-    box-shadow: 3px 3px 10px -6px #757575;
+    box-shadow: 3px 3px 10px -6px #000000;
   }
 }