8000 Menu UI fixes by alexvandesande · Pull Request #2 · ethereum/mist · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Sep 5, 2020. It is now read-only.

Menu UI fixes #2

Merged
merged 2 commits into from
Jun 12, 2015
Merged

Menu UI fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
543d114
added sidebar shadow
duckized Jun 12, 2015
abc971d
menu transitions
duckized Jun 12, 2015
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
27 changes: 21 additions & 6 deletions interface/client/styles/layout.import.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
body, html {
height: 100%;
overflow: hidden;
.background-image(linear-gradient(to bottom, @colorOSBackgroundFocus 0%, lighten(@colorOSBackgroundFocus, 50%) 100%));

&.blur {
aside {
// background-color: @colorOSBackgroundBlur;
.background-image(linear-gradient(to bottom, @colorOSBackgroundBlur 0%,lighten(@colorOSBackgroundBlur, 5%) 100%));
}
.background-image(linear-gradient(to bottom, @colorOSBackgroundBlur 0%,lighten(@colorOSBackgroundBlur, 5%) 100%));
// aside {
// // background-color: @colorOSBackgroundBlur;
// .background-image(linear-gradient(to bottom, @colorOSBackgroundBlur 0%,lighten(@colorOSBackgroundBlur, 5%) 100%));
// }
}

-webkit-touch-callout: none;
Expand All @@ -20,7 +22,7 @@ body, html {
}

aside {
z-index: 2;
z-index: 4;
position: absolute;
top: 0;
left: 0;
Expand All @@ -30,7 +32,18 @@ aside {

// .box-shadow(0 0 15px rgba(0,0,0,0.5));
// background-color: @colorOSBackgroundActive;
.background-image(linear-gradient(to bottom, @colorOSBackgroundFocus 0%, lighten(@colorOSBackgroundFocus, 50%) 100%));
// .background-image(linear-gradient(to bottom, @colorOSBackgroundFocus 0%, lighten(@colorOSBackgroundFocus, 50%) 100%));
&:before {
content: " ";
display: block;
position: absolute;
z-index: 2;
top: 0;
left: 0.95 * @widthSideBar;
width: 10px;
bottom: 0;
.background-image(linear-gradient(to right, rgba(0,0,0,0) 0%, rgba(0,0,0,0.05) 100%));
}
}

main {
Expand All @@ -40,7 +53,9 @@ main {
right: 0;
width: ~"calc(100% - @{widthSideBar})";
height:100%;
overflow: hidden;
background-color: @colorOSBackgroundFocus;
border-top-left-radius: 3px;
}

webview {
Expand Down
25 changes: 22 additions & 3 deletions interface/client/styles/menu.import.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ aside.sidebar {
overflow: hidden;

ul {
position: relative;
z-index: 10;
.dapp-vertical-menu;
padding-left: @gridWidth/4;

li {
padding-left: @gridWidth/4;
border-top: 1px solid #ACACAC;
border-top: 1px solid rgba(0, 0, 0, 0.04);
margin-top: 0;
transition: background 0.1s ease-in-out;

&.selected {
color: @colorLinkActive;
Expand All @@ -22,6 +26,12 @@ aside.sidebar {
&.selected + li,
&:first-child {
border-top: none;
margin-top: 1px;
}

&.selected ul {
display: block;
height: 90px; // should be auto
}
}

Expand All @@ -43,7 +53,12 @@ aside.sidebar {
border: 0;
}


img {
vertical-align: middle;
margin-right: 4px;
width: 20px;
height: 20px;
}


// &.history {
Expand All @@ -54,7 +69,11 @@ aside.sidebar {
}

li ul {
padding-left:@gridWidth/4;
height: 0;
padding-left: 18px;
overflow: hidden;
transition: height 0.25s ease-in-out;

li button {
font-size: 12px;
font-weight: 400;
Expand Down
10 changes: 7 additions & 3 deletions interface/client/templates/layout/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@
{{#each tabs}}
<li class="{{isVisible}}">
<button>
<img src="icons/wallet-icon@2x.png">
{{name}}
</button>

<!-- <ul>
<ul>
<li>
<button> sub link </button>
<button> link 01 </button>
</li>
</ul> -->
<li>
<button> link 02</button>
</li>
</ul>
</li>
{{/each}}
</ul>
Expand Down
Binary file added interface/public/icons/browse-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/browse-icon@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/chat-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/chat-icon@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/dao-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/dao-icon@2x.png
F438
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/token-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/token-icon@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/wallet-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added interface/public/icons/wallet-icon@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0