Update to rails 4.2

This commit is contained in:
2014-09-08 16:53:37 +02:00
parent 3fc6e61a7b
commit 2c234e8f17
7 changed files with 136 additions and 115 deletions
@@ -7,7 +7,5 @@
@import ./qmodal
@import ./display_fields
@import ./qproduct_orders
@import ./form_additions
@import ./qindex
@import ./qlists
@import ./qjoin_requests
@@ -1,5 +1,5 @@
.form-row
@extend .row
+grid-row(nest)
.form-label
@media #{$small-only}
+grid-column($columns:10, $center:true)
@@ -2,10 +2,8 @@
.user-email
padding-left: 12px
.join-request-reject
+button
@extend .secondary
+button($bg: $secondary-color)
margin-right: 12px
.join-request-approve
+button
margin-right: 12px