From f2459093c7a4db41d9f7b1773dbd80472e0fce0a Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Mon, 10 Feb 2014 16:08:36 -0300 Subject: [PATCH 1/2] ngProgress fixed --- public/src/css/common.css | 7 +++++++ public/src/js/app.js | 0 public/src/js/config.js | 2 -- public/src/js/directives.js | 0 public/src/js/filters.js | 0 public/src/js/init.js | 0 6 files changed, 7 insertions(+), 2 deletions(-) mode change 100755 => 100644 public/src/js/app.js mode change 100755 => 100644 public/src/js/config.js mode change 100755 => 100644 public/src/js/directives.js mode change 100755 => 100644 public/src/js/filters.js mode change 100755 => 100644 public/src/js/init.js diff --git a/public/src/css/common.css b/public/src/css/common.css index f41afc5d..1c10d7a8 100644 --- a/public/src/css/common.css +++ b/public/src/css/common.css @@ -13,6 +13,13 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { font-family: 'Ubuntu', sans-serif; } +#ngProgress { + box-shadow: none; + height: 4px; + color: #373D42; + background: #373D42; +} + /* Wrapper for page content to push down footer */ #wrap { min-height: 100%; diff --git a/public/src/js/app.js b/public/src/js/app.js old mode 100755 new mode 100644 diff --git a/public/src/js/config.js b/public/src/js/config.js old mode 100755 new mode 100644 index b08d6d6b..b1b66f83 --- a/public/src/js/config.js +++ b/public/src/js/config.js @@ -49,8 +49,6 @@ angular.module('insight') }) .run(function($rootScope, $route, ngProgress) { $rootScope.$on('$routeChangeStart', function() { - ngProgress.height('4px'); - ngProgress.color('#373D42'); ngProgress.start(); }); diff --git a/public/src/js/directives.js b/public/src/js/directives.js old mode 100755 new mode 100644 diff --git a/public/src/js/filters.js b/public/src/js/filters.js old mode 100755 new mode 100644 diff --git a/public/src/js/init.js b/public/src/js/init.js old mode 100755 new mode 100644 From 96cc476c08b33033addbfd46986da6bce48fb00f Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Mon, 10 Feb 2014 16:30:23 -0300 Subject: [PATCH 2/2] css fixed --- public/src/css/common.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/css/common.css b/public/src/css/common.css index 1c10d7a8..b4e8727f 100644 --- a/public/src/css/common.css +++ b/public/src/css/common.css @@ -14,10 +14,10 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { } #ngProgress { - box-shadow: none; - height: 4px; - color: #373D42; - background: #373D42; + box-shadow: none !important; + height: 4px !important; + color: #373D42 !important; + background: #373D42 !important; } /* Wrapper for page content to push down footer */