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

Commit

Permalink
Merge pull request #23 from LedgerHQ/develop
Browse files Browse the repository at this point in the history
Add Ledger live migration screen + Alert notice
  • Loading branch information
pollastri-pierre authored Dec 7, 2018
2 parents 10eeefa + 17a1cf4 commit 4f3c7f4
Show file tree
Hide file tree
Showing 126 changed files with 238 additions and 10,976 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
target/
.DS_Store
crowdin.yaml
MuseoSans*.woff
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Changelog
1.3.2 (2018-08-09)
==================
- Add migration screen
- Add alert notice

1.2.5 (2018-03-28)
==================
- Reword help page
Expand Down
161 changes: 161 additions & 0 deletions src/main/assets/stylesheets/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,164 @@
@import "controllers/wallet/send/perform";
@import "controllers/wallet/help";
@import "controllers/wallet/operations";
@import "controllers/go_live";


@font-face {
font-family: 'MuseoSans';
src: local('MuseoSans'), local('MuseoSans-Regular'), url('./fonts/MuseoSans500.woff') format('woff');
font-weight: 500;
font-style: normal;
}

@font-face {
font-family: 'MuseoSans';
src: local('MuseoSans'), local('MuseoSans-Light'), url('./fonts/MuseoSans300.woff') format('woff');
font-weight: 300;
font-style: normal;
}

@live-color-white: #FFFFFF;
@live-color-black: #000000;
@live-color-blue: #6490f1;
@live-color-grey: #999999;
@live-color-dark-grey: #666666;
@live-color-soft-grey: #d8d8d8;
@live-screenshot-hack-top: -127px;
@live-screenshot-hack-left: 180px;

.go-live-screen {
background-color: @live-color-white;
display: flex;

height: 100%;
flex-grow: 1;
flex-direction: column;
align-items: center;
justify-content: center;

> p {
height: 0px;
overflow: visible;
position: relative;
top: @live-screenshot-hack-top;
left: @live-screenshot-hack-left;

> img {

}
}

> .content-frame {
background-color: @live-color-white;
display: flex;
align-items: center;
justify-content: center;
height: 100%;
width: 1028px;
flex-direction: column;
position: relative;

> div {
display: flex;
width: 343px;
max-width: 343px;
flex-direction: column;
.live-text-museo {
font-family: MuseoSans;
font-size: 14px;
font-weight: 500;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: normal;
}

.live-text-opensans {
font-family: 'Open Sans';
font-size: 14px;
font-weight: 500;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: normal;
}

h1 {
.live-text-museo();
font-size: 40px;
font-weight: 300;
margin-top: 0px;

letter-spacing: -1.5px;
color: @live-color-black;
b {
font-weight: 500;
}
}

h2 {
.live-text-museo();
font-size: 20px;
font-weight: 300;
line-height: 1.5;
margin-top: 15px;
color: @live-color-grey;
}

h3 {
.live-text-museo();
color: @live-color-blue;
margin-top: 16px;
}

p {
max-width: 463px;
.live-text-opensans();
font-size: 14px;
line-height: 2.14;
margin-top: 20px;
color: @live-color-dark-grey;
}

a {
text-decoration: none;
&:hover {
cursor: pointer;
}
}

#go {
width: 184px;
.live-text-museo();
color: @live-color-white;
background-color: @live-color-blue;
border-radius: 4px;
padding-left: 23px;
padding-right: 23px;
padding-top: 12px;
padding-bottom: 12px;
margin-top: 38px;
text-decoration: none;

&.larger {
width: 210px;
}
}

#skip {
.live-text-museo();
font-size: 13px;
color: @live-color-blue;
margin-top: 21px;
}

#support {
.live-text-museo();
font-size: 13px;
color: @live-color-grey;
margin-top: 17px;
}
}
}
}
Empty file.
Binary file added src/main/resources/images/live/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/main/resources/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_application_name__",
"description": "__MSG_application_small_description__",
"version": "1.2.5",
"version": "2.0.0",
"default_locale": "en",
"minimum_chrome_version": "50",
"app": {
Expand Down
25 changes: 0 additions & 25 deletions src/main/resources/templates/onboarding/alert.html

This file was deleted.

23 changes: 23 additions & 0 deletions src/main/resources/templates/onboarding/go_live.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<div class="go-live-screen" ng-controller="LedgerLiveController as ctrl">
<div class="content-frame">
<div>
<h3>NOW AVAILABLE</h3>
<h1>
Ledger <b>Live</b>
</h1>
<h2>
The all-in-one companion app<br/>for your Ledger devices
</h2>
<p>
Ledger Live is a new all-in-one computer application for your Ledger device that runs on Windows, Mac and Linux. With a feature-packed, yet user-friendly experience for both power users and newbies, it is designed to replace the Ledger Chrome Apps.
</p>
<a id="go" ng-click="ctrl.download()">
Get Ledger Live now!
</a>
<a id="support" ng-click="ctrl.openHelpCenter()">Contact support</a>
</div>
</div>
<p>
<img src="images/live/screenshot.png" width="277" height="237"/>
</p>
</div>
15 changes: 0 additions & 15 deletions src/main/resources/templates/onboarding/launch.html

This file was deleted.

19 changes: 0 additions & 19 deletions src/main/resources/templates/onboarding/linux.html

This file was deleted.

21 changes: 0 additions & 21 deletions src/main/resources/templates/onboarding/opening.html

This file was deleted.

31 changes: 0 additions & 31 deletions src/main/resources/templates/onboarding/select.html

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/resources/templates/onboarding/split-disclaimer.html

This file was deleted.

Loading

0 comments on commit 4f3c7f4

Please sign in to comment.