Fix td border variable (#504)

* Fix td border variable * Fix default color
pressbooks · Feb 20, 2019 · af3c81f · af3c81f
1 parent d0cbe32
commit af3c81f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/packages/buckram/CHANGELOG.md b/packages/buckram/CHANGELOG.md
@@ -2,10 +2,16 @@
 
 ## 1.4.0
 
+### Minor Changes
+
 - Add `$section-author-text-indent` variable: [#501](https://github.com/pressbooks/pressbooks-book/pull/501)
 - Add color variable for `<dt>` elements: [#502](https://github.com/pressbooks/pressbooks-book/pull/502)
 - Add `$title-publisher-float` and `$title-publisher-city-float` variables: [#503](https://github.com/pressbooks/pressbooks-book/pull/503)
 
+### Patches
+
+- Fix `td` border variable functionality: [#504](https://github.com/pressbooks/pressbooks-book/pull/504)
+
 ## 1.3.3
 
 ### Patches

diff --git a/packages/buckram/assets/styles/components/elements/_tables.scss b/packages/buckram/assets/styles/components/elements/_tables.scss
@@ -122,14 +122,13 @@
   }
 
   td {
+    border: if-map-get($table-td-border-width, $type) if-map-get($table-td-border-style, $type) if-map-get($line-color-1, $type);
     padding: $table-td-padding-top $table-td-padding-right $table-td-padding-bottom $table-td-padding-left;
     @if $type == 'prince' {
       line-height: $table-td-line-height;
     }
     text-align: $table-td-align;
     vertical-align: $table-td-vertical-align;
-    border: if-map-get($table-td-border-width, $type) if-map-get($table-td-border-style, $type);
-    border-color: if-map-get($line-color-1, $type);
   }
 
   tr {
@@ -251,7 +250,7 @@
       line-height: $table-td-line-height;
       text-align: $table-td-align;
       vertical-align: middle;
-      border-color: if-map-get($line-color-1, $type);
+      border: if-map-get($table-td-border-width, $type) if-map-get($table-td-border-style, $type) if-map-get($line-color-1, $type);
     }
 
     tr {

diff --git a/packages/buckram/assets/styles/variables/_colors.scss b/packages/buckram/assets/styles/variables/_colors.scss
@@ -76,7 +76,7 @@ $table-para-color: $color-1 !default;
 $shade-color-1: $color-4 !default;
 /// Line color for `<table>` elements.
 /// @type String
-$line-color-1: $color-3 !default; //FIX
+$line-color-1: #000 !default;
 
 //INDEX PARA COLOR
 

diff --git a/packages/buckram/assets/styles/variables/_elements.scss b/packages/buckram/assets/styles/variables/_elements.scss
@@ -1042,12 +1042,12 @@ $table-td-vertical-align: middle !default;
 /// Border width for `<td>` elements.
 /// @since 1.3.0
 /// @type String | Map
-$table-td-border-width: (epub: 0, prince: 0, web: 0);
+$table-td-border-width: (epub: 0, prince: 0, web: 0) !default;
 
 /// Border width for `<td>` elements.
 /// @since 1.3.0
 /// @type String | Map
-$table-td-border-style: (epub: none, prince: none, web: none);
+$table-td-border-style: (epub: none, prince: none, web: none) !default;
 
 /// Border top width on `<tr>` elements.
 /// @since 1.2.0