From f17de58fffa4ac0870e15bf7fde319330906f49c Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Tue, 14 May 2019 11:28:19 +0100 Subject: [PATCH] Improve hyperlink color Closes #261 Still more work to do, but an improvement nonetheless. --- gui/app/styles/colors.scss | 6 ++++-- gui/app/styles/core/bootstrap.scss | 2 +- gui/app/styles/core/util.scss | 2 +- .../styles/core/view/document/sidebar-attachment.scss | 9 ++------- gui/app/styles/themes/brave.scss | 6 ++++-- gui/app/styles/themes/conference.scss | 6 ++++-- gui/app/styles/themes/forest.scss | 6 ++++-- gui/app/styles/themes/harvest.scss | 6 ++++-- gui/app/styles/themes/silver.scss | 6 ++++-- gui/app/styles/themes/sunflower.scss | 6 ++++-- 10 files changed, 32 insertions(+), 23 deletions(-) diff --git a/gui/app/styles/colors.scss b/gui/app/styles/colors.scss index 04bfc4a2..914d1223 100644 --- a/gui/app/styles/colors.scss +++ b/gui/app/styles/colors.scss @@ -163,7 +163,7 @@ $color-sidebar: #f2f8fd; * This is the default theme of PURPLE. * * We go from 100 (lightest) to 900 (darkest). -* Base shade is 500 and is used prominmently as the +* Base shade is 500 and is used prominently as the * left-side navigation sidebar color. **************************************************************/ $theme-900: #160624; @@ -177,4 +177,6 @@ $theme-200: #EAD9F9; $theme-100: #FBF7FE; // Set hyperlink color for theme -$color-link: map-get($green-shades, 700); +// $color-link: map-get($green-shades, 700); +$color-link: #0080a5; +$color-link-hover: #0fb4e2; diff --git a/gui/app/styles/core/bootstrap.scss b/gui/app/styles/core/bootstrap.scss index 7ac7e37e..e9b6dc30 100644 --- a/gui/app/styles/core/bootstrap.scss +++ b/gui/app/styles/core/bootstrap.scss @@ -80,7 +80,7 @@ $input-focus-border-color: map-get($gray-shades, 200); // links $link-color: $color-link; $link-decoration: none; -$link-hover-color: darken($link-color, 15%) !default; +$link-hover-color: $color-link-hover !default; $link-hover-decoration: none; // diff --git a/gui/app/styles/core/util.scss b/gui/app/styles/core/util.scss index 0a466419..eaf3a7ff 100644 --- a/gui/app/styles/core/util.scss +++ b/gui/app/styles/core/util.scss @@ -17,7 +17,7 @@ a { -moz-osx-font-smoothing: grayscale; a:focus, a:hover { - text-decoration: none; + text-decoration: underline; } } diff --git a/gui/app/styles/core/view/document/sidebar-attachment.scss b/gui/app/styles/core/view/document/sidebar-attachment.scss index bb931a5f..62d65100 100644 --- a/gui/app/styles/core/view/document/sidebar-attachment.scss +++ b/gui/app/styles/core/view/document/sidebar-attachment.scss @@ -63,17 +63,12 @@ margin-right: 10px; width: 90%; @extend .text-truncate; - color: map-get($green-shades, 800); - - &:hover { - color: map-get($green-shades, 900); - } } - + > .menu { position: absolute; right: -10px; top: 0; - } + } } } diff --git a/gui/app/styles/themes/brave.scss b/gui/app/styles/themes/brave.scss index 6e97b9c0..5349216a 100644 --- a/gui/app/styles/themes/brave.scss +++ b/gui/app/styles/themes/brave.scss @@ -16,7 +16,7 @@ * * We go from 100 (lightest) to 900 (darkest). * -* Base shade is 500 and is used prominmently as the +* Base shade is 500 and is used prominently as the * left-side navigation sidebar color. **************************************************************/ $theme-900: #1F0902; @@ -30,6 +30,8 @@ $theme-200: #F9B39E; $theme-100: #FEF2EE; // Set hyperlink color for theme -$color-link: map-get($green-shades, 700); +// $color-link: map-get($green-shades, 700); +$color-link: #0080a5; +$color-link-hover: #0fb4e2; @import "../core/all.scss"; diff --git a/gui/app/styles/themes/conference.scss b/gui/app/styles/themes/conference.scss index 6a2dce0d..123aa1c8 100644 --- a/gui/app/styles/themes/conference.scss +++ b/gui/app/styles/themes/conference.scss @@ -16,7 +16,7 @@ * * We go from 100 (lightest) to 900 (darkest). * -* Base shade is 500 and is used prominmently as the +* Base shade is 500 and is used prominently as the * left-side navigation sidebar color. **************************************************************/ $theme-900: #071C2A; @@ -30,6 +30,8 @@ $theme-200: #B4DAF3; $theme-100: #EEF7FC; // Set hyperlink color for theme -$color-link: map-get($green-shades, 700); +// $color-link: map-get($green-shades, 700); +$color-link: #0080a5; +$color-link-hover: #0fb4e2; @import "../core/all.scss"; diff --git a/gui/app/styles/themes/forest.scss b/gui/app/styles/themes/forest.scss index ce706211..94a64211 100644 --- a/gui/app/styles/themes/forest.scss +++ b/gui/app/styles/themes/forest.scss @@ -16,7 +16,7 @@ * * We go from 100 (lightest) to 900 (darkest). * -* Base shade is 500 and is used prominmently as the +* Base shade is 500 and is used prominently as the * left-side navigation sidebar color. **************************************************************/ $theme-900: #001412; @@ -30,6 +30,8 @@ $theme-200: #CFFFF9; $theme-100: #F1FFFD; // Set hyperlink color for theme -$color-link: map-get($green-shades, 700); +// $color-link: map-get($green-shades, 700); +$color-link: #0080a5; +$color-link-hover: #0fb4e2; @import "../core/all.scss"; diff --git a/gui/app/styles/themes/harvest.scss b/gui/app/styles/themes/harvest.scss index 0d93230f..372b6af6 100644 --- a/gui/app/styles/themes/harvest.scss +++ b/gui/app/styles/themes/harvest.scss @@ -16,7 +16,7 @@ * * We go from 100 (lightest) to 900 (darkest). * -* Base shade is 500 and is used prominmently as the +* Base shade is 500 and is used prominently as the * left-side navigation sidebar color. **************************************************************/ $theme-900: #180E05; @@ -30,6 +30,8 @@ $theme-200: #EEC7A4; $theme-100: #F6E1CF; // Set hyperlink color for theme -$color-link: map-get($green-shades, 700); +// $color-link: map-get($green-shades, 700); +$color-link: #0080a5; +$color-link-hover: #0fb4e2; @import "../core/all.scss"; diff --git a/gui/app/styles/themes/silver.scss b/gui/app/styles/themes/silver.scss index 10785daa..6ca0de13 100644 --- a/gui/app/styles/themes/silver.scss +++ b/gui/app/styles/themes/silver.scss @@ -16,7 +16,7 @@ * * We go from 100 (lightest) to 900 (darkest). * -* Base shade is 500 and is used prominmently as the +* Base shade is 500 and is used prominently as the * left-side navigation sidebar color. **************************************************************/ $theme-900: #1F2833; @@ -30,6 +30,8 @@ $theme-200: #D5DDE5; $theme-100: #E1E7EB; // Set hyperlink color for theme -$color-link: map-get($green-shades, 700); +// $color-link: map-get($green-shades, 700); +$color-link: #0080a5; +$color-link-hover: #0fb4e2; @import "../core/all.scss"; diff --git a/gui/app/styles/themes/sunflower.scss b/gui/app/styles/themes/sunflower.scss index a2ecc3fc..d093860a 100644 --- a/gui/app/styles/themes/sunflower.scss +++ b/gui/app/styles/themes/sunflower.scss @@ -16,7 +16,7 @@ * * We go from 100 (lightest) to 900 (darkest). * -* Base shade is 500 and is used prominmently as the +* Base shade is 500 and is used prominently as the * left-side navigation sidebar color. **************************************************************/ $theme-900: #312A09; @@ -30,6 +30,8 @@ $theme-200: #F2E9BD; $theme-100: #FBF7E8; // Set hyperlink color for theme -$color-link: map-get($green-shades, 700); +// $color-link: map-get($green-shades, 700); +$color-link: #0080a5; +$color-link-hover: #0fb4e2; @import "../core/all.scss";