Skip to content

add licesnse screen #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
carryforward wants to merge 20 commits into
base: develop
Choose a base branch
from
Open

add licesnse screen #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6c5573c
Create terms page and Add CSS source files.
marianomrph Sep 12, 2017
3095664
Update styles for terms and conditions
marianomrph Sep 13, 2017
2dd9768
Change accept terms UI
marianomrph Sep 14, 2017
ec60e97
Updated to have terms of agreement
Emyrk Sep 30, 2017
d4bed23
Update terms
Emyrk Oct 1, 2017
73d5833
Update terms to not use form
Emyrk Oct 1, 2017
a70bb04
Change the Continue button to <a> tag
marianomrph Oct 1, 2017
2dd77e9
Add disabled state to Continue button
marianomrph Oct 1, 2017
63d5404
Move draggable to just header. Added disabled button
Emyrk Oct 1, 2017
4083a7c
Remove cursor pointer down arrow
marianomrph Oct 1, 2017
99c99cc
Fix margins left and right. Add margin left to <ul>
marianomrph Oct 1, 2017
293b5f2
Fix horizontal scroll
marianomrph Oct 1, 2017
58db172
Added disabled switch to terms and added link to github license
Emyrk Oct 2, 2017
c9d320d
Disabled pointer-events for continue button
marianomrph Oct 2, 2017
6cd7ac3
Bump version and compile in all static files
Emyrk Oct 2, 2017
a4a4f88
Add box shadow to footer
marianomrph Oct 2, 2017
a18d963
Added multiple versions for accepting terms
Emyrk Oct 10, 2017
f432bc4
Merge branch 'reskin' of github.com:FactomProject/enterprise-wallet i…
Emyrk Oct 10, 2017
bde8752
Added better homedir locating for windows 10 users
Emyrk Oct 10, 2017
2204cd5
Adjust how commas are added in agree file
Emyrk Oct 10, 2017
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 electron-wrapper/app/loading/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
293 changes: 276 additions & 17 deletions electron-wrapper/app/loading/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ body {
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
background: rgba(0, 0, 0, 0.2);
}
img {
-ms-interpolation-mode: nearest-neighbor;
Expand Down Expand Up @@ -71,9 +70,18 @@ h2 {
font-weight: 700;
line-height: 22px;
}
h3 {
margin-bottom: 10px;
font-size: 16px;
font-weight: 700;
line-height: 22px;
}
p:not(:last-child) {
margin-bottom: 10px;
}
.pointer {
cursor: pointer;
}
.wrapper {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -92,8 +100,26 @@ p:not(:last-child) {
height: 500px;
background: -webkit-gradient(linear, left bottom, left top, from(#1F1B2F), to(#434058));
background: linear-gradient(0deg, #1F1B2F 0%, #434058 100%);
-webkit-box-shadow: 0 0 26px rgba(0, 0, 0, 0.4);
box-shadow: 0 0 26px rgba(0, 0, 0, 0.4);
}
.terms-wrapper {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
width: 1000px;
height: 500px;
overflow: hidden;
background: -webkit-gradient(linear, left bottom, left top, from(#1F1B2F), to(#434058));
background: linear-gradient(0deg, #1F1B2F 0%, #434058 100%);
}
.wallet {
display: -webkit-box;
Expand Down Expand Up @@ -135,6 +161,39 @@ header.home {
header.home .logo {
margin-bottom: 10px;
}
header.terms-header {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
width: 100%;
padding: 0 32px;
margin: 20px 0 5px;
color: #FFF
}
header.terms-header h1 {
margin-bottom: 10px;
}
header.terms-header .logo {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
margin-bottom: 10px;
font-size: 16px
}
header.terms-header .logo img {
margin-left: 16px;
width: 30px;
height: auto;
}
header.section {
display: -webkit-box;
display: -ms-flexbox;
Expand Down Expand Up @@ -208,6 +267,9 @@ footer .logo-footer {
footer span {
margin-right: 10px;
}
footer.footer-terms {
width: 100%;
}
.select-wallet {
display: -webkit-box;
display: -ms-flexbox;
Expand Down Expand Up @@ -427,7 +489,6 @@ a.back:hover {
cursor: pointer;
}
.content .col-2 .checkbox input[type="checkbox"] {
/* display:none; */
opacity: 0;
position: absolute;
}
Expand All @@ -436,11 +497,9 @@ a.back:hover {
-webkit-transition: opacity 0.2s ease-in-out;
transition: opacity 0.2s ease-in-out;
}

.content .col-2 .checkbox input[type="checkbox"]:focus + label {
opacity: 0.8;
}

.content .col-2 .checkbox input[type="checkbox"]:checked + label {
opacity: 1;
}
Expand All @@ -459,14 +518,13 @@ a.back:hover {
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}

.content .col-2 .checkbox input[type="checkbox"]:focus + label span {
border: 2px solid #EDB820;
box-shadow: 0 0 10px rgba(255, 255, 255, 0.4);
-webkit-box-shadow: 0 0 10px rgba(255, 255, 255, 0.4);
box-shadow: 0 0 10px rgba(255, 255, 255, 0.4);
}

.content .col-2 .checkbox input[type="checkbox"]:checked + label span {
border: 2px solid #EDB820;
border: 2px solid #EDB820
}
.content .col-2 .checkbox input[type="checkbox"]:checked + label span::before {
content: '';
Expand Down Expand Up @@ -502,15 +560,13 @@ a.back:hover {
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out
}

.content .col-2 button:focus {
box-shadow: 0 0 10px rgba(255, 255, 255, 0.4);
-webkit-box-shadow: 0 0 10px rgba(255, 255, 255, 0.4);
box-shadow: 0 0 10px rgba(255, 255, 255, 0.4);
}

.content .col-2 button:hover {
background: rgba(255, 255, 255, 0.05)
background: rgba(255, 255, 255, 0.05);
}

.content .col-2 button:disabled {
border: 1px solid #FFF;
opacity: 0.5;
Expand Down Expand Up @@ -822,7 +878,210 @@ aside.light-theme footer .wallet-type .wallet-icon img {
-webkit-transform: scaleY(1.0);
}
}

.pointer {
.terms {
position: relative;
height: 344px;
margin: auto -14px;
overflow-y: scroll;
padding: 24px 40px;
color: #000;
background: rgb(247, 247, 247);
}
.terms p {
font-size: 13px;
line-height: 24px;
}
.terms ul {
margin-left: 20px;
}
.terms-wrapper .accept-terms {
position: relative;
height: 52px;
margin: auto -14px;
padding: 0 40px;
background: rgb(247, 247, 247);
border-top: 1px solid #F5E3AF;
-webkit-box-shadow: 0 0 20px rgba(0, 0, 0, 0.25);
box-shadow: 0 0 20px rgba(0, 0, 0, 0.25);
z-index: 200;
overflow: hidden
}
.terms-wrapper .accept-terms > div {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-transform: translateY(-36px);
transform: translateY(-36px);
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
-webkit-transition-delay: 0.5s;
transition-delay: 0.5s
}
.terms-wrapper .accept-terms > div.scrolled {
-webkit-transform: translateY(11px);
transform: translateY(11px);
}
.terms-wrapper .accept-terms .scroll-bounce {
-ms-flex-negative: 0;
flex-shrink: 0;
width: 36px;
height: 36px;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
border-radius: 50%;
color: #302c42;
border: 1px solid #EDB820;
-webkit-animation: bounce 1s ease infinite;
animation: bounce 1s ease infinite;
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out
}
.terms-wrapper .accept-terms .scroll-bounce img {
width: 20px;
}
.terms-wrapper .accept-terms .scroll-bounce:hover {
background: #FFF;
}
.terms-wrapper .accept-terms .scroll-bounce.scrolled {
-webkit-transform: translateY(40px);
transform: translateY(40px);
-webkit-animation: none;
animation: none;
}
.terms-wrapper .accept-form {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
margin-bottom: 20px;
}
.terms-wrapper .checkbox {
position: relative;
color: #000;
}
.terms-wrapper .checkbox label {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
font-weight: 700;
cursor: pointer;
}
.terms-wrapper .checkbox input[type="checkbox"] {
opacity: 0;
position: absolute;
}
.terms-wrapper .checkbox input[type="checkbox"] + label {
opacity: 0.5;
-webkit-transition: opacity 0.2s ease-in-out;
transition: opacity 0.2s ease-in-out;
}
.terms-wrapper .checkbox input[type="checkbox"]:checked + label {
opacity: 1;
}
.terms-wrapper .checkbox input[type="checkbox"] + label span {
-ms-flex-negative: 0;
flex-shrink: 0;
position: relative;
display:inline-block;
width:19px;
height:19px;
margin: 0 8px 0 0;
vertical-align:middle;
border: 2px solid #000;
border-radius: 4px;
cursor:pointer;
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
.terms-wrapper .checkbox input[type="checkbox"]:focus + label span {
border: 2px solid #EDB820;
-webkit-box-shadow: 0 0 10px rgba(255, 255, 255, 0.4);
box-shadow: 0 0 10px rgba(255, 255, 255, 0.4);
}
.terms-wrapper .checkbox input[type="checkbox"]:checked + label span {
border: 2px solid #EDB820
}
.terms-wrapper .checkbox input[type="checkbox"]:checked + label span::before {
content: '';
width: 9px;
height: 5px;
position: absolute;
top: 2px;
left: 2px;
border: 2px solid #EDB820;
border-top: none;
border-right: none;
opacity: 1;
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg);
}
.terms-wrapper #proceed-button {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
height: 30px;
padding: 0 16px;
margin-left: 20px;
background: none;
font-family: 'Open Sans', sans-serif;
color: #302c42;
font-weight: 700;
border: 1px solid #302c42;
border-radius: 15px;
cursor: pointer;
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out
}
.terms-wrapper #proceed-button:focus {
-webkit-box-shadow: 0 0 10px rgba(237, 184, 32, 0.4);
box-shadow: 0 0 10px rgba(237, 184, 32, 0.4);
}
.terms-wrapper #proceed-button:hover {
color: #FFF;
background: #302c42;
}
.terms-wrapper #proceed-button.disabled {
pointer-events: none;
cursor: default;
background: rgba(0, 0, 0, 0.1);
color: rgba(0, 0, 0, 0.3);
border: 1px solid rgba(0, 0, 0, 0.1);
}
@-webkit-keyframes bounce {
0% { -webkit-transform: translateY(-8px); transform: translateY(-8px); }
50% { -webkit-transform: translateY(-4px); transform: translateY(-4px); }
100% { -webkit-transform: translateY(-8px); transform: translateY(-8px); }
}
@keyframes bounce {
0% { -webkit-transform: translateY(-8px); transform: translateY(-8px); }
50% { -webkit-transform: translateY(-4px); transform: translateY(-4px); }
100% { -webkit-transform: translateY(-8px); transform: translateY(-8px); }
}
Loading