Merge branch 'dev'

Conflicts: app/css/main.css docs/styleguide/public/main.css
nibushibu · Apr 11, 2016 · 45d8a2b · 45d8a2b
2 parents c22333b + d56d722
commit 45d8a2b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/app/css/main.css b/app/css/main.css
diff --git a/docs/styleguide/public/main.css b/docs/styleguide/public/main.css
diff --git a/scss/_forms.scss b/scss/_forms.scss
@@ -18,7 +18,7 @@ button {
   transition: border linear 0.2s, box-shadow linear 0.2s;
   border-radius: 4px;
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  padding: 4px 6px;
+  padding: .5em;
   border: 1px solid #ccc;
   color: #555555;
   vertical-align: middle;