Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

2 files changed, 2 insertions, 61 deletions

diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index 4c0dfe3..77104e5 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -44,65 +44,6 @@
 }
 
 //
-// OS specific
-//
-
-.os-android {
-  display: none !important;
-}
-
-html.android .os-android {
-  display: inherit !important;
-}
-
-.os-linux {
-  display: none !important;
-}
-
-html.linux .os-linux {
-  display: inherit !important;
-}
-
-// .os-linux32 {
-//   display: none !important;
-// }
-// html.linux32 .os-linux32 {
-//   display: inherit !important;
-// }
-// .os-linux64 {
-//   display: none !important;
-// }
-// html.linux64 .os-linux64 {
-//   display: inherit !important;
-// }
-
-.os-windows {
-  display: none !important;
-}
-
-html.windows .os-windows {
-  display: inherit !important;
-}
-
-.os-osx {
-  display: none !important;
-}
-
-html.osx .os-osx {
-  display: inherit !important;
-}
-
-.os-other {
-  display: none !important;
-}
-
-html.oldmac, html.oldwin, html.ios, html.fxos, html.other {
-  .os-other {
-    display: inherit !important;
-  }
-}
-
-//
 // ICONS
 //
 
@@ -230,14 +171,14 @@ input, textarea {
   }
   .download {
     a.btn {
-      width: 14em;
+      width: 15em;
+      font-weight: bold;
       small {
         font-weight: normal;
       }
     }
   }
   a.btn {
-    font-weight: bold;
     width: 11em;
     margin: 10px auto;
     display: block;
diff --git a/app/assets/stylesheets/leap_web_users/.gitkeep b/app/assets/stylesheets/leap_web_users/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/assets/stylesheets/leap_web_users/.gitkeep