Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/themes/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/themes/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/themes",
"version": "1.8.0",
"version": "1.9.0",
"description": "Themes that come bundled with LabKey Server",
"files": [
"dist/"
Expand Down
18 changes: 9 additions & 9 deletions packages/themes/styles/scss/labkey/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ $lk-page-nav-dropdown-icon-color: $lk-brand-color !default;

//The following 4 themes are for the navigation tabs
// TODO: This should try to declare a shared color tone or use an adjusted brand color
$lk-page-nav-secondary-tab-bg-color: #73b6e0 !default;
$lk-page-nav-secondary-tab-text-color: $white !default;
$lk-page-nav-secondary-tab-bg-color: #73B6E0 !default;
$lk-page-nav-secondary-tab-text-color: #0B4161 !default;
$lk-page-nav-primary-tab-bg-color: $lk-primary-bg-color !default;
$lk-page-nav-primary-tab-text-color: $lk-brand-color !default;
$lk-page-nav-primary-tab-text-color: #0B4161 !default;

$lk-page-nav-font-weight: bold !default;
$lk-page-nav-height: 36px !default;
Expand Down Expand Up @@ -367,21 +367,21 @@ $lk-table-condensed-cell-padding: 3px !default;
//== Tabs (Bootstrap tabs (Export data set dropdown))
//
$lk-nav-tab-primary-bg-color: #F8F8F8 !default;
$lk-nav-tab-primary-text-color: #555555 !default;
$lk-nav-tab-primary-text-color: #0B4161 !default;
$lk-nav-tab-secondary-bg-color: transparent !default;
$lk-nav-tab-secondary-text-color: $lk-brand-color !default;
$lk-nav-tab-secondary-text-color: #0B4161 !default;

$lk-nav-tab-secondary-hover-bg-color: #EEEEEE !default;
$lk-nav-tab-secondary-hover-text-color: $gray-base !default;
$lk-nav-tab-secondary-hover-text-color: #0B4161 !default;
$lk-nav-tab-border-color: #DDDDDD;

//== TabStrips
//
$lk-active-tab-color: $gray-base !default;
$lk-active-tab-color: #0B4161 !default;
$lk-active-tab-bg-color: $white !default;
$lk-active-tab-body-bg-color: $lk-active-tab-bg-color !default;
$lk-inactive-tab-color: $gray-base !default;
$lk-inactive-tab-bg-color: #f4f4f4 !default;
$lk-inactive-tab-color: #0B4161 !default;
$lk-inactive-tab-bg-color: #73B6E0 !default;
$lk-tabstrip-border-color: #b4b4b4 !default;

//== Tool Icons
Expand Down
22 changes: 12 additions & 10 deletions packages/themes/themes/harvest/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ $Harvest-gray-footer-text: #adadad;
$Harvest-gray-footer-text-hover: #f9f9f9;
$Harvest-white: #FFFFFF;
$Harvest-addtl-text: #742A2A;
$Harvest-dark-text: #381A00;
$Harvest-inactive-tab: #FFAC69;

$lk-theme-dark-accent: $Harvest-accent;
$lk-theme-light-accent: $Harvest-header;
Expand Down Expand Up @@ -55,8 +57,8 @@ $lk-grid-sort-icon-color: $Harvest-gray-footer-text;
//== Header
//
$lk-page-header-bg-color: $Harvest-header;
$lk-page-header-text-color: $Harvest-page-bkgd;
$lk-page-header-icon-color: $Harvest-page-bkgd;
$lk-page-header-text-color: $Harvest-dark-text;
$lk-page-header-icon-color: $Harvest-dark-text;
$lk-page-header-font-hover-color: $Harvest-gray-blue;
$lk-page-header-icon-hover-color: $Harvest-gray-blue;
$lk-page-header-warning-color: #f5ff00;
Expand All @@ -70,18 +72,18 @@ $lk-text-link-color-hover: $Harvest-gray-darkest;
//== Navigation
//
$lk-page-nav-bg-color: $Harvest-accent;
$lk-page-nav-text-color: $Harvest-page-bkgd;
$lk-page-nav-text-color: $Harvest-dark-text;
$lk-page-nav-active-bg-color: $Harvest-page-bkgd;
$lk-page-nav-active-text-color: $Harvest-accent;
$lk-page-nav-active-text-color: $Harvest-dark-text;
$lk-page-nav-dropdown-item-bg-color: $Harvest-page-bkgd;
$lk-page-nav-dropdown-item-text-color: $Harvest-accent;
$lk-page-nav-dropdown-item-text-color: $Harvest-dark-text;
$lk-page-nav-dropdown-highlight-item-bg-color: $Harvest-accent;
$lk-page-nav-dropdown-highlight-item-text-color: $Harvest-page-bkgd;
$lk-page-nav-dropdown-highlight-item-text-color: $Harvest-dark-text;
$lk-page-nav-dropdown-icon-color: $Harvest-accent;
$lk-page-nav-secondary-tab-bg-color: color.adjust($Harvest-gray-blue, $hue: -10deg, $lightness: 5%);
$lk-page-nav-secondary-tab-text-color: $Harvest-addtl-text;
$lk-page-nav-secondary-tab-bg-color: $Harvest-inactive-tab;
$lk-page-nav-secondary-tab-text-color: $Harvest-dark-text;
$lk-page-nav-primary-tab-bg-color: $Harvest-page-bkgd;
$lk-page-nav-primary-tab-text-color: $Harvest-accent;
$lk-page-nav-primary-tab-text-color: $Harvest-dark-text;
$lk-nav-dropdown-color: $Harvest-header;

//== Panels
Expand All @@ -98,7 +100,7 @@ $lk-webpart-title-hover-color: $Harvest-anchor-color;
//== Tabs (Bootstrap tabs (Export data set dropdown))
//
$lk-nav-tab-primary-bg-color: $Harvest-white;
$lk-nav-tab-secondary-text-color: $Harvest-anchor-color;
$lk-nav-tab-secondary-text-color: $Harvest-dark-text;

//== Tool Icons
//
Expand Down
25 changes: 14 additions & 11 deletions packages/themes/themes/leaf/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ $Leaf-anchor-color: #0479a8;
$Leaf-gray-footer-text: #adadad;
$Leaf-gray-footer-text-hover: #f9f9f9;
$Leaf-white: #FFFFFF;
$Leaf-dark-text: #000000;
$Leaf-secondary-header: #64803C;
$Leaf-inactive-tab: #A6BF86;

$lk-theme-dark-accent: $Leaf-accent;
$lk-theme-light-accent: $Leaf-header;
Expand Down Expand Up @@ -54,8 +57,8 @@ $lk-grid-sort-icon-color: $Leaf-gray-footer-text;
//== Header
//
$lk-page-header-bg-color: $Leaf-header;
$lk-page-header-text-color: $Leaf-page-bkgd;
$lk-page-header-icon-color: $Leaf-page-bkgd;
$lk-page-header-text-color: $Leaf-dark-text;
$lk-page-header-icon-color: $Leaf-dark-text;
$lk-page-header-font-hover-color: $Leaf-gray-blue;
$lk-page-header-icon-hover-color: $Leaf-gray-blue;

Expand All @@ -67,19 +70,19 @@ $lk-text-link-color-hover: $Leaf-gray-darkest;

//== Navigation
//
$lk-page-nav-bg-color: $Leaf-accent;
$lk-page-nav-text-color: $Leaf-page-bkgd;
$lk-page-nav-bg-color: $Leaf-secondary-header;
$lk-page-nav-text-color: $Leaf-dark-text;
$lk-page-nav-active-bg-color: $Leaf-page-bkgd;
$lk-page-nav-active-text-color: $Leaf-accent;
$lk-page-nav-active-text-color: $Leaf-dark-text;
$lk-page-nav-dropdown-item-bg-color: $Leaf-page-bkgd;
$lk-page-nav-dropdown-item-text-color: $Leaf-accent;
$lk-page-nav-dropdown-item-text-color: $Leaf-dark-text;
$lk-page-nav-dropdown-highlight-item-bg-color: $Leaf-accent;
$lk-page-nav-dropdown-highlight-item-text-color: $Leaf-page-bkgd;
$lk-page-nav-dropdown-highlight-item-text-color: $Leaf-dark-text;
$lk-page-nav-dropdown-icon-color: $Leaf-accent;
$lk-page-nav-secondary-tab-bg-color: color.adjust($Leaf-gray-blue, $hue: -10deg, $lightness: 5%);
$lk-page-nav-secondary-tab-text-color: $Leaf-accent;
$lk-page-nav-secondary-tab-bg-color: $Leaf-inactive-tab;
$lk-page-nav-secondary-tab-text-color: $Leaf-dark-text;
$lk-page-nav-primary-tab-bg-color: $Leaf-page-bkgd;
$lk-page-nav-primary-tab-text-color: $Leaf-accent;
$lk-page-nav-primary-tab-text-color: $Leaf-dark-text;
$lk-nav-dropdown-color: $Leaf-header;
//== Panels
//
Expand All @@ -95,7 +98,7 @@ $lk-webpart-title-hover-color: $Leaf-anchor-color;
//== Tabs (Bootstrap tabs (Export data set dropdown))
//
$lk-nav-tab-primary-bg-color: $Leaf-white;
$lk-nav-tab-secondary-text-color: $Leaf-anchor-color;
$lk-nav-tab-secondary-text-color: $Leaf-dark-text;

//== Tool Icons
//
Expand Down
5 changes: 3 additions & 2 deletions packages/themes/themes/mono/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

//== Colors
//
$Mono-header: #7f7f7f;
$Mono-header: #757575;
$Mono-accent: #4c4c4c;
$Mono-page-bkgd: #f7f7f7;
$Mono-gray-blue: #dadfe1;
Expand All @@ -14,6 +14,7 @@ $Mono-anchor-color: #0479a8;
$Mono-gray-footer-text: #adadad;
$Mono-gray-footer-text-hover: #f9f9f9;
$Mono-white: #FFFFFF;
$Mono-inactive-tab: #C2C2C2;

$lk-theme-dark-accent: $Mono-accent;
$lk-theme-light-accent: $Mono-header;
Expand Down Expand Up @@ -74,7 +75,7 @@ $lk-page-nav-dropdown-item-text-color: $Mono-accent;
$lk-page-nav-dropdown-highlight-item-bg-color: $Mono-accent;
$lk-page-nav-dropdown-highlight-item-text-color: $Mono-page-bkgd;
$lk-page-nav-dropdown-icon-color: $Mono-accent;
$lk-page-nav-secondary-tab-bg-color: $Mono-gray-blue;
$lk-page-nav-secondary-tab-bg-color: $Mono-inactive-tab;
$lk-page-nav-secondary-tab-text-color: $Mono-accent;
$lk-page-nav-primary-tab-bg-color: $Mono-page-bkgd;
$lk-page-nav-primary-tab-text-color: $Mono-accent;
Expand Down
14 changes: 8 additions & 6 deletions packages/themes/themes/ocean/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

//== Colors
//
$Ocean-header: #208e8b;
$Ocean-accent: #307272;
$Ocean-header: #288282;
$Ocean-accent: #2F6B6B;
$Ocean-page-bkgd: #f7f7f7;
$Ocean-gray-blue: #dadfe1;
$Ocean-gray-darker: #646569;
Expand All @@ -16,6 +16,8 @@ $Ocean-anchor-color: #0479a8;
$Ocean-gray-footer-text: #adadad;
$Ocean-gray-footer-text-hover: #f9f9f9;
$Ocean-white: #FFFFFF;
$Ocean-tab-text: #0D3333;
$Ocean-inactive-tab: #88C2C2;

$lk-theme-dark-accent: $Ocean-accent;
$lk-theme-light-accent: $Ocean-header;
Expand Down Expand Up @@ -76,10 +78,10 @@ $lk-page-nav-dropdown-item-text-color: $Ocean-accent;
$lk-page-nav-dropdown-highlight-item-bg-color: $Ocean-accent;
$lk-page-nav-dropdown-highlight-item-text-color: $Ocean-page-bkgd;
$lk-page-nav-dropdown-icon-color: $Ocean-accent;
$lk-page-nav-secondary-tab-bg-color: color.adjust($Ocean-gray-blue, $hue: -10deg, $lightness: 5%);
$lk-page-nav-secondary-tab-text-color: $Ocean-accent;
$lk-page-nav-secondary-tab-bg-color: $Ocean-inactive-tab;
$lk-page-nav-secondary-tab-text-color: $Ocean-tab-text;
$lk-page-nav-primary-tab-bg-color: $Ocean-page-bkgd;
$lk-page-nav-primary-tab-text-color: $Ocean-accent;
$lk-page-nav-primary-tab-text-color: $Ocean-tab-text;
$lk-nav-dropdown-color: $Ocean-header;
//== Panels
//
Expand All @@ -95,7 +97,7 @@ $lk-webpart-title-hover-color: $Ocean-anchor-color;
//== Tabs (Bootstrap tabs (Export data set dropdown))
//
$lk-nav-tab-primary-bg-color: $Ocean-white;
$lk-nav-tab-secondary-text-color: $Ocean-anchor-color;
$lk-nav-tab-secondary-text-color: $Ocean-tab-text;

//== Tool Icons
//
Expand Down
19 changes: 19 additions & 0 deletions packages/themes/themes/overcast/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,25 @@ $lk-page-header-font-hover-color: $white;
//
$lk-page-nav-bg-color: $lk-secondary-brand-color;
$lk-nav-dropdown-color: $lk-brand-color;

//== Navigation Tabs
//
$lk-page-nav-secondary-tab-bg-color: #73B6E0;
$lk-page-nav-secondary-tab-text-color: #0B4161;
$lk-page-nav-primary-tab-text-color: #0B4161;

//== Tabs (Bootstrap tabs)
//
$lk-nav-tab-primary-text-color: #0B4161;
$lk-nav-tab-secondary-text-color: #0B4161;
$lk-nav-tab-secondary-hover-text-color: #0B4161;

//== TabStrips
//
$lk-active-tab-color: #0B4161;
$lk-inactive-tab-color: #0B4161;
$lk-inactive-tab-bg-color: #73B6E0;

//== Pill
//
$lk-nav-pills-active-link-hover-bg: $lk-theme-dark-accent;
14 changes: 12 additions & 2 deletions packages/themes/themes/sky/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//== Colors
//
$white: #FFFFFF;
$lk-brand-color: #2980b9;
$lk-secondary-brand-color: #236fa0;
$lk-brand-color: #2679AD;
$lk-secondary-brand-color: #116596;
$lk-theme-dark-accent: $lk-brand-color;
$lk-theme-light-accent: $lk-secondary-brand-color;

Expand All @@ -17,6 +17,16 @@ $lk-page-header-font-hover-color: $white;
//
$lk-page-nav-bg-color: $lk-secondary-brand-color;
$lk-nav-dropdown-color: $lk-brand-color;

//== Navigation Tabs
//
$lk-page-nav-secondary-tab-bg-color: #73B6E0;
$lk-page-nav-secondary-tab-text-color: #0B4161;
$lk-page-nav-primary-tab-text-color: #0B4161;

//== Tabs (Bootstrap tabs)
//
$lk-nav-tab-secondary-text-color: #0B4161;
//== Pill
//
$lk-nav-pills-active-link-hover-bg: $lk-theme-dark-accent;
Loading