Merge branch 'master' of git.workaround.org:chaas/debshots

2016-11-02 20:05:46 +01:00 · 2016-11-02 20:05:46 +01:00 · 396f3a7751
commit 396f3a7751
parent 10e44d1aaf 1d8f2552ca
25 changed files with 395 additions and 257 deletions
--- a/app/assets/stylesheets/_settings.scss
+++ b/app/assets/stylesheets/_settings.scss
@ -912,4 +912,9 @@ a.black
 }
 .inputfile + label {
  cursor: pointer; /* "hand" cursor */
-}
+}
+
+/* Foundation sets file buttons to 100% width. Fix that */
+[type='file'] {
+  width: inherit !important;
+}
--- a/app/assets/stylesheets/logs.scss
+++ b/app/assets/stylesheets/logs.scss
@ -1,3 +0,0 @@
-// Place all the styles related to the logs controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/