From 9db0aadc0cd9b1a29e9e5371c975123b4ddb8676 Mon Sep 17 00:00:00 2001 From: Rylan Cottrell Date: Thu, 14 Jan 2016 15:34:35 -0500 Subject: [PATCH] Updated selection style. Update to use update typography. --- bower.json | 2 +- package.json | 2 +- table.css.scss | 4 ++++ table.scss | 17 +++++++++++------ test/table.html | 4 ++-- test/test.scss | 2 ++ 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/bower.json b/bower.json index 1570fcd..bc31259 100644 --- a/bower.json +++ b/bower.json @@ -15,6 +15,6 @@ ], "dependencies": { "vui-colors": "^0.2.0", - "vui-typography": "^1.0.11" + "vui-typography": "^2.0.0" } } diff --git a/package.json b/package.json index b8748b4..9a1631b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vui-table", - "version": "0.0.1", + "version": "0.0.2", "description": "Mixins and CSS for applying table styles", "scripts": { "autoprefix": "postcss -c postcss.config.json", diff --git a/table.css.scss b/table.css.scss index 6dc7354..6adfe1b 100644 --- a/table.css.scss +++ b/table.css.scss @@ -2,4 +2,8 @@ .vui-table { @include vui-table; +} + +.vui-table-row-selected { + @include vui-table-row-selected; } \ No newline at end of file diff --git a/table.scss b/table.scss index 727d3bc..aebabb9 100644 --- a/table.scss +++ b/table.scss @@ -1,5 +1,5 @@ @import 'bower_components/vui-colors/colors.scss'; -@import 'bower_components/vui-typography/typography.scss'; +@import 'bower_components/vui-typography/small-text.scss'; @import 'bower_components/vui-typography/px-to-base-rem.scss'; @mixin vui-table() { @@ -15,7 +15,7 @@ display: table-header-group; & th { - @include _vui-table-header-cell(); + @include vui-table-header-cell(); } } @@ -40,7 +40,7 @@ & td, tbody th, tfoot th { - @include _vui-table-cell(); + @include vui-table-cell(); } & tr>:last-child { @@ -123,13 +123,13 @@ } } -@mixin _vui-table-header-cell() { - @include _vui-table-cell(); +@mixin vui-table-header-cell() { + @include vui-table-cell(); @include vui-typography-small-text(); background-color: $vui-color-regolith; } -@mixin _vui-table-cell() { +@mixin vui-table-cell() { border-bottom: 1px solid $vui-color-titanius; border-right: 1px solid $vui-color-titanius; display: table-cell; @@ -141,4 +141,9 @@ [dir='rtl'] & { text-align: right; } +} + +@mixin vui-table-row-selected() { + outline: 1px solid $vui-color-celestine; + background-color: $vui-color-celestine-light-1; } \ No newline at end of file diff --git a/test/table.html b/test/table.html index 705416b..de8904b 100644 --- a/test/table.html +++ b/test/table.html @@ -45,7 +45,7 @@

Class name

of 10 -% - + Lourdes Beadle of 10 @@ -209,7 +209,7 @@

Mixins

Row 2 Column 19 Row 2 Column 20 - + Row 3 Column 1 Row 3 Column 2 Row 3 Column 3 diff --git a/test/test.scss b/test/test.scss index e7b3f39..1c382b3 100644 --- a/test/test.scss +++ b/test/test.scss @@ -1,4 +1,6 @@ @import '../table.css.scss'; +@import 'bower_components/vui-typography/typography.scss'; + body { @include vui-typography;