diff options
| author | Azul <azul@leap.se> | 2013-10-28 08:52:54 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-10-28 08:52:54 +0100 |
| commit | 7abdb17fef4c48dc62621cb10062f14379039cdf (patch) | |
| tree | d1fe0b9796526e063e928a00d942e6e99a3dc457 | |
| parent | 1b8d773ad61df9d97f4f800944cd78ae6cc51938 (diff) | |
| parent | 7b3dd8c2c0436518c7c80d37498b57fcf3b1eaf8 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | app/assets/stylesheets/leap.scss | 6 | ||||
| -rw-r--r-- | config/defaults.yml | 8 | ||||
| -rw-r--r-- | core/config/locales/en.yml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss index 30f7741..abfea05 100644 --- a/app/assets/stylesheets/leap.scss +++ b/app/assets/stylesheets/leap.scss @@ -58,7 +58,7 @@ html.android .os-android { display: none !important; } -html.linux .os-linux32 { +html.linux32 .os-linux32 { display: inherit !important; } @@ -78,11 +78,11 @@ html.windows .os-windows { display: inherit !important; } -.os-mac { +.os-osx { display: none !important; } -html.mac .os-mac { +html.osx .os-osx { display: inherit !important; } diff --git a/config/defaults.yml b/config/defaults.yml index 6211e37..c7c8502 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -18,16 +18,16 @@ downloads: &downloads available_clients: - linux32 - linux64 - - mac + - osx - windows - android download_paths: - android: /client/android + android: /client/android/Bitmask-Android-latest.apk linux: /client/linux linux32: /client/linux/Bitmask-linux32-latest.tar.bz2 linux64: /client/linux/Bitmask-linux64-latest.tar.bz2 - osx: /client/osx/Bitmask-OSC-latest.dmg - windows: /client/windows + osx: /client/osx/Bitmask-OSX-latest.dmg + windows: /client/windows/Bitmask-win32-latest.zip other: /client common: &common diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index 344eee4..4710a16 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -35,6 +35,6 @@ en: linux64: "Linux (64 bit)" windows: "Windows" android: "Android" - mac: "Mac OSX" + osx: "Mac OSX" other: "(not available for your OS.)" |