From 67ead1c250319a810c09d3ffbdd6adfbfc763228 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 22 Jul 2019 23:12:36 +0100 Subject: [PATCH 1/3] Fixed alternative theme tables --- src/web/stylesheets/themes/_classic.css | 1 + src/web/stylesheets/themes/_dark.css | 1 + src/web/stylesheets/themes/_geocities.css | 1 + src/web/stylesheets/themes/_solarizedDark.css | 1 + src/web/stylesheets/themes/_solarizedLight.css | 1 + src/web/stylesheets/utils/_overrides.css | 12 ++++++++++++ 6 files changed, 17 insertions(+) diff --git a/src/web/stylesheets/themes/_classic.css b/src/web/stylesheets/themes/_classic.css index f89d9dce..3986a19e 100755 --- a/src/web/stylesheets/themes/_classic.css +++ b/src/web/stylesheets/themes/_classic.css @@ -125,6 +125,7 @@ /* Misc. */ --drop-file-border-colour: #3a87ad; + --table-border-colour: rgb(0, 0, 0, 0.1); --popover-background: #fff; --popover-border-colour: #ccc; --code-background: #f9f2f4; diff --git a/src/web/stylesheets/themes/_dark.css b/src/web/stylesheets/themes/_dark.css index ff2217fb..e37025d6 100755 --- a/src/web/stylesheets/themes/_dark.css +++ b/src/web/stylesheets/themes/_dark.css @@ -121,6 +121,7 @@ /* Misc. */ --drop-file-border-colour: #0e639c; + --table-border-colour: rgb(255, 255, 255, 0.10); --popover-background: #444; --popover-border-colour: #555; --code-background: #0e639c; diff --git a/src/web/stylesheets/themes/_geocities.css b/src/web/stylesheets/themes/_geocities.css index 230638b1..fcf3cdb5 100755 --- a/src/web/stylesheets/themes/_geocities.css +++ b/src/web/stylesheets/themes/_geocities.css @@ -121,6 +121,7 @@ /* Misc. */ --drop-file-border-colour: purple; + --table-border-colour: var(--hl3); --popover-background: turquoise; --popover-border-colour: violet; --code-background: black; diff --git a/src/web/stylesheets/themes/_solarizedDark.css b/src/web/stylesheets/themes/_solarizedDark.css index 1d46a9bd..a370258a 100755 --- a/src/web/stylesheets/themes/_solarizedDark.css +++ b/src/web/stylesheets/themes/_solarizedDark.css @@ -138,6 +138,7 @@ /* Misc. */ --drop-file-border-colour: var(--base01); + --table-border-colour: rgba(131, 148, 150, 0.4); --popover-background: var(--base02); --popover-border-colour: var(--base01); --code-background: var(--base03); diff --git a/src/web/stylesheets/themes/_solarizedLight.css b/src/web/stylesheets/themes/_solarizedLight.css index 46f8bf1c..8ce4ac1f 100755 --- a/src/web/stylesheets/themes/_solarizedLight.css +++ b/src/web/stylesheets/themes/_solarizedLight.css @@ -140,6 +140,7 @@ /* Misc. */ --drop-file-border-colour: var(--base1); + --table-border-colour: rgba(131, 148, 150, 0.4); --popover-background: var(--base2); --popover-border-colour: var(--base1); --code-background: var(--base3); diff --git a/src/web/stylesheets/utils/_overrides.css b/src/web/stylesheets/utils/_overrides.css index 129b840e..6239204f 100755 --- a/src/web/stylesheets/utils/_overrides.css +++ b/src/web/stylesheets/utils/_overrides.css @@ -148,6 +148,18 @@ optgroup { width: auto !important; } +.table { + color: var(--primary-font-colour); +} + +.table-bordered th, .table-bordered td { + border: 1px solid var(--table-border-colour); +} + +.table-hover tbody tr:hover { + color: var(--primary-font-colour) +} + .popover { background-color: var(--popover-background); border-color: var(--popover-border-colour); From d4c4e2599d8e73deef195d84c7fc4a94b24620d8 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 22 Jul 2019 23:16:17 +0100 Subject: [PATCH 2/3] Reduced redundancy --- src/web/stylesheets/utils/_overrides.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/web/stylesheets/utils/_overrides.css b/src/web/stylesheets/utils/_overrides.css index 6239204f..b1ca4c57 100755 --- a/src/web/stylesheets/utils/_overrides.css +++ b/src/web/stylesheets/utils/_overrides.css @@ -148,7 +148,8 @@ optgroup { width: auto !important; } -.table { +.table, +.table-hover tbody tr:hover { color: var(--primary-font-colour); } @@ -156,10 +157,6 @@ optgroup { border: 1px solid var(--table-border-colour); } -.table-hover tbody tr:hover { - color: var(--primary-font-colour) -} - .popover { background-color: var(--popover-background); border-color: var(--popover-border-colour); From b3a10d4f9e75fa013565a6dca51c24d3cf89fd59 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 23 Jul 2019 19:17:21 +0100 Subject: [PATCH 3/3] Made some better colour choices --- src/web/stylesheets/themes/_classic.css | 2 +- src/web/stylesheets/themes/_dark.css | 2 +- src/web/stylesheets/themes/_solarizedDark.css | 2 +- src/web/stylesheets/themes/_solarizedLight.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/web/stylesheets/themes/_classic.css b/src/web/stylesheets/themes/_classic.css index 3986a19e..3b3bd555 100755 --- a/src/web/stylesheets/themes/_classic.css +++ b/src/web/stylesheets/themes/_classic.css @@ -125,7 +125,7 @@ /* Misc. */ --drop-file-border-colour: #3a87ad; - --table-border-colour: rgb(0, 0, 0, 0.1); + --table-border-colour: #ccc; --popover-background: #fff; --popover-border-colour: #ccc; --code-background: #f9f2f4; diff --git a/src/web/stylesheets/themes/_dark.css b/src/web/stylesheets/themes/_dark.css index e37025d6..10340ea8 100755 --- a/src/web/stylesheets/themes/_dark.css +++ b/src/web/stylesheets/themes/_dark.css @@ -121,7 +121,7 @@ /* Misc. */ --drop-file-border-colour: #0e639c; - --table-border-colour: rgb(255, 255, 255, 0.10); + --table-border-colour: #555; --popover-background: #444; --popover-border-colour: #555; --code-background: #0e639c; diff --git a/src/web/stylesheets/themes/_solarizedDark.css b/src/web/stylesheets/themes/_solarizedDark.css index a370258a..3b7d4338 100755 --- a/src/web/stylesheets/themes/_solarizedDark.css +++ b/src/web/stylesheets/themes/_solarizedDark.css @@ -138,7 +138,7 @@ /* Misc. */ --drop-file-border-colour: var(--base01); - --table-border-colour: rgba(131, 148, 150, 0.4); + --table-border-colour: var(--base01); --popover-background: var(--base02); --popover-border-colour: var(--base01); --code-background: var(--base03); diff --git a/src/web/stylesheets/themes/_solarizedLight.css b/src/web/stylesheets/themes/_solarizedLight.css index 8ce4ac1f..00b86091 100755 --- a/src/web/stylesheets/themes/_solarizedLight.css +++ b/src/web/stylesheets/themes/_solarizedLight.css @@ -140,7 +140,7 @@ /* Misc. */ --drop-file-border-colour: var(--base1); - --table-border-colour: rgba(131, 148, 150, 0.4); + --table-border-colour: var(--base1); --popover-background: var(--base2); --popover-border-colour: var(--base1); --code-background: var(--base3);