Skip to content

Commit

Permalink
Merge pull request #22 from Brightspace/embed-sass
Browse files Browse the repository at this point in the history
embedding sass from old bower dependencies
  • Loading branch information
dlockhart authored Jun 15, 2016
2 parents f42e6b9 + 5ad88ef commit 9453ed0
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 17 deletions.
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"package.json"
],
"dependencies": {
"vui-colors": "^0.2.0",
"vui-typography": "^2.0.0"
"d2l-colors": "~2.0.0"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vui-table",
"version": "0.0.11",
"version": "0.1.0",
"description": "Mixins and CSS for applying table styles",
"scripts": {
"autoprefix": "postcss -c postcss.config.json && postcss -c ./test/postcss.config.json",
Expand Down
Binary file modified screenshots/rows.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions screenshots/screenshots.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
@import '../bower_components/vui-typography/typography.scss';
@import url(https://s.brightspace.com/lib/fonts/0.3.0/fonts.css);

html {
font-size: 20px;
}
body {
font-family: 'Lato', sans-serif;
line-height: 1.5;
margin: 1rem;
}

:root {
font-size: 20px;
}

.screenshots {
@include vui-typography;
display: inline-block;
}
Binary file modified screenshots/small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshots/sort.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions table-icons.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
$vui-table-sort-asc: url("data:image/svg+xml,%3Csvg%20width%3D%2218%22%20height%3D%2218%22%20viewBox%3D%220%200%2018%2018%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5.002%2012h8c.89%200%201.337-1.077.707-1.707l-4-4a1%201%200%200%200-1.415%200l-4%204c-.63.63-.184%201.707.707%201.707z%22%20fill%3D%22%2372777a%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E");
$vui-table-sort-desc: url("data:image/svg+xml,%3Csvg%20width%3D%2218%22%20height%3D%2218%22%20viewBox%3D%220%200%2018%2018%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5.002%206h8c.89%200%201.337%201.077.707%201.707l-4%204a1%201%200%200%201-1.415%200l-4-4C3.665%207.077%204.11%206%205.002%206z%22%20fill%3D%22%2372777A%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E");
$vui-table-sort-asc: url("data:image/svg+xml,%3Csvg%20width%3D%2218%22%20height%3D%2218%22%20viewBox%3D%220%200%2018%2018%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5.002%2012h8c.89%200%201.337-1.077.707-1.707l-4-4a1%201%200%200%200-1.414%200l-4%204c-.63.63-.184%201.707.707%201.707z%22%20fill%3D%22%2372777a%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E");
$vui-table-sort-desc: url("data:image/svg+xml,%3Csvg%20width%3D%2218%22%20height%3D%2218%22%20viewBox%3D%220%200%2018%2018%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5.002%206h8c.89%200%201.337%201.077.707%201.707l-4%204a1%201%200%200%201-1.414%200l-4-4C3.665%207.077%204.11%206%205.002%206z%22%20fill%3D%22%2372777A%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E");
25 changes: 15 additions & 10 deletions table.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
@import 'bower_components/vui-colors/colors.scss';
@import 'bower_components/vui-typography/small-text.scss';
@import 'bower_components/d2l-colors/d2l-colors.scss';
@import 'table-icons.scss';

$vui-table-border-color: $vui-color-titanius;
$vui-table-border-color: $d2l-color-titanius;
$vui-table-border: 1px solid $vui-table-border-color;
$vui-table-border-radius: 0.3rem;

$vui-table-header-background-color: $vui-color-regolith;
$vui-table-header-background-color: $d2l-color-regolith;
$vui-table-body-background-color: #ffffff;

$vui-table-row-background-color-active: $vui-color-celestine-light-1;
$vui-table-row-border-color-active-selected: $vui-color-celestine-light-2;
$vui-table-row-background-color-active: $d2l-color-celestine-light-1;
$vui-table-row-border-color-active-selected: $d2l-color-celestine-light-2;
$vui-table-row-background-color-active-selected: #EBF5FC;
$vui-table-row-border-color-selected: $vui-color-celestine-light-2;
$vui-table-row-background-color-selected: $vui-color-celestine-light-1;
$vui-table-row-border-color-selected: $d2l-color-celestine-light-2;
$vui-table-row-background-color-selected: $d2l-color-celestine-light-1;

@mixin vui-table() {
background-color: transparent;
Expand Down Expand Up @@ -138,7 +137,13 @@ $vui-table-row-background-color-selected: $vui-color-celestine-light-1;

@mixin vui-table-header-cell() {
@include vui-table-cell();
@include vui-typography-small-text();
color: $d2l-color-ferrite;
font-family: inherit;
font-size: 0.7rem;
font-weight: 400;
line-height: 1rem;
letter-spacing: 0.02rem;
margin: 1rem 0 1rem 0;
background-color: $vui-table-header-background-color;
}

Expand Down Expand Up @@ -250,4 +255,4 @@ $vui-table-row-background-color-selected: $vui-color-celestine-light-1;
& + tr > th {
border-top-color: $border-color !important;
}
}
}

0 comments on commit 9453ed0

Please sign in to comment.