diff --git a/app/partials/help.jade b/app/partials/help.jade index a2d20081b9..5aec6b4835 100644 --- a/app/partials/help.jade +++ b/app/partials/help.jade @@ -28,4 +28,4 @@ div .flex-start a.button-muted.mtm(ui-sref="public.login-no-uid" translate="GO_BACK") .flex-end - a.button-muted.mtm(href="https://zendesk.blockchain.com" translate="CONTACT_SUPPORT" target="_blank") + a.button-muted.mtm(href="https://blockchain.zendesk.com" translate="CONTACT_SUPPORT" target="_blank") diff --git a/app/partials/navigation.jade b/app/partials/navigation.jade index 6ecfe4331f..40d0c3594f 100644 --- a/app/partials/navigation.jade +++ b/app/partials/navigation.jade @@ -13,7 +13,7 @@ ul.nav.navbar-nav.navbar-right(ng-show="status.isLoggedIn") li.item(ng-show="settings.btcCurrency") a.flex-important.flex-column(ng-click="openBCmarkets()") - span.type-sm + span | 1 {{ settings.btcCurrency.code }} =  fiat(btc="settings.btcCurrency.conversion") li.dropdown.item.hidden-xs(uib-dropdown) @@ -22,25 +22,25 @@ i.ti-angle-down.mlm ul.uib-dropdown-menu(role='menu') li - a(href="https://www.blockchain.info/", target="_blank", translate="HOME") + a(href="{{rootURL}}", translate="HOME") li - a(href="https://www.blockchain.info/charts", target="_blank",translate="CHARTS") + a(href="{{rootURL}}charts", translate="CHARTS") li - a(href="https://www.blockchain.info/stats", target="_blank",translate="STATS") + a(href="{{rootURL}}stats", translate="STATS") li - a(href="https://markets.blockchain.info/", target="_blank", translate="MARKETS") + a(href="https://markets.blockchain.info/", translate="MARKETS") li - a(href="https://www.blockchain.info/api", target="_blank", translate="API") + a(href="{{rootURL}}api", translate="API") li.item.visible-xs - a(href="https://www.blockchain.info/", target="_blank", translate="HOME") + a(href="{{rootURL}}",, translate="HOME") li.item.visible-xs - a(href="https://www.blockchain.info/charts", target="_blank",translate="CHARTS") + a(href="{{rootURL}}charts", translate="CHARTS") li.item.visible-xs - a(href="https://www.blockchain.info/stats", target="_blank",translate="STATS") + a(href="{{rootURL}}stats", translate="STATS") li.item.visible-xs - a(href="https://www.blockchain.info/api",target="_blank", translate="API") + a(href="{{rootURL}}api", translate="API") li.item.visible-xs - a(href="https://markets.blockchain.info/", target="_blank",translate="MARKETS") + a(href="https://markets.blockchain.info/", translate="MARKETS") li.item a(ng-click="logout()", translate="SIGNOUT") // /.nav-collapse \ No newline at end of file diff --git a/app/templates/public-header.jade b/app/templates/public-header.jade index 70e4eb2421..6e188a7537 100644 --- a/app/templates/public-header.jade +++ b/app/templates/public-header.jade @@ -9,14 +9,14 @@ .navbar-collapse.collapse(ng-class="{'in bg-blue' : !navCollapsed}", ng-click="navCollapsed=true") ul.nav.navbar-nav.navbar-right li.item - a.pam(href="https://www.blockchain.info", translate="HOME") + a.pam(href="{{rootURL}}", translate="HOME") li.item - a.pam(href="https://www.blockchain.info/charts", translate="CHARTS") + a.pam(href="{{rootURL}}charts", translate="CHARTS") li.item - a.pam(href="https://www.blockchain.info/stats", translate="STATS") + a.pam(href="{{rootURL}}stats", translate="STATS") li.item a.pam(href="https://markets.blockchain.info", translate="MARKETS") li.item - a.pam(href="https://www.blockchain.info/api", translate="API") + a.pam(href="{{rootURL}}api", translate="API") li.item.active a.pam(href="#", translate="WALLET") \ No newline at end of file diff --git a/assets/css/modules/_header.scss b/assets/css/modules/_header.scss index 0da804405c..2485a4e24a 100644 --- a/assets/css/modules/_header.scss +++ b/assets/css/modules/_header.scss @@ -5,6 +5,11 @@ background: #EBEBEB; } } + .dropdown { + .ti-angle-down { + float: right; + } + } span.ti-angle-down { font-weight: 900; font-size: 1.5em; position: relative; top: 1px; } .navbar-toggle { padding: 0; margin: 0 10px 0 20px; } } diff --git a/assets/js/directives/public-header.directive.js b/assets/js/directives/public-header.directive.js index 93882df105..72a4f0da56 100644 --- a/assets/js/directives/public-header.directive.js +++ b/assets/js/directives/public-header.directive.js @@ -3,13 +3,19 @@ angular .module('walletApp') .directive('publicHeader', publicHeader); -function publicHeader() { +publicHeader.$inject = ['$rootScope'] + +function publicHeader($rootScope) { const directive = { restrict: "E", replace: true, templateUrl: 'templates/public-header.jade', scope: {}, - link: function() {} + link: link }; return directive; + + function link(scope, elem, attrs) { + scope.rootURL = $rootScope.rootURL; + } }