diff options
Diffstat (limited to 'pages')
-rw-r--r-- | pages/assets/rainbow-masthead-centered.png | bin | 25438 -> 12393 bytes | |||
-rw-r--r-- | pages/assets/rainbow-masthead-small.png | bin | 34286 -> 0 bytes | |||
-rw-r--r-- | pages/assets/style.css | 3 | ||||
-rw-r--r-- | pages/common/_email.md | 4 | ||||
-rw-r--r-- | pages/en.haml | 39 | ||||
-rw-r--r-- | pages/linux/_notice.haml | 5 | ||||
-rw-r--r-- | pages/linux/en.md | 6 |
7 files changed, 39 insertions, 18 deletions
diff --git a/pages/assets/rainbow-masthead-centered.png b/pages/assets/rainbow-masthead-centered.png Binary files differindex f7d3165..991539d 100644 --- a/pages/assets/rainbow-masthead-centered.png +++ b/pages/assets/rainbow-masthead-centered.png diff --git a/pages/assets/rainbow-masthead-small.png b/pages/assets/rainbow-masthead-small.png Binary files differdeleted file mode 100644 index 9b7f292..0000000 --- a/pages/assets/rainbow-masthead-small.png +++ /dev/null diff --git a/pages/assets/style.css b/pages/assets/style.css index 241fe65..6d13d04 100644 --- a/pages/assets/style.css +++ b/pages/assets/style.css @@ -3,6 +3,7 @@ width: 100%; background: url(/assets/rainbow-masthead-centered.png) 50% 50% no-repeat; display: block; + background-size: cover; } .bm-bar { @@ -129,4 +130,4 @@ tr.parent a { } .parent a:hover { color:#2281d0; -}
\ No newline at end of file +} diff --git a/pages/common/_email.md b/pages/common/_email.md index 976fe3d..2db279e 100644 --- a/pages/common/_email.md +++ b/pages/common/_email.md @@ -5,13 +5,13 @@ To get encrypted email to work, you have two options: 1. [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/) (recommended) 2. Manual email client configuration -### Bitmask Thunderbird Extension +#### Bitmask Thunderbird Extension 1. Install Bitmask app and register for an account. 2. Install the [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/). 3. Select the Thunderbird menu item `File` > `New` > `Bitmask Account...` -### Manual email client configuration +#### Manual email client configuration * IMAP -- `localhost:1984` * username: the full email address you use with the Bitmask app. diff --git a/pages/en.haml b/pages/en.haml index 7936d53..9e2649f 100644 --- a/pages/en.haml +++ b/pages/en.haml @@ -4,26 +4,35 @@ .col-sm-8.col-sm-offset-2 .p.alert.alert-danger %i.fa.fa-warning - <b>WARNING:</b> Bitmask is still experimental. Please do not use these beta releases of Bitmask for situations where a compromise of your data could put you in danger. Also, although Bitmask is improving rapidly, it is possible that you could lose your email when using an early beta release. + <b>WARNING:</b> Bitmask is still experimental. Please do not use these beta releases of Bitmask for situations where a compromise of your data could put you in danger. + <!-- Also, although Bitmask is improving rapidly, it is possible that you could lose your email when using an early beta release. --> .row.bm-front-buttons .col-sm-3.col-xs-6 - %a.btn.btn-lg.btn-default{:href=>"/linux"} + %a.btn.btn-default{:href=>"/android"} + %i.fa.fa-android.fa-5x + %br + %b Android + %br + %small 4.0 and above + .col-sm-3.col-xs-6 + %a.btn.btn-default{:href=>"/linux"} %i.fa.fa-linux.fa-5x - %br/ - GNU/Linux + %br + %b GNU/Linux + %br + %small Debian, Ubuntu, Mint .col-sm-3.col-xs-6 - %a.btn.btn-lg.btn-default{:href=>"/mac"} + %a.btn.btn-default.disabled{:href=>"/mac"} %i.fa.fa-apple.fa-5x - %br/ - Mac OS + %br + %b Mac OS + %br + %small Coming very soon... .col-sm-3.col-xs-6 - %a.btn.btn-lg.btn-default{:href=>"/windows"} + %a.btn.btn-default.disabled{:href=>"/windows"} %i.fa.fa-windows.fa-5x - %br/ - Windows - .col-sm-3.col-xs-6 - %a.btn.btn-lg.btn-default{:href=>"/android"} - %i.fa.fa-android.fa-5x - %br/ - Android + %br + %b Windows + %br + %small Coming soon... diff --git a/pages/linux/_notice.haml b/pages/linux/_notice.haml new file mode 100644 index 0000000..314b1c7 --- /dev/null +++ b/pages/linux/_notice.haml @@ -0,0 +1,5 @@ +.row + .col-sm-8.col-sm-offset-2 + .p.alert.alert-info + %i.fa.fa-envelope + <b>NOTE:</b> Encrypted email support in Bitmask is still experimental. diff --git a/pages/linux/en.md b/pages/linux/en.md index 067bf10..4d892a6 100644 --- a/pages/linux/en.md +++ b/pages/linux/en.md @@ -1,9 +1,15 @@ - @title = 'Install Bitmask on Linux' +<%= render :partial => 'notice' %> + ## Install as packages This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date. +### Ubuntu 14.04 (Trusty Tahr) + +<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> + ### Ubuntu 13.10 (Saucy Salamander) <%= render({:partial => 'via_packages'}, {:distro => 'saucy'}) %> |