update angular materials version. add angular-moment

buildbot · Jun 1, 2015 · 05b8bb9 · 05b8bb9
1 parent ee679e6
commit 05b8bb9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/www/md_base/guanlecoja/config.coffee b/www/md_base/guanlecoja/config.coffee
@@ -4,7 +4,7 @@
 #
 ### ###############################################################################################
 ANGULAR_TAG = "~1.3.15"
-ANGULAR_MATERIAL_TAG = "~0.8.3"
+ANGULAR_MATERIAL_TAG = "~0.9.6"
 
 path = require 'path'
 gulp = require 'gulp'
@@ -33,7 +33,7 @@ config =
         # JavaScript libraries (order matters)
         deps:
             moment:
-                version: "~2.6.0"
+                version: "~2.10.3"
                 files: 'moment.js'
             angular:
                 version: ANGULAR_TAG
@@ -50,6 +50,9 @@ config =
             "angular-ui-router":
                 version: '0.2.13'
                 files: 'release/angular-ui-router.js'
+            "angular-moment":
+                version: '0.10.1'
+                files: 'angular-moment.js'
             lodash:
                 version: "~2.4.1"
                 files: 'dist/lodash.js'

diff --git a/www/md_base/src/app/common/directives/panel/panel.less b/www/md_base/src/app/common/directives/panel/panel.less
@@ -10,7 +10,7 @@ panel {
   .inner-container {
     background: #fff;
     border-radius: 3px;
-    padding: 10px;
+    padding: 5px 10px;
   }
 
   .title-bar {
@@ -36,6 +36,11 @@ panel {
     overflow-y: auto;
   }
 
+  .buttons button {
+    margin: 0;
+    min-width: 40px;
+  }
+
   @media (min-width: 640px) {
     &.collapsed {
       width: 50%;

diff --git a/www/md_base/src/app/common/directives/sidenav/sidenav.less b/www/md_base/src/app/common/directives/sidenav/sidenav.less
@@ -22,7 +22,9 @@ md-sidenav {
   .nav-item {
     height: 60px;
     width: 80px;
+    min-width: 80px;
     margin: 5px 0;
+    padding: 0;
 
     svg {
       fill: #aaa;
@@ -33,6 +35,7 @@ md-sidenav {
       font-size: 12px;
       color: #aaa;
       margin-top: 5px;
+      line-height: 16px;
       text-transform: capitalize;
     }
 

diff --git a/www/md_base/src/styles/styles.less b/www/md_base/src/styles/styles.less
@@ -1,5 +1,9 @@
 @import (inline) "../../libs/angular-material/angular-material.css";
 
+* {
+  box-sizing: border-box;
+}
+
 /* base css for angular, dont display anything until angular is running */
 [ng-cloak] {
   display: none !important;