Merge pull request #3 from houkanshan/dev

Adjustment for Button & alert
NdYAG · Mar 22, 2014 · a714429 · a714429
2 parents e3f4673 + 7577e30
commit a714429
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/assets/js/directives.js b/assets/js/directives.js
@@ -309,6 +309,9 @@ angular.module('ANNO.directives', [])
     scope.$on('alert:dismiss', function(e) {
       elem.removeClass('show')
     })
+
+    scope.$on('alert:error:hide', elem.removeClass.bind(elem, 'show'))
+    $rootScope.$on('$routeChangeStart', scope.$emit.bind(scope, 'alert:error:hide'))
   }
 }])
 .directive('colorThief', ['$http', function($http) {
@@ -365,4 +368,4 @@ angular.module('ANNO.directives', [])
       })
     }
   }
-}])
+}])
diff --git a/assets/stylus/style.styl b/assets/stylus/style.styl
@@ -10,7 +10,7 @@ html, body
   overflow-y auto
 
 .ng-hide
-  display: none !important;
+  display: none !important
 
 body
   padding: 50px
@@ -21,6 +21,9 @@ a
   color #00B7FF
   cursor pointer
 
+button
+  cursor pointer
+
 // [link]
 
 pre
@@ -121,7 +124,7 @@ li.book
       float left
       margin-right 8px
     .result-info
-      // display inline-block      
+      // display inline-block
     h4
       word-break break-word
       margin 0
@@ -223,4 +226,4 @@ ul.notes
 
 // mod_fav
 .footnote
-  margin-top 1em
+  margin-top 1em