Commit d93301fb109b1fb98dfcfa151abb2cdf184af790
merged uniqorn changes
Joran committed on 12/19/2016, 3:50:50 AMParent: 69634bbd4cccb6c1a2d6af7a71f87d1e86f076c2
Files changed
| app/assets/stylesheets/creative.css.erb | ||
|---|---|---|
| @@ -35,8 +35,21 @@ | ||
| 35 | 35 … | a:focus { |
| 36 | 36 … | color: #eb3812; |
| 37 | 37 … | } |
| 38 | 38 … | |
| 39 … | +.white { | |
| 40 … | + color: #FFFFFF; | |
| 41 … | + text-decoration: underline; | |
| 42 … | + -webkit-transition: all .35s; | |
| 43 … | + -moz-transition: all .35s; | |
| 44 … | + transition: all .35s; | |
| 45 … | +} | |
| 46 … | + | |
| 47 … | +.white:hover, | |
| 48 … | +.white:focus { | |
| 49 … | + color: #eb3812; | |
| 50 … | +} | |
| 51 … | + | |
| 39 | 52 … | h1, |
| 40 | 53 … | h2, |
| 41 | 54 … | h3, |
| 42 | 55 … | h4, |
| app/assets/stylesheets/uniquorn.css | ||
|---|---|---|
| @@ -1,0 +1,11 @@ | ||
| 1 … | +.ghost-button-lightblue | |
| 2 … | +{ | |
| 3 … | + background-color: rgba(24,100,147,0.5); | |
| 4 … | + margin-top: 1em; | |
| 5 … | +} | |
| 6 … | + | |
| 7 … | +.ghost-button | |
| 8 … | +{ | |
| 9 … | + background-color: rgba(26,45,111,0.5); | |
| 10 … | + margin-top: 1em; | |
| 11 … | +} | |
| app/views/layouts/_navigation_links.html.haml | ||
|---|---|---|
| @@ -8,12 +8,12 @@ | ||
| 8 | 8 … | Projects |
| 9 | 9 … | %li |
| 10 | 10 … | = link_to page_path('dao') do |
| 11 | 11 … | Our DAO |
| 12 | - -# %li | |
| 13 | - -# = link_to page_path('crowdfund') do | |
| 14 | - -# Crowdfund | |
| 15 | 12 … | %li |
| 13 … | + = link_to page_path('crowdfund') do | |
| 14 … | + Crowdfund | |
| 15 … | + %li | |
| 16 | 16 … | = link_to page_path('map') do |
| 17 | 17 … | Map |
| 18 | 18 … | |
| 19 | 19 … | %li |
| app/views/pages/community.html.haml | ||
|---|---|---|
| @@ -6,30 +6,26 @@ | ||
| 6 | 6 … | .col-lg-12.text-center |
| 7 | 7 … | %h2.section-heading Community |
| 8 | 8 … | |
| 9 | 9 … | .row |
| 10 | - .col-md-8 | |
| 10 … | + .col-sm-8 | |
| 11 | 11 … | .row |
| 12 | - .col-md-6 | |
| 12 … | + .col-sm-9 | |
| 13 | 13 … | %p.lead Entropy Rocket Chat |
| 14 | 14 … | %p |
| 15 | - Live chat here: > | |
| 15 … | + Live chat here: | |
| 16 … | + = image_tag 'https://cdn-www.rocket.chat/images/logo/512x512.png', style:"height:1.5em" | |
| 16 | 17 … | %strong |
| 17 | 18 … | = link_to 'Entropy Rocket', 'https://rocket.project-entropy.com' |
| 18 | 19 … | |
| 19 | 20 … | %p |
| 20 | 21 … | Making use of the open source |
| 21 | 22 … | = link_to 'Rocket.chat', 'https://rocket.chat/' |
| 22 | 23 … | chat platform, join us to help steer the project! |
| 23 | - .col-md-6 | |
| 24 | - %br | |
| 25 | - = image_tag 'https://rocket.chat/images/logo/logo-dark.svg?v3', class: 'img-responsive' | |
| 26 | - .row | |
| 27 | - .col-md-12 | |
| 28 | - %hr | |
| 29 | 24 … | |
| 25 … | + | |
| 30 | 26 … | .row |
| 31 | - .col-md-6 | |
| 27 … | + .col-sm-6 | |
| 32 | 28 … | %p.lead Secure Scuttlebutt |
| 33 | 29 … | %p |
| 34 | 30 … | We're also in the |
| 35 | 31 … | %strong #project-entropy |
| @@ -50,7 +46,7 @@ | ||
| 50 | 46 … | .col-md-6 |
| 51 | 47 … | %br |
| 52 | 48 … | = image_tag 'patchwork.png', class: 'img-responsive' |
| 53 | 49 … | |
| 54 | - .col-md-4 | |
| 50 … | + .col-sm-4 | |
| 55 | 51 … | :plain |
| 56 | 52 … | <a class="twitter-timeline" href="https://twitter.com/EntropyBoat">Tweets by EntropyBoat</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script> |
| app/views/pages/crowdfund.html.haml | ||
|---|---|---|
| @@ -8,13 +8,17 @@ | ||
| 8 | 8 … | .row |
| 9 | 9 … | .col-md-6 |
| 10 | 10 … | %p.lead The Plan |
| 11 | 11 … | %p |
| 12 | - Entropy is an | |
| 13 | - %strong Ethereum-powered floating experiment | |
| 14 | - to crowd-own and steer a fleet of sailing hackspaces around the world - anyone can be part of our global community. | |
| 12 … | + Help spread the blockchain idea across the globe! | |
| 13 … | + With a token, you can become part of the community around | |
| 14 … | + You can join Entropy on various events that will be organised around the world, you can take part in the decision-making of where Entropy will go to next and make more proposals! | |
| 15 | 15 … | %p |
| 16 | - We aim to make it easy to see the value of a DAO and an example of the possibilities open to all as we bravely sail into the new world. | |
| 16 … | + Entropy is a global experiment for digital decision making and cooperativsm that is now made possible with Ethereum. | |
| 17 … | + We will refine the workings of the Entropy DAO as we test it, resulting in a DAO template that is useful for anyone that wants to base their DAO on the same values of equality and fair distribution of power. | |
| 18 … | + All while the crew logs what is happening in videos, posts and pictures! | |
| 19 … | + %p | |
| 20 … | + Have a look below at the outline of our crowdfund and the goals that we want to achieve. | |
| 17 | 21 … | |
| 18 | 22 … | .container |
| 19 | 23 … | .page-header |
| 20 | 24 … | %p.lead Project Entropy will be rolled out in 4 Waves: |
| app/views/visitors/index.html.haml | ||
|---|---|---|
| @@ -47,16 +47,17 @@ | ||
| 47 | 47 … | |
| 48 | 48 … | .row |
| 49 | 49 … | .col-sm-7.col-sm-offset-5.text-box-red.text-right |
| 50 | 50 … | %p.lead |
| 51 | - We're establishing a crowd-owned and community steered fleet of sailing | |
| 52 | - hackspaces around the world - | |
| 51 … | + We're launching a community steered fleet of sailing | |
| 52 … | + hackspaces, starting with a crowd-owned boat that sails around the world | |
| 53 | 53 … | %p.lead |
| 54 | - anyone can be part of our global community and | |
| 55 | - anyone can volunteer to help us sail | |
| 54 … | + anyone can be part of our global community, as a citizen, volunteer crew or skipper | |
| 55 … | + with your own boat | |
| 56 | 56 … | |
| 57 | 57 … | |
| 58 | 58 … | |
| 59 … | + | |
| 59 | 60 … | .header.secondary.community |
| 60 | 61 … | .container |
| 61 | 62 … | .row |
| 62 | 63 … | .col-sm-7.text-box-lightblue.text-left |
| @@ -67,12 +68,16 @@ | ||
| 67 | 68 … | |
| 68 | 69 … | .row |
| 69 | 70 … | .col-sm-7.text-box-lightblue.text-left |
| 70 | 71 … | %p.lead |
| 71 | - With an entropy token you become part of | |
| 72 … | + As a citizen of Entropy, you can be part of | |
| 72 | 73 … | the community that suggests and |
| 73 | - votes on everything the fleet is aiming for | |
| 74 … | + votes on everything the fleet is aiming for - destinations, ideas and projects | |
| 74 | 75 … | |
| 76 … | + .col-sm-7.no-padding | |
| 77 … | + = link_to 'JOIN COMMUNITY', page_path('community'), class:'btn btn-primary btn-lg btn-block ghost-button-lightblue' | |
| 78 … | + | |
| 79 … | + | |
| 75 | 80 … | -# .banner-left.col-lg-7.text-box-white |
| 76 | 81 … | -# .row |
| 77 | 82 … | -# .col-lg-8.col-lg-offset-3.text-right |
| 78 | 83 … | -# %p.lead.right-space |
| @@ -97,12 +102,15 @@ | ||
| 97 | 102 … | %p.lead |
| 98 | 103 … | We are all about being creative |
| 99 | 104 … | %br - manually & digitally. |
| 100 | 105 … | %p.lead |
| 101 | - We want to share this and set aside room and time to develop cool projects, push blockchain and p2p ideas | |
| 106 … | + We want to share this and set aside room and time to develop cool projects, push blockchain, ethereum and p2p ideas | |
| 102 | 107 … | %p.lead |
| 103 | 108 … | all open source of course! |
| 104 | 109 … | |
| 110 … | + .col-sm-7.col-sm-offset-5.text-right.no-padding | |
| 111 … | + = link_to 'projects', page_path('community'), class:'btn btn-primary btn-lg btn-block ghost-button-lightblue' | |
| 112 … | + | |
| 105 | 113 … | .header.secondary.map.text-left |
| 106 | 114 … | .container |
| 107 | 115 … | .row |
| 108 | 116 … | .col-sm-8.text-left.text-box-red |
| @@ -118,11 +126,11 @@ | ||
| 118 | 126 … | |
| 119 | 127 … | |
| 120 | 128 … | |
| 121 | 129 … | %p.lead |
| 122 | - Entropy is growing into a decentralised autonomous organisation with a global | |
| 130 … | + Entropy is growing into a decentralised autonomous organisation (DAO) with a global | |
| 123 | 131 … | community at its heart. |
| 124 | - Among other things you can suggest and vote on the destinations of Entropy | |
| 132 … | + Among other things you can suggest and vote on the destinations of the Entropy Flotilla | |
| 125 | 133 … | |
| 126 | 134 … | |
| 127 | 135 … | .header.secondary.afloat.text-left |
| 128 | 136 … | .container |
| @@ -135,12 +143,25 @@ | ||
| 135 | 143 … | |
| 136 | 144 … | .row |
| 137 | 145 … | .col-sm-7.col-sm-offset-5.text-right.text-box |
| 138 | 146 … | %p.lead |
| 139 | - Citizenship Tokens give you the | |
| 140 | - ability to become part of our community | |
| 147 … | + Crowdfund will start early 2017, where you can become part of the | |
| 148 … | + Entropy community with your citizenship on the Ethereum blockchain. | |
| 149 … | + %p.lead | |
| 150 … | + Do you want to help on the development side? We would love for you to | |
| 151 … | + make Entropy safer, easier, faster. Anyone who successfully | |
| 152 … | + contributes on the | |
| 153 … | + %strong | |
| 154 … | + = link_to 'Entropy Github', 'https://github.com/ProjectEntropy', class:'white' | |
| 155 … | + will become citizen! | |
| 156 … | + %p.lead | |
| 157 … | + Join our | |
| 158 … | + %strong | |
| 159 … | + = link_to 'community', page_path('community'), class: 'white' | |
| 160 … | + and learn how you can become a part of Entropy now. | |
| 141 | 161 … | |
| 142 | 162 … | |
| 163 … | + | |
| 143 | 164 … | %section.no-padding |
| 144 | 165 … | .container-fluid |
| 145 | 166 … | .row.no-gutter |
| 146 | 167 … | .col-lg-3.col-sm-3 |
Built with git-ssb-web