hardcode dart-sass version

Until angulardart/angular#454 lands
skawa-universe · Jun 21, 2017 · fc01cfd · fc01cfd
1 parent 1dbc658
commit fc01cfd
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 17 deletions.
diff --git a/lib/src/components/data_table/data_table.css b/lib/src/components/data_table/data_table.css
@@ -50,16 +50,24 @@
 }
 :host table.selectable th:nth-child(2), :host table.selectable td:nth-child(2) {
   padding-left: 0;
-  width: 40px;
 }
-:host table.selectable th:first-of-type {
+:host table.selectable th:first-of-type, :host table.selectable td:first-of-type {
+  text-align: center;
   color: black;
+  width: 72px;
+}
+:host table.selectable th:first-of-type material_checkbox, :host table.selectable td:first-of-type material_checkbox {
+  margin: 0;
+  width: 24px;
+  height: 24px;
+  vertical-align: middle;
 }
 :host table.selectable tfoot tr td:first-of-type {
-  padding-left: 64px !important;
+  text-align: right;
+  padding-left: 72px !important;
 }
 :host table.non-selectable th:first-of-type, :host table.non-selectable td:first-of-type {
-  padding-left: 24px;
+  padding-left: 24px !important;
 }
 :host table tbody tr {
   transition-duration: 0.28s;
@@ -102,7 +110,7 @@
   font-size: 12px;
 }
 :host .text-column, :host .text-column--header, :host .text-column--footer {
-  text-align: left;
+  text-align: left !important;
 }
 :host .numeric-column, :host .numeric-column--header, :host .numeric-column--footer {
   text-align: right;

diff --git a/lib/src/components/data_table/data_table.html b/lib/src/components/data_table/data_table.html
@@ -3,7 +3,7 @@
         <tr>
             <th *ngIf="selectable">
                 <material-checkbox #markAllCheckbox
-                                   (click)="markAllRowsChecked(!markAllCheckbox.checked); $event.stopPropagation();"
+                                   (click)="markAllRowsChecked(markAllCheckbox.checked); $event.stopPropagation();"
                                    [checked]="isEveryRowChecked"></material-checkbox>
             </th>
             <th *ngFor="let c of columns; let i = index;" [ngClass]="c.getClasses('--header')">{{c.header}}</th>

diff --git a/lib/src/components/data_table/data_table.scss b/lib/src/components/data_table/data_table.scss
@@ -10,19 +10,28 @@
       th, td {
         &:nth-child(2) {
           padding-left: 0;
-          width: 40px;
+          //width: 40px;
         }
       }
-      th {
+      th, td {
         &:first-of-type {
+          text-align: center;
           color: black;
+          width: 72px;
+          material_checkbox {
+            margin: 0;
+            width: 24px;
+            height: 24px;
+            vertical-align: middle;
+          }
         }
       }
       tfoot {
         tr {
           td {
             &:first-of-type {
-              padding-left: 64px !important;
+              text-align: right;
+              padding-left: 72px !important;
             }
           }
         }
@@ -31,14 +40,14 @@
     &.non-selectable {
       th, td {
         &:first-of-type {
-          padding-left: 24px;
+          padding-left: 24px !important;
         }
       }
     }
     tbody {
       tr {
         transition-duration: .28s;
-        transition-timing-function: cubic-bezier(.4,0,.2,1);
+        transition-timing-function: cubic-bezier(.4, 0, .2, 1);
         transition-property: background-color;
         &:hover {
           background-color: #EEEEEE !important;
@@ -49,7 +58,7 @@
       }
     }
     tr {
-      &:first-of-type, &:last-of-type{
+      &:first-of-type, &:last-of-type {
         height: 56px;
       }
       border-bottom: 1px solid #d0d0d0;
@@ -77,7 +86,7 @@
   }
 
   .text-column, .text-column--header, .text-column--footer {
-    text-align: left;
+    text-align: left !important;
   }
   .numeric-column, .numeric-column--header, .numeric-column--footer {
     text-align: right;

diff --git a/lib/src/components/infobar/infobar.dart b/lib/src/components/infobar/infobar.dart
@@ -6,7 +6,10 @@ import 'package:angular_components/src/utils/async/async.dart' show LazyEventEmi
 
 /// An Inforbar is compositing an (icon as button)[https://material.io/components/web/catalog/buttons/icon-toggle-buttons/] and
 /// an arbitrary component. Infobar is designed to display small notifications, important messages to the user, *in-context*.
-/// This differs from "snackbars" and "toasts" that serve as feedback of actions.
+/// 
+/// This differs from "snackbars" and "toasts" that serve as feedback of actions. 
+///
+/// *Note:* Infobar component uses Material Icon font, make sure it is available
 ///
 /// __Example usage:__
 ///     <skawa-infobar [icon]="myIcon" [url]="urlToNavigate"></skawa-infobar>
@@ -47,4 +50,4 @@ class SkawaInfobarComponent {
     if (url != null)
       window.location.href = url;
   }
-}
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -8,8 +8,11 @@ dependencies:
 dev_dependencies:
   sass_builder: ^0.1.0
 
-#dependency_overrides:
-#  build: 0.9.0
+dependency_overrides:
+  sass:
+    git:
+      url: https://github.com/sass/dart-sass
+      ref: e958477
 
 transformers:
 - angular2