From 11b1bd2a7b3496d7c3f48ce2780aa3d59e90dc8c Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 29 Oct 2014 16:54:08 -0400 Subject: [PATCH] Adds new basic table theme --- src/definitions/collections/table.less | 1 + src/definitions/globals/site.less | 8 ++- src/themes/basic/collections/table.overrides | 4 ++ src/themes/basic/collections/table.variables | 10 +++ .../default/collections/table.variables | 6 +- src/themes/default/globals/site.variables | 69 +++++++++++-------- 6 files changed, 65 insertions(+), 33 deletions(-) create mode 100644 src/themes/basic/collections/table.overrides create mode 100644 src/themes/basic/collections/table.variables diff --git a/src/definitions/collections/table.less b/src/definitions/collections/table.less index 72c3979cf..d0fb7d87a 100755 --- a/src/definitions/collections/table.less +++ b/src/definitions/collections/table.less @@ -118,6 +118,7 @@ /* Table Cells */ .ui.table td { padding: @cellVerticalPadding @cellHorizontalPadding; + text-align: @cellTextAlign; vertical-align: @cellVerticalAlign; } diff --git a/src/definitions/globals/site.less b/src/definitions/globals/site.less index 27ec5053b..5daf3e7af 100755 --- a/src/definitions/globals/site.less +++ b/src/definitions/globals/site.less @@ -33,20 +33,22 @@ html, body { height: 100%; - font-size: @fontSize; - font-smoothing: @fontSmoothing; } +html { + font-size: @emSize; +} body { margin: 0px; padding: 0px; min-width: @pageMinWidth; background: @pageBackground; - font-family: @pageFont; + font-size: @fontSize; line-height: @lineHeight; color: @textColor; + font-smoothing: @fontSmoothing; overflow-x: @pageOverflowX; } diff --git a/src/themes/basic/collections/table.overrides b/src/themes/basic/collections/table.overrides new file mode 100644 index 000000000..627300769 --- /dev/null +++ b/src/themes/basic/collections/table.overrides @@ -0,0 +1,4 @@ +/******************************* + Overrides +*******************************/ + diff --git a/src/themes/basic/collections/table.variables b/src/themes/basic/collections/table.variables new file mode 100644 index 000000000..8067dc00c --- /dev/null +++ b/src/themes/basic/collections/table.variables @@ -0,0 +1,10 @@ +/*------------------- + Table Variables +--------------------*/ + +@headerBackground: @white; + +@cellVerticalPadding: 1em; +@cellHorizontalPadding: 1em; + +@stateMarkerWidth: 1px; \ No newline at end of file diff --git a/src/themes/default/collections/table.variables b/src/themes/default/collections/table.variables index dc3cc6cb5..df7fc56ad 100644 --- a/src/themes/default/collections/table.variables +++ b/src/themes/default/collections/table.variables @@ -17,6 +17,7 @@ @borderColor: #D0D0D0; @border: @borderWidth solid @borderColor; @boxShadow: none; +@textAlign: left; /*------------------- Types @@ -49,13 +50,14 @@ @cellVerticalPadding: 0.7em; @cellHorizontalPadding: 0.8em; @cellVerticalAlign: middle; +@cellTextAlign: @textAlign; @cellBorder: 1px solid @solidBorderColor; /* Table Header */ @headerBorder: 1px solid @solidBorderColor; @headerDivider: none; @headerBackground: @darkWhite; -@headerAlign: left; +@headerAlign: @textAlign; @headerVerticalAlign: middle; @headerColor: @textColor; @headerVerticalPadding: @cellVerticalPadding; @@ -70,7 +72,7 @@ @footerBorder: 1px solid @solidBorderColor; @footerDivider: none; @footerBackground: @white; -@footerAlign: left; +@footerAlign: @textAlign; @footerVerticalAlign: middle; @footerColor: @textColor; @footerVerticalPadding: @cellVerticalPadding; diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index d8353394e..4a06bbf4e 100644 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -14,6 +14,13 @@ @googleFontName : 'Lato'; @googleFontSizes : '400,700,400italic,700italic'; +/*------------------- + Base Sizes +--------------------*/ + +@emSize: : 14px; +@fontSize : 14px; + /*------------------- Site Colors --------------------*/ @@ -32,24 +39,24 @@ @grey : #CCCCCC; @white : #FFFFFF; -/*--- Light Colors ---*/ - -@lightBlack: : #CCCCCC; -@lightBlue : #54C8FF; -@lightGreen : #2ECC40; -@lightOrange : #FF851B; -@lightPink : #FF8EDF; -@lightPurple : #CDC6FF; -@lightRed : #FF695E; -@lightTeal : #6DFFFF; -@lightYellow : #FFE21F; - /*--- Brand Colors ---*/ @primaryColor : @blue; @secondaryColor : @black; -@lightPrimaryColor : @lightBlue; -@lightSecondaryColor : @lightBlack; + +/*------------------- + Sizes +--------------------*/ + +/* Exact pixel values @ 14px em */ +@mini : 0.7142rem; +@tiny : 0.8571rem; +@small : 0.9285rem; +@medium : 1rem; +@large : 1.1428rem; +@big : 1.2857rem; +@huge : 1.4285rem; +@massive : 1.7142rem; /*------------------- Page @@ -84,6 +91,25 @@ @transparentWhite : rgba(255, 255, 255, 0.05); @strongTransparentWhite : rgba(255, 255, 255, 0.07); +/*------------------- + Extra Colors +--------------------*/ + +/*--- Light Colors ---*/ + +@lightBlack: : #CCCCCC; +@lightBlue : #54C8FF; +@lightGreen : #2ECC40; +@lightOrange : #FF851B; +@lightPink : #FF8EDF; +@lightPurple : #CDC6FF; +@lightRed : #FF695E; +@lightTeal : #6DFFFF; +@lightYellow : #FFE21F; + +@lightPrimaryColor : @lightBlue; +@lightSecondaryColor : @lightBlack; + /*------------------- Loader --------------------*/ @@ -99,7 +125,7 @@ Accents --------------------*/ -/* 4px @ 14px */ +/* 4px @ default em */ @relativeBorderRadius: 0.2857em; @absoluteBorderRadius: 0.2857rem; @defaultBorderRadius: @absoluteBorderRadius; @@ -276,19 +302,6 @@ @solidWhiteBorderColor : #555555; @selectedSolidWhiteBorderColor : #999999; -/*------------------- - Sizes ---------------------*/ - -@mini : 0.7142rem; -@tiny : 0.8571rem; -@small : 0.9285rem; -@medium : 1rem; -@large : 1.1428rem; -@big : 1.2857rem; -@huge : 1.4285rem; -@massive : 1.7142rem; - /*------------------- Transitions