Skip to content

Commit

Permalink
Merge pull request #459 from DemocracyEarth/qv
Browse files Browse the repository at this point in the history 
Quick fixes for mainnet deploy
  • Loading branch information
@santisiri
santisiri authored Mar 8, 2019
2 parents f483c5d + 075c3fd commit 0eb7c67
Show file tree
Hide file tree
Showing 19 changed files with 263 additions and 109 deletions.
4 changes: 4 additions & 0 deletions config/development/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
"proposalDrafting": true,
"appCache": false,
"mailNotifications": false,
"token": {
"defaultCode": "HOUR"
},
"permissioned": {
"active": false,
"checkDomain": false,
Expand Down Expand Up @@ -95,6 +98,7 @@
}
},
"logo": "images/olive.png",
"logoExtended": "images/democracy-earth-text-black.png",
"jurisdiction": {
"legal": {
"taxId": "37-1776296",
Expand Down
6 changes: 3 additions & 3 deletions i18n/en.i18n.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@
"blockchain-tutorial": "Blockchain Tutorial",
"get-dapp-browser": "Install recommended Dapp Browser",
"get-web3-wallet": "Install recommended Web3 Wallet",
"ethereum-dapp-browsers": "Sign In with Browser",
"ethereum-dapp-browsers": "Ethereum Sign In",
"ethereum-web3-wallet": "Ethereum Sign In",
"feed-token-posts": "Posts with {{asset}} Token",
"feed-geo-posts": "Posts from {{asset}}",
Expand All @@ -622,8 +622,8 @@
"feed-peer-posts": "Posts by @{{asset}}",
"ledger-peer-posts": "Transactions by @{{asset}}",
"start-a-democracy": "Start an Organization",
"landing-title": "Free, sovereign and incorruptible elections.",
"landing-tagline": "Democracy Earth enables token-based commmunity participation. Built with open source code over peer to peer protocols.",
"landing-title": "Free, sovereign and incorruptible governance.",
"landing-tagline": "Democracy Earth enables token-based community participation. Open source, peer to peer and human centered.",
"join": "Get Started",
"email": "E-mail",
"home": "Home",
Expand Down
109 changes: 67 additions & 42 deletions imports/ui/css/sovereign.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ body {
padding-right: 0px;
padding-left: 0px;
background-color: #fff;
background-image: none;
font-family: 'Open Sans', sans-serif;
color: rgba(0, 0, 0, .87);
font-size: 18px;
line-height: 28px;
font-weight: 400;
font-weight: 300;
}

h1 {
Expand Down Expand Up @@ -76,7 +77,7 @@ p {
}

a {
color: #ff0085;
color: #ff617e;
text-decoration: none;
cursor: pointer;
}
Expand Down Expand Up @@ -286,7 +287,7 @@ blockquote {
border-color: #f3f3f3 #e0e0e0 #e0e0e0 #f3f3f3;
border-radius: 5px;
background-color: #eaeaea;
box-shadow: 0 6px 20px 4px rgba(0, 0, 0, .13);
box-shadow: 0 6px 20px 4px rgba(0, 0, 0, .2);
color: #000;
}

Expand Down Expand Up @@ -901,8 +902,8 @@ blockquote {

.button.login-button:hover {
border-style: solid;
border-color: #ff0085;
background-color: #ff0085;
border-color: #ff617e;
background-color: #ff617e;
color: #fff;
}

Expand All @@ -924,8 +925,8 @@ blockquote {
padding-top: 10px;
padding-bottom: 10px;
border-style: none;
border-color: #ff0085;
background-color: #ff0085;
border-color: #ff617e;
background-color: #ff617e;
color: #fff;
}

Expand Down Expand Up @@ -1052,29 +1053,29 @@ blockquote {
}

.button.button-upload:hover {
border-color: #ff0085;
border-color: #ff617e #ff617e hsla(348.9873417721519, 100.00%, 69.02%, 1.00);
}

.button.button-upload:active {
background-color: rgba(255, 0, 133, .07);
background-color: hsla(348.9873417721519, 100.00%, 69.02%, 0.07);
}

.button.button-cta {
width: 40%;
height: 40px;
margin: 0px;
padding-top: 8px;
padding-top: 7px;
padding-bottom: 10px;
float: left;
clear: none;
border-radius: 0px 5px 5px 0px;
font-size: 14px;
font-size: 12px;
text-align: center;
}

.button.button-cta:hover {
border-color: #fe6580;
background-color: #ff0085;
background-color: #ff617e;
}

.button.button-menu {
Expand Down Expand Up @@ -1370,7 +1371,7 @@ blockquote {
box-shadow: 0 2px 8px 0 hsla(0, 0%, 72%, .37);
-webkit-transition: all 200ms ease;
transition: all 200ms ease;
color: #7d849f;
color: #000;
cursor: pointer;
}

Expand Down Expand Up @@ -2066,8 +2067,8 @@ blockquote {
margin: 0px 5px 5px 0px;
padding: 10px;
border-radius: 5px;
background-color: #e2e2e6;
color: #7d8499;
background-color: #feda96;
color: #ff9e84;
font-size: 14px;
line-height: 30px;
}
Expand Down Expand Up @@ -3909,7 +3910,7 @@ blockquote {

.login-input:focus {
border-bottom-width: 1px;
border-bottom-color: #ff0085;
border-bottom-color: hsla(348.9873417721519, 100.00%, 69.02%, 1.00);
}

.login-input.login-input-split {
Expand Down Expand Up @@ -4076,7 +4077,7 @@ blockquote {
}

.navbar-button.navbar-button-active.navbar-button-action:hover {
background-color: #ff0085;
background-color: #ff617e;
}

.navbar-button.navbar-button-active.navbar-button-action.navbar-button-action-disabled {
Expand Down Expand Up @@ -4168,11 +4169,11 @@ blockquote {
}

.suggest-item:hover {
background-color: rgba(255, 0, 133, .06);
background-color: hsla(348.9873417721519, 100.00%, 69.02%, 0.06);
}

.suggest-item:active {
background-color: #ff0085;
background-color: hsla(348.9873417721519, 100.00%, 69.02%, 1.00);
color: #fff;
}

Expand Down Expand Up @@ -4391,7 +4392,7 @@ blockquote {
width: 70px;
height: 70px;
border-radius: 50px;
background-color: #00d9ff;
background-color: #ff617e;
box-shadow: 0 2px 20px -5px #000;
color: #fff;
font-weight: 200;
Expand Down Expand Up @@ -4632,7 +4633,7 @@ blockquote {
}

.micro-button:hover {
color: #f04;
color: #ff617e;
}

.micro-button:active {
Expand Down Expand Up @@ -4750,6 +4751,9 @@ blockquote {
margin-top: 10px;
margin-bottom: 10px;
padding: 10px 10px 0px;
border-style: solid;
border-width: 1px;
border-color: rgba(242, 242, 248, 0);
border-radius: 5px;
color: #333;
font-size: 12px;
Expand All @@ -4758,12 +4762,13 @@ blockquote {
}

.collective:hover {
border-color: #e6e0ee;
background-color: #e6e0ee;
}

.collective.collective-selected {
background-color: #5a0075;
color: #fff;
border-color: hsla(286.6666666666667, 100.00%, 22.94%, 1.00);
background-color: #e6e0ee;
}

.collective-icon {
Expand Down Expand Up @@ -6360,12 +6365,17 @@ blockquote {
display: inline-block;
width: 100%;
min-height: 65px;
padding-bottom: 50px;
padding-bottom: 10px;
background-color: #f2f2f8;
font-size: 18px;
line-height: 26px;
}

.hero.hero-landing {
min-height: 400px;
padding-bottom: 10px;
}

.no-underline:hover {
text-decoration: none;
}
Expand All @@ -6385,7 +6395,7 @@ blockquote {
.hero-title {
width: 50%;
max-width: 550px;
margin-bottom: 40px;
margin-bottom: 25px;
margin-left: 5%;
float: left;
text-align: left;
Expand Down Expand Up @@ -6416,7 +6426,9 @@ blockquote {
height: 40px;
padding-left: 10px;
float: left;
border: 1px solid transparent;
border-style: solid none solid solid;
border-width: 1px;
border-color: rgba(90, 0, 117, .17) transparent rgba(90, 0, 117, .17) rgba(90, 0, 117, .17);
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
background-color: #fff;
Expand All @@ -6425,23 +6437,27 @@ blockquote {
}

.hero-cta-input:focus {
border-style: none;
border-style: solid none solid solid;
border-color: #561072 #fff #561072 #561072;
}

.hero-cta-alternative {
position: static;
z-index: 0;
margin-top: 8px;
margin-bottom: 15px;
margin-left: 5px;
float: left;
font-size: 14px;
}

.hero-cta-box {
display: inline-block;
height: 40px;
min-height: 100px;
min-width: 340px;
margin-bottom: -10px;
float: left;
border-top-left-radius: 5px;
box-shadow: 0 4px 23px -10px #000;
}

.hero-menu {
Expand All @@ -6454,15 +6470,10 @@ blockquote {

.hero-logo {
max-height: 32px;
margin: 12px 10px;
margin: 14px 10px;
float: left;
}

.hero-logo:active {
margin-top: 14px;
margin-bottom: 10px;
}

.hero-button {
display: inline-block;
margin-right: 15px;
Expand Down Expand Up @@ -6523,6 +6534,7 @@ blockquote {
.hero-navbar.hero-navbar-scroller {
border-bottom: 1px solid #e8e8e8;
background-color: #f2f2f8;
box-shadow: 0 10px 50px 10px rgba(0, 0, 0, .15);
}

.hero-demo {
Expand Down Expand Up @@ -6581,6 +6593,17 @@ blockquote {
text-align: right;
}

.hero-warn {
position: static;
z-index: 1;
padding-top: 50px;
padding-left: 5px;
}

.hero-home-button:active {
margin-top: 2px;
}

@media (max-width: 991px) {
.contract {
margin-right: 15px;
Expand Down Expand Up @@ -6730,6 +6753,7 @@ blockquote {
}
.split.split-left {
width: 100%;
margin-top: 70px;
}
.smart {
display: block;
Expand Down Expand Up @@ -6766,6 +6790,7 @@ blockquote {
width: 80%;
}
.hero-cta-box {
min-height: 0px;
margin-bottom: 10px;
}
.hero-demo {
Expand Down Expand Up @@ -7141,6 +7166,7 @@ blockquote {
}
.card-title {
margin-top: 5px;
padding-right: 30px;
}
.agora {
margin-top: -15px;
Expand Down Expand Up @@ -7217,18 +7243,14 @@ blockquote {
.margin-bottom-dead {
margin-bottom: 0px;
}
.login-button-last {
margin-top: 15px;
margin-bottom: 15px;
}
.hero-title {
margin-left: 40px;
margin-left: 25px;
}
.hero-call-to-action {
margin-left: 40px;
margin-left: 25px;
}
.hero-cta-box {
box-shadow: none;
min-width: 280px;
}
.hero-menu {
padding-right: 0px;
Expand All @@ -7246,6 +7268,9 @@ blockquote {
.hero-button.hero-button-mobile.hero-signin {
margin-right: 15px;
}
.hero-home-button {
display: inline-block;
}
}

@media (max-width: 479px) {
Expand Down
Loading

0 comments on commit 0eb7c67

Please sign in to comment.