From b70a537088893b4bd787b55a493d3e6a0e353502 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 20 Aug 2014 17:04:20 -0700 Subject: single column front page --- amber/layouts/home.html.haml | 10 ++---- amber/locales/en.yml | 1 + amber/locales/es.yml | 5 +-- pages/assets/style.scss | 10 +++--- pages/assets/variables.scss | 4 +-- pages/home/_code.en.text | 12 +++---- pages/home/_text.haml | 83 +++++++++++++++++++++----------------------- 7 files changed, 59 insertions(+), 66 deletions(-) diff --git a/amber/layouts/home.html.haml b/amber/layouts/home.html.haml index 4a35f89..a8c76fa 100644 --- a/amber/layouts/home.html.haml +++ b/amber/layouts/home.html.haml @@ -15,21 +15,17 @@ #masthead = render 'layouts/masthead' #main - .darker + .dark .container .row - .col-sm-9 + .col-sm-12 .introtext = render 'home/intro' - .col-sm-3 .download.text-left %a.btn.btn-large.btn-primary{:href => 'install'} %i.fa.fa-download.fa-2x %span = t :download_bitmask - .container - .shadow-box - .content-box - = yield :content + = yield :content #footer = render 'layouts/footer' diff --git a/amber/locales/en.yml b/amber/locales/en.yml index 763a3d1..6c6f48e 100644 --- a/amber/locales/en.yml +++ b/amber/locales/en.yml @@ -19,6 +19,7 @@ en: # # front page text # + services: Services fork_our_code: Fork our code about_us: About us supported_providers: Supported providers diff --git a/amber/locales/es.yml b/amber/locales/es.yml index 0022b5b..b7681b0 100644 --- a/amber/locales/es.yml +++ b/amber/locales/es.yml @@ -7,12 +7,13 @@ es: downloads: Descargas download: Descargar warning: > - ADVERTENCIA: Bitmask está todavía en fase experimental. Por favor, no uses estas versiones beta + ADVERTENCIA: Bitmask está todavía en fase experimental. Por favor, no uses estas versiones beta de Bitmask en situaciones en las que un compromiso de tus datos podría ponerte en peligro. # # front page text # + services: Servicios fork_our_code: Clónate nuestro código about_us: Quiénes somos supported_providers: Proveedores soportados @@ -26,5 +27,5 @@ es: tu proveedor antes de ser descifrado y enviado a la Internet abierta. encrypted_email: Correo Electrónico Cifrado encrypted_email_blurb: > - El [[Mail Cifrado Bitmask => features#email]] es fácil de usar, permaneciendo + El [[Mail Cifrado Bitmask => features#email]] es fácil de usar, permaneciendo compatible con el protocolo OpenPGP existente para correo electrónico seguro. diff --git a/pages/assets/style.scss b/pages/assets/style.scss index ebc7bf3..4f6546d 100644 --- a/pages/assets/style.scss +++ b/pages/assets/style.scss @@ -363,8 +363,8 @@ body.home { span { color: #333; } - margin: 20px 0 15px 0; - font-size: 36px; + margin: 20px 0 0px 0; + font-size: 28px; } .thumbnail { word-break: break-all; @@ -398,14 +398,14 @@ body.home { color: lighten($link-visited-color, 30%); } } - .dark { - background-color: lighten($home-dark-background-color, 5%); + .darker { + background-color: darken($home-dark-background-color, 5%); } .light, .lighter { color: $home-light-color; background-color: $home-light-background-color; } - .light { + .lighter { background-color: lighten($home-light-background-color, 20%); } .b { diff --git a/pages/assets/variables.scss b/pages/assets/variables.scss index f1ad236..98112dd 100644 --- a/pages/assets/variables.scss +++ b/pages/assets/variables.scss @@ -42,8 +42,8 @@ $navigation-shadow: 1px 1px 4px #111; $link-color: darken($masthead-background-color, 15%); $link-visited-color: darken($masthead-background-color, 25%); -$home-light-color: #fff; -$home-light-background-color: #111; +$home-light-color: #000; +$home-light-background-color: #eee; $home-dark-color: #fff; $home-dark-background-color: $background-color; diff --git a/pages/home/_code.en.text b/pages/home/_code.en.text index abeea65..fca1312 100644 --- a/pages/home/_code.en.text +++ b/pages/home/_code.en.text @@ -2,11 +2,11 @@ In particular, if you have finely honed skill in Python, Android Java, Ruby, C, CouchDB, Windows, Mac, Puppet, Qt, or you really love crypto, we could sure use your help. -* [[Fork our code => https://leap.se/en/source]] -* Create a new branch from develop called feature/x or bugfix/x. -* Hack away. -* Issue a pull request on github from your feature or bugfix branch to the upstream develop branch. -* Discuss and wait for request to be merged. -* Repeat. +# [[Fork our code => https://leap.se/en/source]] +# Create a new branch from develop called feature/x or bugfix/x. +# Hack away. +# Issue a pull request on github from your feature or bugfix branch to the upstream develop branch. +# Discuss and wait for request to be merged. +# Repeat. Currently, we release a new version of the Bitmask application every three weeks, and other components as necessary. diff --git a/pages/home/_text.haml b/pages/home/_text.haml index 6f59d01..a6338cd 100644 --- a/pages/home/_text.haml +++ b/pages/home/_text.haml @@ -1,35 +1,32 @@ -.row - .col-sm-12 - %p.big - = t :bitmask_app_blurb - -.row - .col-sm-6 - .heading - %span - %i.fa.fa-shield - = t :bitmask_vpn - %p.big - = t :bitmask_vpn_blurb - .col-sm-6 - .heading - %span - %i.fa.fa-envelope - = t :encrypted_email - %p.big - = t :encrypted_email_blurb - -.row - .col-sm-12 - .heading#providers - %span - %i.fa.fa-institution - = t :supported_providers - - %p.big - = t :supported_providers_text +.light + .container + .row + .col-sm-12 + %h1.b= t :services + %p.big + = t :bitmask_app_blurb + .col-lg-6 + .heading + %span + %i.fa.fa-shield + = t :bitmask_vpn + %p.big + = t :bitmask_vpn_blurb + .col-lg-6 + .heading + %span + %i.fa.fa-envelope + = t :encrypted_email + %p.big + = t :encrypted_email_blurb +.lighter + .container .row + .col-sm-12 + %h1.b#providers= t :supported_providers + %p.big + = t :supported_providers_text .col-lg-2.col-md-3.col-sm-3.col-xs-4 .thumbnail %img(src='/assets/providers/demo.bitmask.net.png') @@ -50,18 +47,16 @@ %img(src='/assets/providers/riseup.net.png') .b [[riseup.net => https://black.riseup.net]] +.light + .container + .row + .col-sm-12 + %h1.b= t :fork_our_code + = render 'home/code' -.row - .col-sm-6 - .heading - %span - %i.fa.fa-code-fork - = t :fork_our_code - = render 'home/code' - - .col-sm-6 - .heading - %span - %i.fa.fa-group - = t :about_us - = render 'home/about' +.lighter + .container + .row + .col-sm-12 + %h1.b= t :about_us + = render 'home/about' -- cgit v1.2.3