Skip to content

Commit

Permalink
Merge pull request #449 from DemocracyEarth/templating
Browse files Browse the repository at this point in the history
Dynamic Templates
  • Loading branch information
santisiri authored Jan 29, 2019
2 parents a64967a + 39cfa73 commit 0aec74a
Show file tree
Hide file tree
Showing 78 changed files with 39,783 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ [email protected]
houston:admin
# meteortoys:allthings
edgee:slingshot
http@1.4.1
http
[email protected]
[email protected]
[email protected]
Expand Down
4 changes: 0 additions & 4 deletions client/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width, height=device-height" />
<meta name="generator" content="Webflow">

<!-- Mobile -->
<link rel="shortcut icon" type="image/x-icon" href="/images/olive.png">
<link rel="apple-touch-icon" href="/images/olive.png">

</head>
5 changes: 5 additions & 0 deletions config/development/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,12 @@
"sites": {
"tokens": "https://token.democracy.earth",
"blockExplorer": "https://etherscan.io"
},

"template": {
"settings": "/templates/sovereign/sovereign.json"
}

},

"web3" : {
Expand Down
10 changes: 6 additions & 4 deletions i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@
"domain": "Domain",
"email-valid-domain": "Verified E-mail Domain",
"electorate-sentence-anyone": "Anyone",
"electorate-sentence-anyone-textonly": "Anyone logged in can vote on this proposal.",
"electorate-sentence-anyone-textonly": "You are allowed to vote on this proposal.",
"cancel": "Cancel",
"electorate-requisites": "Election Requisites",
"electorate-sentence-only": "{{setting0}}",
Expand Down Expand Up @@ -620,11 +620,13 @@
"ledger-peer-posts": "Transactions by @{{asset}}",
"start-a-democracy": "Start an Organization",
"landing-title": "Governance for <br>decentralized networks.",
"landing-tagline": "Democracy Earth enables token-powered commmunity participation. Built with open source technology over peer to peer protocols.",
"join": "Join Now",
"landing-tagline": "Democracy Earth enables token-powered commmunity participation with open source code over peer to peer protocols.",
"join": "Get Started",
"email": "E-mail",
"home": "Home",
"paper": "Paper",
"code": "Code",
"foundation": "Foundation"
"foundation": "Foundation",
"edit-profile": "Edit Profile",
"configure-keys": "Configure Keys"
}
1 change: 1 addition & 0 deletions imports/startup/both/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ Router.configure({
notFoundTemplate: 'notFound',
});


/**
* @summary home route
*/
Expand Down
6 changes: 0 additions & 6 deletions imports/startup/client/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import '/imports/ui/css/lib/normalize.css';
import '/imports/ui/css/lib/webflow.css';
import '/imports/ui/css/earth.css';
import '/imports/ui/css/extra.css';
import '/imports/ui/css/medium-editor.css';
import '/imports/ui/css/medium-editor-insert-plugin.css';
import '/imports/startup/both/routes.js';
import '/imports/startup/client/subscribe.js';
import '/imports/startup/client/raven.js';
8 changes: 4 additions & 4 deletions imports/ui/css/extra.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

/* Change the white to any color ;) */
input:-webkit-autofill {
-webkit-text-fill-color: white !important;
-webkit-box-shadow: 0 0 0px 1000px #3A3044 inset;
-webkit-text-fill-color: #5a0075 !important;
-webkit-box-shadow: 0 0 0px 1000px #eaeaea inset;
}
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
input:-webkit-autofill:active {
transition: #3A3044 5000s ease-in-out 0s;
-webkit-box-shadow: 0 0 0px 1000px #3A3044 inset;
transition: #eaeaea 5000s ease-in-out 0s;
-webkit-box-shadow: 0 0 0px 1000px #eaeaea inset;
}

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

0 comments on commit 0aec74a

Please sign in to comment.