Merge branch 'master' into updated-gems

Conflicts: Gemfile Gemfile.lock
2013-10-09 10:37:02 +02:00 · 2013-10-09 10:37:02 +02:00 · bdce1b5872
commit bdce1b5872
parent 75e858db71 1b49a08c5e
64 changed files with 1039 additions and 472 deletions
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@ -3,4 +3,5 @@
 *= require select2
 *= require token-input-bootstrappy
 *= require bootstrap-datepicker
+*= require list.unlist
 */
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@ -237,3 +237,8 @@ tr.unavailable {
    margin-bottom: 15px
  }
 }
+
+// allow buttons as input add-on (with proper height)
+.input-append button.add-on {
+  height: inherit;
+}
--- a/app/assets/stylesheets/list.unlist.css
+++ b/app/assets/stylesheets/list.unlist.css
@ -0,0 +1,3 @@
+.list .unlisted:not(.no-unlist) {
+	display: none;
+}