ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity

Rework ascribe-powered-by styling in nav bar

Browse Source
This commit is contained in:
Brett Sun 2016-06-16 15:55:56 +02:00
parent 77d7633690
commit a2e8c04427
7 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/components/header.js
View File

@ -67,21 +67,19 @@ let Header = React.createClass({
);
} else {
return (
<span>
<Link className="icon-ascribe-logo" to="/collection"/>
</span>
<Link to="/collection">
<span className="icon-ascribe-logo" />
</Link>
);
}
},
getPoweredBy() {
return (
<li>
<a className="pull-right ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
<span id="powered">{getLangText('powered by')} </span>
<span className="icon-ascribe-logo"></span>
</a>
</li>
<a className="pull-left ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
<span>{getLangText('powered by')} </span>
<span className="icon-ascribe-logo"></span>
</a>
);
},
@ -192,17 +190,15 @@ let Header = React.createClass({
<Navbar.Brand>
{this.getLogo()}
</Navbar.Brand>
<AclProxy
aclName="acl_view_powered_by"
aclObject={whitelabel}>
{this.getPoweredBy()}
</AclProxy>
<Navbar.Toggle />
</Navbar.Header>
<Navbar.Collapse
eventKey={0}>
<Nav navbar pullLeft>
<AclProxy
aclObject={whitelabel}
aclName="acl_view_powered_by">
{this.getPoweredBy()}
</AclProxy>
</Nav>
<Nav navbar pullRight>
<HeaderNotificationDebug show={false}/>
{account}

24
sass/ascribe_navbar.scss
View File

@ -76,10 +76,27 @@
}
}
.navbar-header {
.ascribe-powered-by {
color: $ascribe--nav-fg-prim-color;
line-height: 20px;
padding: 15px;
&:focus,
&:hover {
color: $ascribe--nav-fg-sec-color;
}
}
}
.navbar-brand {
font-size: 23px;
padding: 12px 15px;
.img-brand {
height: 100%;
}
.icon-ascribe-logo {
color: $ascribe--nav-fg-prim-color;
@ -88,13 +105,6 @@
color: $ascribe--nav-fg-sec-color;
text-decoration: none;
}
&:focus {
text-decoration: none;
}
}
.img-brand {
height: 100%;
}
}

5
sass/main.scss
View File

@ -88,6 +88,11 @@ hr {
.ascribe-powered-by {
font-size: 11px;
font-weight: 300;
&:focus,
&:hover {
text-decoration: none;
}
}
.clear-paddings {

1
sass/whitelabel/wallet/artcity/artcity_custom_style.scss
View File

@ -59,6 +59,7 @@ $artcity--ter-highlight-color: #EDEDF0;
height: 115%;
}
.navbar-header .ascribe-powered-by,
.navbar-brand .icon-ascribe-logo {
color: $artcity--nav-fg-prim-color;

1
sass/whitelabel/wallet/market/market_custom_style.scss
View File

@ -56,6 +56,7 @@ $market--highlight-color: #2882fa;
height: 115%;
}
.navbar-header .ascribe-powered-by,
.navbar-brand .icon-ascribe-logo {
color: $market--nav-fg-prim-color;

4
sass/whitelabel/wallet/market/market_footer.scss
View File

@ -8,8 +8,4 @@
//border: 0;
margin-bottom: 1.5em;
}
.ascribe-powered-by {
font-weight: 300 !important;
}
}

17
sass/whitelabel/wallet/polline/polline_custom_style.scss
View File

@ -55,18 +55,15 @@ $polline--highlight-color: #2882fa;
.navbar-brand {
padding: 0 5px 0 15px;
}
.img-brand {
height: 100%;
}
.navbar-header .ascribe-powered-by,
.navbar-brand .icon-ascribe-logo {
color: $polline--nav-fg-prim-color;
.icon-ascribe-logo {
color: $polline--nav-fg-prim-color;
&:focus,
&:hover {
color: darken($polline--nav-fg-prim-color, 20%);
}
&:focus,
&:hover {
color: darken($polline--nav-fg-prim-color, 20%);
}
}
}