From 1b4ca20721d57b1fd87b767dec8b9a07d6b07297 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 2 Oct 2014 20:18:25 -0400 Subject: [PATCH] Fix several bugs in inverted tables with celled, disabled content --- src/definitions/collections/table.less | 41 +++++++++---------- .../default/collections/table.variables | 38 ++++++++++------- .../packages/default/globals/site.variables | 2 + 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/src/definitions/collections/table.less b/src/definitions/collections/table.less index ca44f824b..26be7ee4f 100755 --- a/src/definitions/collections/table.less +++ b/src/definitions/collections/table.less @@ -354,7 +354,7 @@ .ui.table tr.disabled:hover td, .ui.table tr:hover td.disabled { pointer-events: none; - color: rgba(150, 150, 150, 0.3); + color: @disabledTextColor; } /******************************* @@ -444,39 +444,30 @@ .ui.black.table { border-top: @coloredBorderSize solid @black; - border-radius: @coloredBorderRadius; } .ui.blue.table { border-top: @coloredBorderSize solid @blue; - border-radius: @coloredBorderRadius; } .ui.green.table { border-top: @coloredBorderSize solid @green; - border-radius: @coloredBorderRadius; } .ui.orange.table { border-top: @coloredBorderSize solid @orange; - border-radius: @coloredBorderRadius; } .ui.pink.table { border-top: @coloredBorderSize solid @pink; - border-radius: @coloredBorderRadius; } .ui.purple.table { border-top: @coloredBorderSize solid @purple; - border-radius: @coloredBorderRadius; } .ui.red.table { border-top: @coloredBorderSize solid @red; - border-radius: @coloredBorderRadius; } .ui.teal.table { border-top: @coloredBorderSize solid @teal; - border-radius: @coloredBorderRadius; } .ui.yellow.table { border-top: @coloredBorderSize solid @yellow; - border-radius: @coloredBorderRadius; } /*------------------- @@ -486,47 +477,38 @@ .ui.inverted.table, .ui.inverted.black.table { background-color: @black !important; - border-radius: @borderRadius; color: @white !important; } .ui.inverted.blue.table { background-color: @blue !important; - border-radius: @borderRadius; color: @white !important; } .ui.inverted.green.table { background-color: @green !important; - border-radius: @borderRadius; color: @white !important; } .ui.inverted.orange.table { background-color: @orange !important; - border-radius: @borderRadius; color: @white !important; } .ui.inverted.pink.table { background-color: @pink !important; - border-radius: @borderRadius; color: @white !important; } .ui.inverted.purple.table { background-color: @purple !important; - border-radius: @borderRadius; color: @white !important; } .ui.inverted.red.table { background-color: @red !important; - border-radius: @borderRadius; color: @white !important; } .ui.inverted.teal.table { background-color: @teal !important; - border-radius: @borderRadius; color: @white !important; } .ui.inverted.yellow.table { background-color: @yellow !important; - border-radius: @borderRadius; color: @white !important; } @@ -738,13 +720,30 @@ } .ui.inverted.table th { background-color: @invertedHeaderBackground; - border-color: @invertedCellBorderColor; + border-color: @invertedCellBorderColor !important; color: @invertedHeaderColor; } .ui.inverted.table tr td { - border-color: @invertedCellBorderColor; + border-color: @invertedCellBorderColor !important; } +.ui.inverted.table tr.disabled td, +.ui.inverted.table tr td.disabled, +.ui.inverted.table tr.disabled:hover td, +.ui.inverted.table tr:hover td.disabled { + pointer-events: none; + color: @invertedDisabledTextColor; +} + +/* Definition */ +.ui.inverted.definition.table tfoot:not(.full-width) th:first-child, +.ui.inverted.definition.table thead:not(.full-width) th:first-child { + background: @definitionPageBackground; +} +.ui.inverted.definition.table tr td:first-child { + background: @invertedDefinitionColumnBackground; + color: @invertedDefinitionColumnColor; +} /*-------------- Collapsing diff --git a/src/themes/packages/default/collections/table.variables b/src/themes/packages/default/collections/table.variables index c2debd83f..dc3cc6cb5 100755 --- a/src/themes/packages/default/collections/table.variables +++ b/src/themes/packages/default/collections/table.variables @@ -18,6 +18,26 @@ @border: @borderWidth solid @borderColor; @boxShadow: none; +/*------------------- + Types +--------------------*/ + +/* Definition */ +@definitionPageBackground: @white; + +@definitionHeaderBackground: transparent; +@definitionHeaderColor: @unselectedTextColor; +@definitionHeaderFontWeight: normal; + +@definitionFooterBackground: @definitionHeaderBackground; +@definitionFooterColor: @definitionHeaderColor; +@definitionFooterFontWeight: @definitionHeaderFontWeight; + +@definitionColumnBackground: @subtleTransparentBlack; +@definitionColumnColor: @selectedTextColor; +@definitionColumnFontWeight: bold; + + /*-------------- Parts ---------------*/ @@ -170,21 +190,9 @@ @invertedHeaderBackground: rgba(0, 0, 0, 0.15); @invertedHeaderColor: rgba(255, 255, 255, 0.9); -/* Definition */ -@definitionPageBackground: @white; - -@definitionHeaderBackground: transparent; -@definitionHeaderColor: @unselectedTextColor; -@definitionHeaderFontWeight: normal; - -@definitionFooterBackground: @definitionHeaderBackground; -@definitionFooterColor: @definitionHeaderColor; -@definitionFooterFontWeight: @definitionHeaderFontWeight; - - -@definitionColumnBackground: @subtleTransparentBlack; -@definitionColumnColor: @selectedTextColor; -@definitionColumnFontWeight: bold; +@invertedDefinitionColumnBackground: @subtleTransparentWhite; +@invertedDefinitionColumnColor: @invertedSelectedTextColor; +@invertedDefinitionColumnFontWeight: bold; /* Basic */ @basicTableBackground: transparent; diff --git a/src/themes/packages/default/globals/site.variables b/src/themes/packages/default/globals/site.variables index 383b1ec7c..13adb2280 100755 --- a/src/themes/packages/default/globals/site.variables +++ b/src/themes/packages/default/globals/site.variables @@ -350,6 +350,8 @@ --------------------*/ @disabledOpacity: 0.3; +@disabledTextColor: rgba(40, 40, 40, 0.3); +@invertedDisabledTextColor: rgba(225, 225, 225, 0.3); /*------------------- Hover