From 0c8bc2ff3717c9b7a4ea49b83ce044d8a6a3c4bf Mon Sep 17 00:00:00 2001 From: Anthony Truskinger Date: Fri, 1 Apr 2016 14:04:33 +1000 Subject: [PATCH] fix(secondaryNavigation): Minor fixes - changed default target behaviour in breadcrumbs to nothing (open in same frame/window) - made the glyphicon color override more specific - fixed application title bug - removed old function from app.js --- src/app/app.js | 23 +---------------------- src/app/navigation/_navigation.scss | 2 +- src/app/navigation/navigation.tpl.html | 2 +- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/app/app.js b/src/app/app.js index 08734ae9..0f5421c0 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -375,27 +375,6 @@ angular.module("baw", }; UserProfile.listen(eventCallbacks); - // helper function for printing scope objects - /*baw.exports.print = $rootScope.print = function () { - var seen = []; - var badKeys = ["$digest", "$$watchers", "$$childHead", "$$childTail", "$$listeners", "$$nextSibling", - "$$prevSibling", "$root", "this", "$parent"]; - var str = JSON.stringify(this, - function (key, val) { - if (badKeys.indexOf(key) >= 0) { - return "[Can't do that]"; - } - if (typeof val === "object") { - if (seen.indexOf(val) >= 0) { - return ""; - } - seen.push(val); - } - return val; - }, 4); - return str; - };*/ - // http://www.yearofmoo.com/2012/10/more-angularjs-magic-to-supercharge-your-webapp.html#apply-digest-and-phase $rootScope.$safeApply = function ($scope, fn) { @@ -438,7 +417,7 @@ angular.module("baw", // https://docs.angularjs.org/api/ngRoute/service/$route $rootScope.$on("$routeChangeSuccess", function (event, current, previous, rejection) { - let title = $route.current && ( "|" + $route.current.title) || ""; + let title = $route.current && ( " | " + $route.current.title) || ""; document.title = appEnvironment.brand.title + title; $rootScope.fullWidth = $route.current.$$route.fullWidth; }); diff --git a/src/app/navigation/_navigation.scss b/src/app/navigation/_navigation.scss index e1dc36c9..64552948 100644 --- a/src/app/navigation/_navigation.scss +++ b/src/app/navigation/_navigation.scss @@ -5,7 +5,7 @@ left-nav-bar, right-nav-bar { } right-nav-bar { - .fa, .glyphicon { + a>.fa, a>.glyphicon { color: $text-color } } \ No newline at end of file diff --git a/src/app/navigation/navigation.tpl.html b/src/app/navigation/navigation.tpl.html index 3b8623e4..cb29bdb4 100644 --- a/src/app/navigation/navigation.tpl.html +++ b/src/app/navigation/navigation.tpl.html @@ -2,7 +2,7 @@
  • {{ breadcrumb.title }}