Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Add account window #1023

Merged
merged 48 commits into from
Jul 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7607cb8
Creating change account modals
evertonfraga Jun 8, 2016
19230dd
Merge branch 'develop' of https://github.com/evertonfraga/mist into d…
evertonfraga Jun 9, 2016
e60bc18
Merge branch 'develop' of https://github.com/ethereum/mist into develop
evertonfraga Jun 13, 2016
dc3c0f3
Merge branch 'fix_payload' of https://github.com/hiddentao/mist into …
evertonfraga Jun 13, 2016
a6b29bb
Merge branch 'hiddentao-fix_payload' into develop
evertonfraga Jun 13, 2016
910a7c7
connect popup
evertonfraga Jun 13, 2016
e459d84
merge
evertonfraga Jun 13, 2016
8e3bc73
fixing typo
evertonfraga Jun 14, 2016
5c17161
connect account popup
evertonfraga Jun 14, 2016
79df42b
Straightens checkbox on connect account modal
evertonfraga Jun 14, 2016
17e3b71
Connect account popup interface
evertonfraga Jun 14, 2016
91d4251
fixing scroll gradient on choose account popup
evertonfraga Jun 14, 2016
74c91c7
Merge branch 'develop' of https://github.com/ethereum/mist into develop
evertonfraga Jun 16, 2016
14cfdb5
Informing account names on connect popup
evertonfraga Jun 16, 2016
b91dd6e
Adding animations on account and dapp info
evertonfraga Jun 16, 2016
91bafff
Merge branch 'develop' of https://github.com/ethereum/mist into develop
evertonfraga Jun 27, 2016
b048871
Improvements on connect popup
evertonfraga Jun 28, 2016
5ddb558
Merge branch 'develop' of https://github.com/ethereum/mist into develop
evertonfraga Jun 28, 2016
dc93347
Tweaking URL breakdown to show arrows when necessary
evertonfraga Jun 29, 2016
06bf020
Merge branch 'develop' of https://github.com/ethereum/mist into develop
evertonfraga Jun 29, 2016
cfedd2c
Fixing edgy cases on breadcrumb
evertonfraga Jun 29, 2016
35ee7d9
Removing browserBar interface
evertonfraga Jun 29, 2016
8049024
Removing browser bar fold-down element
evertonfraga Jun 30, 2016
3927e29
Merge branch 'develop' of https://github.com/ethereum/mist into develop
evertonfraga Jul 1, 2016
0f07dba
Vertical flexbox - window stretches appropriately
evertonfraga Jul 5, 2016
3dc231b
Popup updates
evertonfraga Jul 5, 2016
c8b0192
change dapp style and icon (#1)
duckized Jul 5, 2016
7594cb9
more working code
evertonfraga Jul 7, 2016
9bf6041
Merge
evertonfraga Jul 8, 2016
2460ed4
Reload permissions and code cleaning
evertonfraga Jul 8, 2016
4e98323
Website placeholder icon
evertonfraga Jul 8, 2016
e1dcf6a
Cleaning code
evertonfraga Jul 8, 2016
4e52de1
Unpin tab
evertonfraga Jul 12, 2016
1dc82bd
Not showing remove button on wallet tab
evertonfraga Jul 12, 2016
bbb9bc0
Merge branch 'minimongo' of https://github.com/hiddentao/mist into hi…
evertonfraga Jul 13, 2016
75504d5
Merge branch 'hiddentao-minimongo' into develop
evertonfraga Jul 13, 2016
faf51bd
Merge branch 'minimongo' into evertonfraga-develop
hiddentao Jul 14, 2016
3c455fb
Merge branch 'minimongo' into evertonfraga-develop
hiddentao Jul 14, 2016
6d58bff
Merge Hard Fork choice - Mist into master (#979)
frozeman Jul 17, 2016
cbf509c
Syncing Tabs after account connection
evertonfraga Jul 18, 2016
0b55258
Enable Tabs sync and persistence in all windows (#2)
hiddentao Jul 18, 2016
7203be6
Merge branch 'hiddentao-evertonfraga-develop' into develop
evertonfraga Jul 18, 2016
d0854a2
Pin/unpin Tabs
evertonfraga Jul 19, 2016
9d46d9a
Adding show password on Create account popup
evertonfraga Jul 20, 2016
b468913
Merge branch 'develop' of https://github.com/evertonfraga/mist into e…
duckized Jul 22, 2016
10bb09c
change remove button animation
duckized Jul 23, 2016
9e44113
merge
duckized Jul 23, 2016
4a6be66
add globe image as default non-icon
duckized Jul 23, 2016
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
1 change: 1 addition & 0 deletions interface/.meteor/dev_bundle
2 changes: 1 addition & 1 deletion interface/client/mistAPIBackend.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ mistAPIBackend = function(event) {
var webview = this.webview;
var arg = event.args[0];

console.trace('mistAPIBackend event', event);
// console.trace('mistAPIBackend event', event);

if(event.channel === 'setWebviewId') {
Tabs.update(template.data._id, {$set:{
Expand Down
3 changes: 0 additions & 3 deletions interface/client/styles/animations.import.less
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ aside.sidebar {
transition: none;
}

button.main img {
transition: opacity 0.5s;
}
button.slide-out {
transition: transform 0.2s ease-in-out;
}
Expand Down
126 changes: 32 additions & 94 deletions interface/client/styles/browserbar.import.less
Original file line number Diff line number Diff line change
Expand Up @@ -32,92 +32,22 @@
// ANIMATION
transition: height 0.25s, box-shadow 0.5s;

&.show-bar {
height: @gridHeight * 20;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);

.url-input {
opacity: 0.9;
transition-duration: 0.3s;
transition-delay: 0.1s;
transform: translateX(0) translateZ(0);
}

.url-breadcrumb {
opacity: 0;
visibility: hidden;
transition-duration: 0.3s;
transition-delay: 0.1s;
transform: translateX(20px) translateZ(0);
word-spacing: -5px;
}

&:after {
display: block;
position: absolute;
left: 5%;
top: 28px;
width: 20px;
height: 20px;
margin-left: -10px;
content: "◢◣";
color: @colorGrayDark;
font-size: 50%;
letter-spacing: -2px;
transition: left .5s ease-in-out;
}
}

&.dapp-info {
button.dapp-info {
color: @colorGrayDark;
}

div.dapp-info {
display: flex;
}
}

&.accounts {
button.accounts {
color: @colorGrayDark;
}
button.dapp-info {
color: @colorLink;
}

div.accounts {
display: flex;
}

&:after {
left: 95%;
}
}

&.url {
&:after {
left: 50%;
}
div.url {
display: flex;
}
}

> button {
> .dapp-info, > button {
color: #6691c2;
position: relative;
padding-left: 0;
margin-top: 1px;
max-width: 33%;
height: @gridHeight;
height: 21px;
font-family: @sourceSansPro;
font-size: @fontSizeSmall;
font-weight: 500;
line-height: @gridHeight;
line-height: 21px;
white-space: nowrap;
margin-top: -1px;

&.has-icon {
padding-left: @gridWidth*0.75;
padding-left: @gridWidth * 0.84;
}

&:focus {
Expand All @@ -128,27 +58,36 @@
.dapp-shorten-text;
}

.dapp-identicon {
margin-top: -2px;
}

.app-icon {
position: absolute;
top: 1px;
top: 0;
left: 0;
width: 16px;
height: 16px;
border-radius: 8px;
width: 21px;
height: 21px;
border-radius: 50%;
-webkit-user-drag: none;
user-drag: none;
}

.icon-key {
display: block;
float: right;
top: 3px;
margin-left: 4px;
position: relative;
.connect-button {
float: left;
margin-right: 8px;
text-transform: uppercase;
}
.connect-button, .dapp-info span {
line-height: 21px;
display: inline-block;
}

span.no-accounts {
background-image: url(/images/anonymous-icon.png);
background-size: cover;
background-position: 50%;
width: 21px;
height: 21px;
display: inline-block;
border-radius: 50%;
}
}

> form {
Expand Down Expand Up @@ -203,7 +142,6 @@
color: @colorLinkBlur;
}
}

}

div.dapp-info,
Expand Down Expand Up @@ -279,8 +217,8 @@
}

.app-bar {
margin-left: @gridWidth * 1;
margin-right: 0;
margin-left: @gridWidth /2;
margin-right: @gridWidth /2;
}

}
Expand Down Expand Up @@ -392,7 +330,7 @@
.browser-bar .accounts {
width: 0;
text-overflow: clip;
padding-left: @gridWidth * 0.5;
padding-left: @gridWidth * 0.75;
}
}

Expand Down
72 changes: 61 additions & 11 deletions interface/client/styles/menu.import.less
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,19 @@ aside.sidebar {
color: @colorLinkFocus;
}

img {
img, .icon-globe {
position: absolute;
top: 10px;
width: 20px;
height: 20px;
top: 12px;
left: 2px;
height: @gridHeight;
width: @gridHeight;
border-radius: 10px;
}

.icon-globe {
top: 13px;
}

span, .badge {
.dapp-shorten-text;
display: block;
Expand All @@ -122,17 +127,56 @@ aside.sidebar {
font-weight: 200;
text-transform: none;
}
}

// Remove tab button
button.main {
img, .icon-globe {
transition: 0.25s ease-in-out transform;
transform: rotateY(0deg) translate3d(0, 0, 0);
backface-visibility: hidden;
color: @colorGray;
}
}

&:not(.browser):not(.wallet) header:hover {
button.main img, button.main .icon-globe {
transform: rotateY(-180deg) translate3d(0, 0, 0);
}

// &.history {
// padding: @defaultPaddingVertical/2 @defaultPaddingHorizontal/2;
// font-size: 0.7em;
// text-align: left;
// }
button.remove-tab {
transform: rotateY(0deg) translate3d(0px, 0px, 0);
&:hover {
background: @colorLink;
color: @colorWhite;
}
}
}

button.remove-tab {
box-sizing: border-box;
position: absolute;
padding: 6px 8px 0px 2px;
transition: 0.25s ease-in-out transform;
left: 8px;
top: 11px;
color: @colorLink;
height: @gridHeight - 1px;
width: @gridHeight;
border-radius: 50%;
padding: 0;
z-index: 2;
backface-visibility: hidden;
transform: rotateY(180deg) translate3d(0px, 0px, 0);
&:focus {
border: none;
}
}

button.slide-out {
position: absolute;
right: @gridHeight/2;
top: @gridHeight/1.5;
top: @gridHeight/1.75;
width: 30px;
height: 20px;
background: url('icons/expand-icon.png') no-repeat center;
Expand Down Expand Up @@ -289,4 +333,10 @@ aside.sidebar {
margin: @gridHeight/2 @gridWidth/4;
}
}
}
}

// Remove tab button related code
aside.full-tabs button.remove-tab {
display: none;
}

Loading