diff options
| author | jessib <jessib@riseup.net> | 2013-08-01 10:52:04 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-08-01 10:52:04 -0700 |
| commit | 368dbc55966b2b74699065e07de28fe321f286b6 (patch) | |
| tree | 7c03bf78596e9e2a7735518ba713eaacd864a975 /app/views/home | |
| parent | 3578c13abd86d15ca6310bf5652f4855a8daa1a8 (diff) | |
| parent | 1a3fdad01d9cb2e2596281d38ce0c0f1ad4da04a (diff) | |
Merge branch 'master' into billing_with_tests
Conflicts:
app/views/home/index.html.haml
Diffstat (limited to 'app/views/home')
| -rw-r--r-- | app/views/home/index.html.haml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 9b82cf3..258ccec 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,14 +1,17 @@ -%h1= t(:welcome, :provider => APP_CONFIG[:domain]) +#main + .container-fluid + .row-fluid + %h1= t(:welcome, :provider => APP_CONFIG[:domain]) -%p - We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later). + %p + We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later). -= home_page_buttons + = home_page_buttons -- if Rails.env == 'development' - .row-fluid - %hr - %p - = link_to "fetch a cert", cert_path + - if Rails.env == 'development' + .row-fluid + %hr + %p + = link_to "fetch a cert", cert_pat +- # TODO: will want link to donation (anonymous payment), which is new_payment_path -- # TODO: will want link to donation (anonymous payment), which is new_payment_path
\ No newline at end of file |