Browse Source

Cards can now have multiple content blocks, images not on top

pull/2228/merge
jlukic 9 years ago
parent
commit
8147a77e28
4 changed files with 27 additions and 11 deletions
  1. 14
      src/definitions/collections/table.less
  2. 11
      src/definitions/views/card.less
  3. 7
      src/themes/default/collections/table.variables
  4. 6
      src/themes/default/views/card.variables

14
src/definitions/collections/table.less

@ -469,10 +469,14 @@
Hoverable Hoverable
---------------*/ ---------------*/
.ui.selectable.table tr:hover {
.ui.selectable.table tbody tr:hover {
background: @selectableBackground !important; background: @selectableBackground !important;
color: @selectableTextColor !important; color: @selectableTextColor !important;
} }
.ui.selectable.inverted.table tbody tr:hover {
background: @selectableInvertedBackground !important;
color: @selectableInvertedTextColor !important;
}
/* Other States */ /* Other States */
.ui.selectable.table tr.error:hover, .ui.selectable.table tr.error:hover,
@ -551,6 +555,14 @@
background-color: @invertedStripedBackground; background-color: @invertedStripedBackground;
} }
/*--------------
Single Line
---------------*/
.ui.table[class*="single line"],
.ui.table [class*="single line"] {
white-space: nowrap;
}
/*------------------- /*-------------------
Colors Colors

11
src/definitions/views/card.less

@ -125,13 +125,14 @@
display: block; display: block;
width: 100%; width: 100%;
height: auto; height: auto;
border-radius: @imageBorderRadius;
border-radius: inherit;
border: @imageBorder; 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;
} }
/*-------------- /*--------------

7
src/themes/default/collections/table.variables

@ -43,7 +43,7 @@
@headerAlign: inherit; @headerAlign: inherit;
@headerVerticalAlign: inherit; @headerVerticalAlign: inherit;
@headerColor: @textColor; @headerColor: @textColor;
@headerVerticalPadding: @cellVerticalPadding;
@headerVerticalPadding: @relativeMedium;
@headerHorizontalPadding: @cellHorizontalPadding; @headerHorizontalPadding: @cellHorizontalPadding;
@headerFontStyle: none; @headerFontStyle: none;
@headerFontWeight: bold; @headerFontWeight: bold;
@ -150,8 +150,11 @@
@stripedBackground: rgba(0, 0, 50, 0.03); @stripedBackground: rgba(0, 0, 50, 0.03);
@invertedStripedBackground: rgba(255, 255, 255, 0.06); @invertedStripedBackground: rgba(255, 255, 255, 0.06);
@selectableBackground: @subtleTransparentBlack;
/* Selectable */
@selectableBackground: @transparentBlack;
@selectableTextColor: @selectedTextColor; @selectableTextColor: @selectedTextColor;
@selectableInvertedBackground: @transparentWhite;
@selectableInvertedTextColor: @invertedSelectedTextColor;
/* Sortable */ /* Sortable */
@sortableBackground: ''; @sortableBackground: '';

6
src/themes/default/views/card.variables

@ -49,11 +49,11 @@
Content Content
--------------------*/ --------------------*/
/* Image */ /* Image */
@imageBackground: @transparentBlack; @imageBackground: @transparentBlack;
@imagePadding: 0em; @imagePadding: 0em;
@imageBorder: none; @imageBorder: none;
@imageBorderRadius: @borderRadius @borderRadius 0em 0em;
@imageBoxShadow: none; @imageBoxShadow: none;
@imageBorder: none; @imageBorder: none;
@ -102,10 +102,10 @@
/* Description */ /* Description */
@descriptionDistance: 0.5em; @descriptionDistance: 0.5em;
@descriptionColor: rgba(0, 0, 0, 0.5);
@descriptionColor: rgba(0, 0, 0, 0.68);
/* Content Image */ /* Content Image */
@contentImageWidth: auto;
@contentImageWidth: '';
@contentImageVerticalAlign: middle; @contentImageVerticalAlign: middle;
/* Avatar Image */ /* Avatar Image */

Loading…
Cancel
Save