merge V2_5

2 files changed, 18 insertions, 28 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 40076056d..82a7f92c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,7 +17,6 @@ GEM
   remote: https://rails-assets.org/
   specs:
     RedCloth (4.2.9)
-    RedCloth (4.2.9-java)
     SyslogLogger (1.4.1)
     actionmailer (3.2.18)
       actionpack (= 3.2.18)
@@ -42,11 +41,6 @@ GEM
       activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.3.9)
-      activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.9)
-      activerecord-jdbc-adapter (~> 1.3.9)
-      jdbc-postgres (>= 9.1)
     activeresource (3.2.18)
       activemodel (= 3.2.18)
       activesupport (= 3.2.18)
@@ -63,8 +57,8 @@ GEM
     addressable (2.3.5)
     arel (3.0.3)
     bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-java)
-    bouncy-castle-java (1.5.0146.1)
+    bourne (1.5.0)
+      mocha (>= 0.13.2, < 0.15)
     breadcrumbs_on_rails (2.3.0)
     builder (3.0.4)
     calendar_helper (0.2.5)
@@ -117,7 +111,7 @@ GEM
       actionmailer (~> 3.0)
       devise (>= 2.1.0)
       railties (~> 3.0)
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.5)
     dr-apartment (0.14.1)
     dr-ffi-proj4 (0.0.3)
       ffi (>= 1.0.0)
@@ -131,7 +125,6 @@ GEM
       railties (>= 3.0.0)
     fastercsv (1.5.5)
     ffi (1.9.6)
-    ffi (1.9.6-java)
     ffi-geos (1.0.0)
       ffi (>= 1.0.0)
     font-awesome-sass (4.2.0)
@@ -167,7 +160,6 @@ GEM
     inherited_resources (1.4.1)
       has_scope (~> 0.6.0.rc)
       responders (~> 1.0.0.rc)
-    jdbc-postgres (9.3.1101)
     journey (1.0.4)
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
@@ -179,14 +171,7 @@ GEM
       jquery-rails
       jquery-ui-rails (= 4.0.3)
       railties (>= 3.1.0)
-    jruby-jars (1.7.15)
-    jruby-openssl (0.7.7)
-      bouncy-castle-java (>= 1.5.0146.1)
-    jruby-rack (1.1.16)
-    jruby-rack-worker (0.4-java)
-      jruby-rack (>= 1.1.1)
     json (1.8.1)
-    json (1.8.1-java)
     language_engine (0.0.5)
       rails (~> 3.2.18)
     launchy (2.3.0)
@@ -200,7 +185,10 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     map_layers (0.0.4)
+    metaclass (0.0.1)
     mime-types (1.25.1)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
     modernizr-rails (2.0.6)
     morrisjs-rails (0.4.3)
       railties (> 3.1, < 5)
@@ -213,7 +201,6 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.10)
-    nokogiri (1.5.10-java)
     open4 (1.3.0)
     orm_adapter (0.4.0)
     pg (0.11.0)
@@ -327,8 +314,9 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    shoulda-matchers (1.2.0)
+    shoulda-matchers (1.5.6)
       activesupport (>= 3.0.0)
+      bourne (~> 1.3)
     simple_form (2.1.1)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
@@ -346,9 +334,6 @@ GEM
       polyamorous (~> 1.1.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    therubyrhino (2.0.1)
-      therubyrhino_jar (>= 1.7.3)
-    therubyrhino_jar (1.7.4)
     thor (0.19.1)
     tilt (1.4.1)
     treetop (1.4.15)
@@ -358,11 +343,6 @@ GEM
     uglifier (1.2.7)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
-    warbler (1.4.4)
-      jruby-jars (>= 1.5.6, < 2.0)
-      jruby-rack (>= 1.0.0)
-      rake (>= 0.9.6)
-      rubyzip (>= 0.9, < 1.2)
     warden (1.2.1)
       rack (>= 1.0)
     websocket (1.2.1)
diff --git a/app/assets/stylesheets/vendor/formtastic_changes.css.scss b/app/assets/stylesheets/vendor/formtastic_changes.css.scss
index 8de2a9bd1..d64d6925f 100644
--- a/app/assets/stylesheets/vendor/formtastic_changes.css.scss
+++ b/app/assets/stylesheets/vendor/formtastic_changes.css.scss
@@ -23,6 +23,16 @@
             font-size: 14px;
         }
     }
+
+    .choices legend.label label{
+        @extend .label;
+        font-size: 14px !important;
+        width: 100% !important;
+    }    
+
+    .choice label input{
+        margin: 0px 0px 0px -20px !important;
+    }
     
     .token-input-list {
         display: inline-block;