Skip to content
This repository has been archived by the owner on Oct 8, 2019. It is now read-only.

Commit

Permalink
Merge pull request #298 from blockchain/header-footer
Browse files Browse the repository at this point in the history 
Header changes
  • Loading branch information
@Sjors
Sjors committed Feb 5, 2016
2 parents 1dd9d20 + 6435b74 commit 712440b
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 52 deletions.
8 changes: 5 additions & 3 deletions app/partials/help.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ div
p.em-400(translate="LOST_2FA_DESC")
.flex-1.flex-end
a.button-default.button-nowrap(translate="RESET_2FA" ui-sref="public.reset-two-factor")
.flex-end
a.button-muted.mtm(ui-sref="public.login-no-uid")
span(translate="GO_BACK")
.flex-between
.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")
24 changes: 12 additions & 12 deletions app/partials/navigation.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
button.navbar-toggle.mvn(type="button", ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed")
span.sr-only Toggle navigation
span.ti-angle-down.white
a(ui-sref="wallet.common.home")
a.navbar-brand(ui-sref="wallet.common.home")
img#logo(src="img/logo-updated.png",alt="Blockchain")
a#wallet-nav-toggle(title="Wallet Navigation Menu", ng-click="toggleMenu()")
span.ti-menu.white
.navbar-collapse.collapse(ng-class="{'in bg-blue' : !navCollapsed}", ng-click="navCollapsed=true")
ul.nav.navbar-nav.navbar-right(ng-show="status.isLoggedIn")
li.item.mrl(ng-show="settings.btcCurrency")
a(ng-click="openBCmarkets()")
span
li.item(ng-show="settings.btcCurrency")
a.flex-important.flex-column(ng-click="openBCmarkets()")
span.type-sm
| 1 {{ settings.btcCurrency.code }} = 
fiat(btc="settings.btcCurrency.conversion")
li.dropdown.item.hidden-xs(uib-dropdown)
Expand All @@ -22,25 +22,25 @@
i.ti-angle-down.mlm
ul.uib-dropdown-menu(role='menu')
li
a(href="https://www.blockchain.info/wallet/bitcoin-faq", target="_blank", translate="WHATS_BITCOIN")
li
a(href="https://www.blockchain.info/", target="_blank", translate="BLOCKCHAIN_INFO")
a(href="https://www.blockchain.info/", target="_blank", translate="HOME")
li
a(href="https://www.blockchain.info/charts", target="_blank",translate="CHARTS")
li
a(href="https://www.blockchain.info/stats", target="_blank",translate="STATS")
li
a(href="https://markets.blockchain.info/", target="_blank", translate="MARKETS")
li
a(href="https://www.blockchain.info/api", target="_blank", translate="API")
li.item.visible-xs
a(href="https://www.blockchain.info/wallet/bitcoin-faq", target="_blank",translate="WHATS_BITCOIN")
a(href="https://www.blockchain.info/", target="_blank", translate="HOME")
li.item.visible-xs
a(href="https://www.blockchain.info/charts", target="_blank",translate="CHARTS")
li.item.visible-xs
a(href="https://www.blockchain.info/", target="_blank",translate="BLOCKCHAIN_INFO")
a(href="https://www.blockchain.info/stats", target="_blank",translate="STATS")
li.item.visible-xs
a(href="https://www.blockchain.info/api",target="_blank", translate="API")
li.item.visible-xs
a(href="https://www.blockchain.info/charts", target="_blank",translate="CHARTS")
li.item.visible-xs
a(href="https://markets.blockchain.info/", target="_blank",translate="MARKETS")
li.item
a(ng-click="logout()", translate="SIGNOUT")
// /.nav-collapse
// /.nav-collapse
1 change: 0 additions & 1 deletion app/partials/public.jade
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.login-pg.overflow-scroll
public-header

.flex-center.flex-justify.flex-column
.flex.flex-justify
alerts
Expand Down
14 changes: 7 additions & 7 deletions app/templates/public-header.jade
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
.navbar.navbar-default.navbar-inverse.bc-header(role='navigation')
.container-fluid
.navbar-header.flex-between
a(ui-sref="welcome")
a.navbar-brand(ui-sref="welcome")
img#logo(src="img/logo-updated.png",alt="Blockchain")
button.navbar-toggle(type="button", ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed")
span.sr-only Toggle navigation
span.ti-menu.h4.white
.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="EXPLORER")
a.pam(href="https://www.blockchain.info", translate="HOME")
li.item
a.pam(href="https://www.blockchain.info/charts", translate="CHARTS")
li.item
a.pam(href="https://www.blockchain.info/api", translate="API")
li.item.active
a.pam(href="#", translate="WALLET")
a.pam(href="https://www.blockchain.info/stats", translate="STATS")
li.item
a.pam(href="https://blockchain.com/about", translate="ABOUT")
a.pam(href="https://markets.blockchain.info", translate="MARKETS")
li.item
a.pam(href="https://blockchain.zendesk.com/", translate="SUPPORT")
a.pam(href="https://www.blockchain.info/api", translate="API")
li.item.active
a.pam(href="#", translate="WALLET")
95 changes: 67 additions & 28 deletions assets/css/modules/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,41 +34,54 @@

.navbar-inverse .navbar-nav > li > a {
color: white;
> span {
display: inline-block;
}
> i {
float: right;
}
padding: 10px 15px 10px;
}

.navbar-inverse {
background-color: $blue;
border:none;
height: 70px;
height: 60px;
border-radius: 0px;
z-index: 1030;
.navbar-brand {
color: white;
color: white;
margin-left: 0px !important;
img {
padding-left: 0px;
}
}
.container-fluid { padding: 10px 30px; }
.navbar-nav {
li > a:hover {
> li {
margin-left: 2px;
padding-top: 10px;
}
> li > a:hover {
background-color: transparent;
}

> .open > a {
&:hover, &:focus {
background: #0face5;
}
}

li.active {
a {
background-color: #10ace5;
background-color: #0face5;
border-radius: 5px;
}

a:hover, a:active, a:focus {
background-color: #10ace5;
background-color: #0face5;
border-radius: 5px;
}

}
> li {
a:hover, a:active, a:focus {
background-color: #0face5;
border-radius: 5px;
}
}
li.open{
a {background-color: transparent;}
}
Expand All @@ -83,25 +96,12 @@

@media (max-width: 620px) {
.navbar-inverse {
.container-fluid { padding: 10px 15px; }
}
}

ul.navbar-right{
li.active{background:#10ace5; border-radius: 5px; }
li.open{
background: #10ace5;
border-radius: 3px;
a{background-color: transparent;
&:hover{background-color: transparent!important;}
&:focus{background-color: transparent!important;}
}
.container-fluid { padding: 0px 15px; }
}
}

img#logo {
height: 40px;
margin-top: 5px;
}

@media (max-width: 620px) {
Expand All @@ -111,12 +111,17 @@ img#logo {
.navbar-header {
.navbar-brand{
padding: 0;
padding-top: 5px;
}
&:before, &:after {
content: none;
display: block;
}
.navbar-brand {
line-height: 60px;
img {
display: inline-block;
}
}
}

.navbar-collapse {
Expand All @@ -142,3 +147,37 @@ img#logo {
}
}
}

// language dropdown
.language {
min-width: 120px;
min-height: 20px;
position: relative;
.ui-select-container {
width: 100%;
position: absolute;
background: transparent;
&.open {
.ui-select-match {
display: block !important;
}
}
input[type="text"].ui-select-search {
display: none !important;
}
.btn-default-focus, .btn-default:hover {
background: transparent;
border: 0px !important;
}
.ui-select-toggle {
height: 100%;
padding: 0px;
border: 0px !important;
background: transparent;
}
.ui-select-match-text {
color: #fff;
font-size: 13px;
}
}
}
2 changes: 1 addition & 1 deletion assets/css/utilities/_colors.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//Blockchain Pillar Colors
$blue: #1b8ac7;
$blue: #049bd4;
$send-red: #e27e82;
$receive-green: #85b45b;
$transfer-blue: #5bacd0;
Expand Down
1 change: 1 addition & 0 deletions locales/en-human.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"WHATS_BITCOIN": "What's Bitcoin?",
"BLOCKCHAIN_INFO": "Blockchain.info",
"API": "API",
"STATS": "Stats",
"CHARTS": "Charts",
"MARKETS": "Markets",
"EXPLORE": "Explore",
Expand Down

0 comments on commit 712440b

Please sign in to comment.