From 8147a77e28f0daea908e962e0754038446f52a20 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 7 May 2015 19:11:26 -0400 Subject: [PATCH] Cards can now have multiple content blocks, images not on top --- src/definitions/collections/table.less | 14 +++++++++++++- src/definitions/views/card.less | 11 ++++++----- src/themes/default/collections/table.variables | 7 +++++-- src/themes/default/views/card.variables | 6 +++--- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/definitions/collections/table.less b/src/definitions/collections/table.less index ec5cb92b3..4d7a63e92 100755 --- a/src/definitions/collections/table.less +++ b/src/definitions/collections/table.less @@ -469,10 +469,14 @@ Hoverable ---------------*/ -.ui.selectable.table tr:hover { +.ui.selectable.table tbody tr:hover { background: @selectableBackground !important; color: @selectableTextColor !important; } +.ui.selectable.inverted.table tbody tr:hover { + background: @selectableInvertedBackground !important; + color: @selectableInvertedTextColor !important; +} /* Other States */ .ui.selectable.table tr.error:hover, @@ -551,6 +555,14 @@ background-color: @invertedStripedBackground; } +/*-------------- + Single Line +---------------*/ + +.ui.table[class*="single line"], +.ui.table [class*="single line"] { + white-space: nowrap; +} /*------------------- Colors diff --git a/src/definitions/views/card.less b/src/definitions/views/card.less index a93c4fa87..d81b7d5b3 100755 --- a/src/definitions/views/card.less +++ b/src/definitions/views/card.less @@ -125,13 +125,14 @@ display: block; width: 100%; height: auto; - border-radius: @imageBorderRadius; + border-radius: inherit; border: @imageBorder; } - -.ui.cards > .card > .image:only-child > img, -.ui.card > .image:only-child > img { - border-radius: @borderRadius; +.ui.cards > .card > :first-child { + border-radius: @borderRadius @borderRadius 0em 0em; +} +.ui.cards > .card > :last-child { + border-radius: 0em 0em @borderRadius @borderRadius; } /*-------------- diff --git a/src/themes/default/collections/table.variables b/src/themes/default/collections/table.variables index 5c18e1861..53744ccd0 100644 --- a/src/themes/default/collections/table.variables +++ b/src/themes/default/collections/table.variables @@ -43,7 +43,7 @@ @headerAlign: inherit; @headerVerticalAlign: inherit; @headerColor: @textColor; -@headerVerticalPadding: @cellVerticalPadding; +@headerVerticalPadding: @relativeMedium; @headerHorizontalPadding: @cellHorizontalPadding; @headerFontStyle: none; @headerFontWeight: bold; @@ -150,8 +150,11 @@ @stripedBackground: rgba(0, 0, 50, 0.03); @invertedStripedBackground: rgba(255, 255, 255, 0.06); -@selectableBackground: @subtleTransparentBlack; +/* Selectable */ +@selectableBackground: @transparentBlack; @selectableTextColor: @selectedTextColor; +@selectableInvertedBackground: @transparentWhite; +@selectableInvertedTextColor: @invertedSelectedTextColor; /* Sortable */ @sortableBackground: ''; diff --git a/src/themes/default/views/card.variables b/src/themes/default/views/card.variables index 1501e01ac..bbea2c66d 100644 --- a/src/themes/default/views/card.variables +++ b/src/themes/default/views/card.variables @@ -49,11 +49,11 @@ Content --------------------*/ + /* Image */ @imageBackground: @transparentBlack; @imagePadding: 0em; @imageBorder: none; -@imageBorderRadius: @borderRadius @borderRadius 0em 0em; @imageBoxShadow: none; @imageBorder: none; @@ -102,10 +102,10 @@ /* Description */ @descriptionDistance: 0.5em; -@descriptionColor: rgba(0, 0, 0, 0.5); +@descriptionColor: rgba(0, 0, 0, 0.68); /* Content Image */ -@contentImageWidth: auto; +@contentImageWidth: ''; @contentImageVerticalAlign: middle; /* Avatar Image */