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

fixed misc css & layout #1937

Merged
merged 1 commit into from
Jul 10, 2018
Merged

fixed misc css & layout #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/includes/header.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<span class="hidden-xs">3.21.15</span>

<span class="dropdown dropdown-lang" ng-cloak>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
<ul class="dropdown-menu" ng-show="dropdown">
<li><a ng-class="{true:'active'}[curLang=='Català']" ng-click="changeLanguage('ca','Català' )"> Català </a></li>
<li><a ng-class="{true:'active'}[curLang=='Deutsch']" ng-click="changeLanguage('de','Deutsch' )"> Deutsch </a></li>
Expand Down Expand Up @@ -172,14 +172,6 @@
rel="noopener noreferrer"></a>
</div>
</ul>
<p class="dropdown-gas__msg"
ng-show="gasPriceMsg"
ng-hide="ajaxReq.type!='ETH'">
The network is really full right now. Check
<a href="https://ethgasstation.info/"
target="_blank" rel="noopener noreferrer">Eth Gas Station</a>
for gas price to use.
</p>
</span>

<!-- Warning: The separators you see on the frontend are in styles/etherwallet-custom.less. If you add / change a node, you have to adjust these. Ping tayvano if you're not a CSS wizard -->
Expand Down Expand Up @@ -212,6 +204,14 @@

</div>
</section>
<p class="dropdown-gas__msg"
ng-show="gasPriceMsg"
ng-hide="ajaxReq.type!='ETH'">
The network is really full right now. Check
<a href="https://ethgasstation.info/"
target="_blank" rel="noopener noreferrer">Eth Gas Station</a>
for gas price to use.
</p>
</section>

<nav role="navigation" aria-label="main navigation" class="container nav-container overflowing">
Expand Down
15 changes: 9 additions & 6 deletions app/styles/etherwallet-custom.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,14 +513,17 @@ label small {
.dropdown-gas__msg {
font-size: 12px;
font-weight:300;
left: -100%;
margin: 0;
position: absolute;
right: -100%;
margin: -10px auto 3px auto;
max-width: 113rem;
padding: 0 5rem;
text-align: right;
white-space:normal;
@media screen and (max-width: 80rem) {
padding: 0 3%;
}
@media screen and (max-width: 900px) {
left: -25%;
right: 0;
margin-top: 0;
padding: 0 1%;
}

}
Expand Down
17 changes: 6 additions & 11 deletions app/styles/etherwallet-nav.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.header-branding {
color: white;
padding: 0;
@media screen and (max-width: 900px) {
@media screen and (max-width: 960px) {
text-align: center;
}
.container {
Expand All @@ -15,11 +15,12 @@
}
}
.brand {
float: left;
@media screen and (max-width: 900px) {
float: none;
}
img {
padding: @space-xs 0;
@media screen and (max-width: 900px) {
max-width: 10rem;
}
}
}
.tagline {
Expand Down Expand Up @@ -82,14 +83,8 @@
}
.dropdown-gas {
display: inline-block;
@media screen and (max-width: 900px) {
margin-bottom: 1.8rem;
}
.dropdown-toggle {
min-width: 200px;
}
.dropdown-menu{
min-width: 100%;
min-width: 200px;
padding: .5rem;
margin: 0;
left: 0;
Expand Down