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

Commit

Permalink
Add account window (#1023)
Browse files Browse the repository at this point in the history
Merging of Choose account popup #814

* Creating change account modals

* connect popup

* fixing typo

* connect account popup

* Straightens checkbox on connect account modal

* Connect account popup interface

* fixing scroll gradient on choose account popup

* Informing account names on connect popup

* Adding animations on account and dapp info

* Improvements on connect popup

* Tweaking URL breakdown to show arrows when necessary

* Fixing edgy cases on breadcrumb

* Removing browserBar interface

* Removing browser bar fold-down element

* Vertical flexbox - window stretches appropriately

* Popup updates

* change dapp style and icon (#1)

* more working code

* Reload permissions and code cleaning

* Website placeholder icon

* Cleaning code

* Unpin tab

* Not showing remove button on wallet tab

* Merge Hard Fork choice - Mist into master (#979)

* bump version to 0.7.6

* updated os timesync

* adding setting to change UI language (fixes #813) (#896)

* simple language setting menu

* use i18n label in menu

* simple language setting menu

* use i18n label in menu

* change language of menu bar by triggering 'backendAction_setLanguage'

* adds translations for language names

* remove duplicate 'gulp update-nodes' (#897)

* add i18n entry for OSX's 'Services' (#887)

* add i18n entry for OSX's 'Services'

* update missing osx menu strings

* update-popup-window: prevent maximize (#885)

* update-popup-window prevent maximize

* add resizable:false

* added shrinkwrap (#903)

* fixed webview tagd and updated electrong to 1.2.5 (#905)

* Fixes the node start IPC connection (#841)

* fixed eth start, but crash is not graceful

* better socket connection logic, remove master ps logic for eth

* fix splash screen display of state text for eth

* better gulp download plugin, remove master passwd stuff once and for all

* Adds Toggle password visibility to on boarding screen (#909)

* add password visibilty toggle to onboarding

* replaced 'showPassword' with 'passwordInputType'

* changed id into class

* 18n cleanup (former #889) (#910)

* Renamed Korean and Albanian to ISO standards
* Added menu items to set to Dutch,  Farsi, Albanian and Italian (these three are rather incomplete)

* changed log error to warn

* fixed ipcBackend notifications

* Fixing wallet tab insertion (#911)

* small cleanup

* added admin:true permission

* removed webview duplicate

* Fully automated UI testing (#788)


* got app launching via test

* work towards testing - private net integration

* change how we name options to pass directly to geth, so that test suite works

* refactor preloader scripts

* cleanly quitting the app at the end of tests

* trying to get electron working properly, upgrade to 1.2.2

* upgrade spectron

* work towards getting tests to work

* dont use NODE_ENV var as Meteor production uses it

* fixed eth start, but crash is not graceful

* better socket connection logic, remove master ps logic for eth

* fix splash screen display of state text for eth

* better gulp download plugin, remove master passwd stuff once and for all

* got basic test working

* update travis build

* trigger build

* update readme, travis

* fix gulp-download-stream use

* fix build command

* testing account creation

* added account creation test

* only do a shallow clone

* final deposit test

* should be able to find geth executable now

* adds the wallet as the default tab (#924)

* Text updates

Fix typos and make writing more clear and accurate

* Capitalization consistency

* adds the wallet as the default tab

* always upsert

* Update version to 0.8 (#930)

* update to 0.8

* fixes menu margin clipping

* remove comma

* work towards new minimonogo sync

* fix ipcpath bug

* got basic persistence working

* minor error

* refactor sendTransaction error alerts (#959)

* "Change language" translated in mist.nb.i18n.json (#953)

"Change language" translated in mist.nb.i18n.json

* timer delay on menu refreshing from tab updates

* rename 'passwordError' to 'wrongPassword' for consistency (#951)

* sync not specific to a window

* refactor to enable access to mongo sync from all windows

* update .meteor paths on .gitignore (#977)

* DAO fork support (#970)

* created DAO fork dummy code

* text update

* added node flags choice 

* changed DAO fork texts

* disable eth-node switch until hardfork is supported (#975)

* disable eth-node until hardfork is supported

* remove test function

* reworded the disclaimer link

* Syncing Tabs after account connection

* Enable Tabs sync and persistence in all windows (#2)

* sync not specific to a window

* refactor to enable access to mongo sync from all windows

* Pin/unpin Tabs

* Adding show password on Create account popup

* change remove button animation

* add globe image as default non-icon
  • Loading branch information
Alex Van de Sande committed Jul 23, 2016
1 parent ad98f6b commit 06fc6f2
Show file tree
Hide file tree
Showing 28 changed files with 809 additions and 601 deletions.
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

0 comments on commit 06fc6f2

Please sign in to comment.