Commit d657567d34b1c0a3e90a413f73f43fe06512ad0e
1 parent
3c7f2c3d
Exists in
colab
and in
4 other branches
Updating bootstrap of forms. #124.
Signed-off-by:Beatriz Rezener <beatrizrezener@gmail.com>
Signed-off-by:Vinicius Franco <viniciusf.arantes@gmail.com>
Showing
8 changed files
with
352 additions
and
28 deletions
Show diff stats
| ... | ... | @@ -0,0 +1,312 @@ |
| 1 | +GIT | |
| 2 | + remote: git://github.com/seyhunak/twitter-bootstrap-rails.git | |
| 3 | + revision: 3edf24de985d946f16a2781644289cfdc51ba95b | |
| 4 | + ref: 3edf24d | |
| 5 | + specs: | |
| 6 | + twitter-bootstrap-rails (3.2.0) | |
| 7 | + actionpack (>= 3.1) | |
| 8 | + execjs | |
| 9 | + rails (>= 3.1) | |
| 10 | + railties (>= 3.1) | |
| 11 | + | |
| 12 | +GEM | |
| 13 | + remote: https://rubygems.org/ | |
| 14 | + specs: | |
| 15 | + actionmailer (4.1.5) | |
| 16 | + actionpack (= 4.1.5) | |
| 17 | + actionview (= 4.1.5) | |
| 18 | + mail (~> 2.5.4) | |
| 19 | + actionpack (4.1.5) | |
| 20 | + actionview (= 4.1.5) | |
| 21 | + activesupport (= 4.1.5) | |
| 22 | + rack (~> 1.5.2) | |
| 23 | + rack-test (~> 0.6.2) | |
| 24 | + actionview (4.1.5) | |
| 25 | + activesupport (= 4.1.5) | |
| 26 | + builder (~> 3.1) | |
| 27 | + erubis (~> 2.7.0) | |
| 28 | + activemodel (4.1.5) | |
| 29 | + activesupport (= 4.1.5) | |
| 30 | + builder (~> 3.1) | |
| 31 | + activerecord (4.1.5) | |
| 32 | + activemodel (= 4.1.5) | |
| 33 | + activesupport (= 4.1.5) | |
| 34 | + arel (~> 5.0.0) | |
| 35 | + activesupport (4.1.5) | |
| 36 | + i18n (~> 0.6, >= 0.6.9) | |
| 37 | + json (~> 1.7, >= 1.7.7) | |
| 38 | + minitest (~> 5.1) | |
| 39 | + thread_safe (~> 0.1) | |
| 40 | + tzinfo (~> 1.1) | |
| 41 | + arel (5.0.1.20140414130214) | |
| 42 | + bcrypt (3.1.7) | |
| 43 | + better_errors (2.0.0) | |
| 44 | + coderay (>= 1.0.0) | |
| 45 | + erubis (>= 2.6.6) | |
| 46 | + rack (>= 0.9.0) | |
| 47 | + binding_of_caller (0.7.2) | |
| 48 | + debug_inspector (>= 0.0.1) | |
| 49 | + builder (3.2.2) | |
| 50 | + capistrano (3.2.1) | |
| 51 | + i18n | |
| 52 | + rake (>= 10.0.0) | |
| 53 | + sshkit (~> 1.3) | |
| 54 | + capistrano-bundler (1.1.3) | |
| 55 | + capistrano (~> 3.1) | |
| 56 | + sshkit (~> 1.2) | |
| 57 | + capistrano-rails (1.1.2) | |
| 58 | + capistrano (~> 3.1) | |
| 59 | + capistrano-bundler (~> 1.1) | |
| 60 | + capistrano-rvm (0.1.1) | |
| 61 | + capistrano (~> 3.0) | |
| 62 | + sshkit (~> 1.2) | |
| 63 | + capybara (2.4.3) | |
| 64 | + mime-types (>= 1.16) | |
| 65 | + nokogiri (>= 1.3.3) | |
| 66 | + rack (>= 1.0.0) | |
| 67 | + rack-test (>= 0.5.4) | |
| 68 | + xpath (~> 2.0) | |
| 69 | + chart-js-rails (0.0.7) | |
| 70 | + railties (> 3.1) | |
| 71 | + cliver (0.3.2) | |
| 72 | + coderay (1.1.0) | |
| 73 | + coffee-rails (4.0.1) | |
| 74 | + coffee-script (>= 2.2.0) | |
| 75 | + railties (>= 4.0.0, < 5.0) | |
| 76 | + coffee-script (2.3.0) | |
| 77 | + coffee-script-source | |
| 78 | + execjs | |
| 79 | + coffee-script-source (1.8.0) | |
| 80 | + colorize (0.7.3) | |
| 81 | + colorpicker (0.0.5) | |
| 82 | + coveralls (0.7.1) | |
| 83 | + multi_json (~> 1.3) | |
| 84 | + rest-client | |
| 85 | + simplecov (>= 0.7) | |
| 86 | + term-ansicolor | |
| 87 | + thor | |
| 88 | + cucumber (1.3.17) | |
| 89 | + builder (>= 2.1.2) | |
| 90 | + diff-lcs (>= 1.1.3) | |
| 91 | + gherkin (~> 2.12) | |
| 92 | + multi_json (>= 1.7.5, < 2.0) | |
| 93 | + multi_test (>= 0.1.1) | |
| 94 | + cucumber-rails (1.4.1) | |
| 95 | + capybara (>= 1.1.2, < 3) | |
| 96 | + cucumber (>= 1.3.8, < 2) | |
| 97 | + mime-types (~> 1.16) | |
| 98 | + nokogiri (~> 1.5) | |
| 99 | + rails (>= 3, < 5) | |
| 100 | + dalli (2.7.2) | |
| 101 | + database_cleaner (1.3.0) | |
| 102 | + debug_inspector (0.0.2) | |
| 103 | + devise (3.3.0) | |
| 104 | + bcrypt (~> 3.0) | |
| 105 | + orm_adapter (~> 0.1) | |
| 106 | + railties (>= 3.2.6, < 5) | |
| 107 | + thread_safe (~> 0.1) | |
| 108 | + warden (~> 1.2.3) | |
| 109 | + diff-lcs (1.2.5) | |
| 110 | + docile (1.1.5) | |
| 111 | + erubis (2.7.0) | |
| 112 | + exception_notification (4.0.1) | |
| 113 | + actionmailer (>= 3.0.4) | |
| 114 | + activesupport (>= 3.0.4) | |
| 115 | + execjs (2.2.1) | |
| 116 | + factory_girl (4.4.0) | |
| 117 | + activesupport (>= 3.0.0) | |
| 118 | + factory_girl_rails (4.4.1) | |
| 119 | + factory_girl (~> 4.4.0) | |
| 120 | + railties (>= 3.0.0) | |
| 121 | + faraday (0.9.0) | |
| 122 | + multipart-post (>= 1.2, < 3) | |
| 123 | + faraday_middleware (0.9.1) | |
| 124 | + faraday (>= 0.7.4, < 0.10) | |
| 125 | + gherkin (2.12.2) | |
| 126 | + multi_json (~> 1.3) | |
| 127 | + google-analytics-rails (0.0.6) | |
| 128 | + hike (1.2.3) | |
| 129 | + i18n (0.6.11) | |
| 130 | + jbuilder (2.1.3) | |
| 131 | + activesupport (>= 3.0.0, < 5) | |
| 132 | + multi_json (~> 1.2) | |
| 133 | + jquery-rails (3.1.2) | |
| 134 | + railties (>= 3.0, < 5.0) | |
| 135 | + thor (>= 0.14, < 2.0) | |
| 136 | + jquery-ui-rails (5.0.0) | |
| 137 | + railties (>= 3.2.16) | |
| 138 | + json (1.8.1) | |
| 139 | + kalibro_gatekeeper_client (1.0.0) | |
| 140 | + activesupport (>= 2.2.1) | |
| 141 | + faraday_middleware (~> 0.9.0) | |
| 142 | + konacha (3.2.4) | |
| 143 | + actionpack (>= 3.1, < 5) | |
| 144 | + capybara | |
| 145 | + colorize | |
| 146 | + railties (>= 3.1, < 5) | |
| 147 | + sprockets | |
| 148 | + libv8 (3.16.14.7) | |
| 149 | + mail (2.5.4) | |
| 150 | + mime-types (~> 1.16) | |
| 151 | + treetop (~> 1.4.8) | |
| 152 | + metaclass (0.0.4) | |
| 153 | + mime-types (1.25.1) | |
| 154 | + mini_portile (0.6.0) | |
| 155 | + minitest (5.4.2) | |
| 156 | + mocha (1.1.0) | |
| 157 | + metaclass (~> 0.0.1) | |
| 158 | + multi_json (1.10.1) | |
| 159 | + multi_test (0.1.1) | |
| 160 | + multipart-post (2.0.0) | |
| 161 | + net-scp (1.2.1) | |
| 162 | + net-ssh (>= 2.6.5) | |
| 163 | + net-ssh (2.9.1) | |
| 164 | + netrc (0.7.7) | |
| 165 | + nokogiri (1.6.3.1) | |
| 166 | + mini_portile (= 0.6.0) | |
| 167 | + orm_adapter (0.5.0) | |
| 168 | + pg (0.17.1) | |
| 169 | + poltergeist (1.5.1) | |
| 170 | + capybara (~> 2.1) | |
| 171 | + cliver (~> 0.3.1) | |
| 172 | + multi_json (~> 1.0) | |
| 173 | + websocket-driver (>= 0.2.0) | |
| 174 | + polyglot (0.3.5) | |
| 175 | + rack (1.5.2) | |
| 176 | + rack-test (0.6.2) | |
| 177 | + rack (>= 1.0) | |
| 178 | + rails (4.1.5) | |
| 179 | + actionmailer (= 4.1.5) | |
| 180 | + actionpack (= 4.1.5) | |
| 181 | + actionview (= 4.1.5) | |
| 182 | + activemodel (= 4.1.5) | |
| 183 | + activerecord (= 4.1.5) | |
| 184 | + activesupport (= 4.1.5) | |
| 185 | + bundler (>= 1.3.0, < 2.0) | |
| 186 | + railties (= 4.1.5) | |
| 187 | + sprockets-rails (~> 2.0) | |
| 188 | + railties (4.1.5) | |
| 189 | + actionpack (= 4.1.5) | |
| 190 | + activesupport (= 4.1.5) | |
| 191 | + rake (>= 0.8.7) | |
| 192 | + thor (>= 0.18.1, < 2.0) | |
| 193 | + rake (10.3.2) | |
| 194 | + rdoc (4.1.2) | |
| 195 | + json (~> 1.4) | |
| 196 | + ref (1.0.5) | |
| 197 | + rest-client (1.7.2) | |
| 198 | + mime-types (>= 1.16, < 3.0) | |
| 199 | + netrc (~> 0.7) | |
| 200 | + rspec-core (3.1.5) | |
| 201 | + rspec-support (~> 3.1.0) | |
| 202 | + rspec-expectations (3.1.2) | |
| 203 | + diff-lcs (>= 1.2.0, < 2.0) | |
| 204 | + rspec-support (~> 3.1.0) | |
| 205 | + rspec-mocks (3.1.2) | |
| 206 | + rspec-support (~> 3.1.0) | |
| 207 | + rspec-rails (3.1.0) | |
| 208 | + actionpack (>= 3.0) | |
| 209 | + activesupport (>= 3.0) | |
| 210 | + railties (>= 3.0) | |
| 211 | + rspec-core (~> 3.1.0) | |
| 212 | + rspec-expectations (~> 3.1.0) | |
| 213 | + rspec-mocks (~> 3.1.0) | |
| 214 | + rspec-support (~> 3.1.0) | |
| 215 | + rspec-support (3.1.1) | |
| 216 | + sass (3.2.19) | |
| 217 | + sass-rails (4.0.3) | |
| 218 | + railties (>= 4.0.0, < 5.0) | |
| 219 | + sass (~> 3.2.0) | |
| 220 | + sprockets (~> 2.8, <= 2.11.0) | |
| 221 | + sprockets-rails (~> 2.0) | |
| 222 | + sdoc (0.4.1) | |
| 223 | + json (~> 1.7, >= 1.7.7) | |
| 224 | + rdoc (~> 4.0) | |
| 225 | + shoulda-matchers (2.7.0) | |
| 226 | + activesupport (>= 3.0.0) | |
| 227 | + simplecov (0.9.1) | |
| 228 | + docile (~> 1.1.0) | |
| 229 | + multi_json (~> 1.0) | |
| 230 | + simplecov-html (~> 0.8.0) | |
| 231 | + simplecov-html (0.8.0) | |
| 232 | + spring (1.1.3) | |
| 233 | + sprockets (2.11.0) | |
| 234 | + hike (~> 1.2) | |
| 235 | + multi_json (~> 1.0) | |
| 236 | + rack (~> 1.0) | |
| 237 | + tilt (~> 1.1, != 1.3.0) | |
| 238 | + sprockets-rails (2.1.4) | |
| 239 | + actionpack (>= 3.0) | |
| 240 | + activesupport (>= 3.0) | |
| 241 | + sprockets (~> 2.8) | |
| 242 | + sqlite3 (1.3.9) | |
| 243 | + sshkit (1.5.1) | |
| 244 | + colorize | |
| 245 | + net-scp (>= 1.1.2) | |
| 246 | + net-ssh (>= 2.8.0) | |
| 247 | + term-ansicolor (1.3.0) | |
| 248 | + tins (~> 1.0) | |
| 249 | + therubyracer (0.12.1) | |
| 250 | + libv8 (~> 3.16.14.0) | |
| 251 | + ref | |
| 252 | + thor (0.19.1) | |
| 253 | + thread_safe (0.3.4) | |
| 254 | + tilt (1.4.1) | |
| 255 | + tins (1.3.3) | |
| 256 | + treetop (1.4.15) | |
| 257 | + polyglot | |
| 258 | + polyglot (>= 0.3.1) | |
| 259 | + turbolinks (2.4.0) | |
| 260 | + coffee-rails | |
| 261 | + tzinfo (1.2.2) | |
| 262 | + thread_safe (~> 0.1) | |
| 263 | + uglifier (2.5.3) | |
| 264 | + execjs (>= 0.3.0) | |
| 265 | + json (>= 1.8.0) | |
| 266 | + warden (1.2.3) | |
| 267 | + rack (>= 1.0) | |
| 268 | + websocket-driver (0.3.4) | |
| 269 | + xpath (2.0.0) | |
| 270 | + nokogiri (~> 1.3) | |
| 271 | + | |
| 272 | +PLATFORMS | |
| 273 | + ruby | |
| 274 | + | |
| 275 | +DEPENDENCIES | |
| 276 | + better_errors | |
| 277 | + binding_of_caller | |
| 278 | + capistrano (~> 3.2.1) | |
| 279 | + capistrano-bundler | |
| 280 | + capistrano-rails | |
| 281 | + capistrano-rvm (~> 0.1.0) | |
| 282 | + chart-js-rails (~> 0.0.6) | |
| 283 | + coffee-rails (~> 4.0.0) | |
| 284 | + colorpicker (~> 0.0.5) | |
| 285 | + coveralls | |
| 286 | + cucumber-rails (~> 1.4.0) | |
| 287 | + dalli (~> 2.7.0) | |
| 288 | + database_cleaner | |
| 289 | + devise (~> 3.3.0) | |
| 290 | + exception_notification (~> 4.0.1) | |
| 291 | + factory_girl_rails (~> 4.4.1) | |
| 292 | + google-analytics-rails (~> 0.0.6) | |
| 293 | + jbuilder (~> 2.1.2) | |
| 294 | + jquery-rails | |
| 295 | + jquery-ui-rails (~> 5.0.0) | |
| 296 | + kalibro_gatekeeper_client (~> 1.0.0) | |
| 297 | + konacha (~> 3.2.0) | |
| 298 | + mocha | |
| 299 | + pg (~> 0.17.0) | |
| 300 | + poltergeist (~> 1.5.0) | |
| 301 | + rails (= 4.1.5) | |
| 302 | + rspec-rails (~> 3.1.0) | |
| 303 | + sass-rails (~> 4.0.1) | |
| 304 | + sdoc | |
| 305 | + shoulda-matchers (~> 2.7.0) | |
| 306 | + simplecov | |
| 307 | + spring | |
| 308 | + sqlite3 | |
| 309 | + therubyracer | |
| 310 | + turbolinks | |
| 311 | + twitter-bootstrap-rails! | |
| 312 | + uglifier (>= 1.3.0) | ... | ... |
app/views/metric_configurations/_form.html.erb
| 1 | 1 | <%= render :partial => 'shared/form_errors', :locals => {:object => @metric_configuration} %> |
| 2 | 2 | |
| 3 | 3 | <div class="row margin-left-none"> |
| 4 | - <div class="form-table span9"> | |
| 4 | + <div class="form-table col-md-9"> | |
| 5 | 5 | |
| 6 | 6 | <div class="form-row"> |
| 7 | 7 | <div class="field-container"> |
| 8 | 8 | <%= f.label :weight, class: 'control-label' %> |
| 9 | - <%= f.text_field :weight, class: 'text-field' %> | |
| 9 | + <%= f.text_field :weight, class: 'text-field form-control' %> | |
| 10 | 10 | </div> |
| 11 | 11 | <div class="help-container"> |
| 12 | 12 | <p> | ... | ... |
app/views/mezuro_configurations/_form.html.erb
| ... | ... | @@ -2,19 +2,19 @@ |
| 2 | 2 | <%= render :partial => 'shared/form_errors', :locals => {:object => @mezuro_configuration} %> |
| 3 | 3 | |
| 4 | 4 | <div class="row margin-left-none"> |
| 5 | - <div class="form-table span9"> | |
| 5 | + <div class="form-table col-md-9"> | |
| 6 | 6 | |
| 7 | 7 | <div class="form-row"> |
| 8 | 8 | <div class="field-container"> |
| 9 | 9 | <%= f.label :name, class: 'control-label' %><br> |
| 10 | - <%= f.text_field :name, class: 'text-field' %> | |
| 10 | + <%= f.text_field :name, class: 'text-field form-control' %> | |
| 11 | 11 | </div> |
| 12 | 12 | </div> |
| 13 | 13 | |
| 14 | 14 | <div class="form-row"> |
| 15 | 15 | <div class="field-container"> |
| 16 | 16 | <%= f.label :description, class: 'control-label' %><br> |
| 17 | - <%= f.text_area :description, class: 'text-area' %> | |
| 17 | + <%= f.text_area :description, class: 'text-area form-control' %> | |
| 18 | 18 | </div> |
| 19 | 19 | </div> |
| 20 | 20 | ... | ... |
app/views/mezuro_ranges/_form.html.erb
| 1 | 1 | <%= render :partial => 'shared/form_errors', :locals => {:object => @mezuro_range} %> |
| 2 | 2 | |
| 3 | 3 | <div class="row margin-left-none"> |
| 4 | - <div class="form-table span9"> | |
| 4 | + <div class="form-table col-md-9"> | |
| 5 | 5 | |
| 6 | 6 | <div class="form-row"> |
| 7 | 7 | <% if @readings.size == 0 %> |
| ... | ... | @@ -20,11 +20,17 @@ |
| 20 | 20 | </div> |
| 21 | 21 | |
| 22 | 22 | <div class="form-row"> |
| 23 | + | |
| 23 | 24 | <div class="field-container" > |
| 24 | - <%= f.label :beginning, class: 'control-label' %> | |
| 25 | - <%= f.text_field :beginning, class: 'diminished-text-field' %> | |
| 26 | - <%= link_to '-∞'.html_safe, 'javascript:void(0)', :onClick => "jQuery( '#mezuro_range_beginning' ).val('-INF');", class: 'btn btn-default align-button' %> | |
| 25 | + <%= f.label :beginning, class: 'control-label' %> | |
| 26 | + <div class="input-group"> | |
| 27 | + <%= f.text_field :beginning, class: 'diminished-text-field form-control' %> | |
| 28 | + <span class="input-group-btn"> | |
| 29 | + <%= link_to '-∞'.html_safe, 'javascript:void(0)', :onClick => "jQuery( '#mezuro_range_beginning' ).val('-INF');", class: 'btn btn-default' %> | |
| 30 | + </span> | |
| 31 | + </div> | |
| 27 | 32 | </div> |
| 33 | + | |
| 28 | 34 | <div class="help-container"> |
| 29 | 35 | <p> |
| 30 | 36 | This Range's lower limit. |
| ... | ... | @@ -35,8 +41,12 @@ |
| 35 | 41 | <div class="form-row"> |
| 36 | 42 | <div class="field-container"> |
| 37 | 43 | <%= f.label :end, class: 'control-label' %> |
| 38 | - <%= f.text_field :end, class: 'diminished-text-field' %> | |
| 39 | - <%= link_to '∞'.html_safe, 'javascript:void(0)', :onClick => "jQuery( '#mezuro_range_end' ).val('INF');", class: 'btn btn-default align-button' %> | |
| 44 | + <div class="input-group"> | |
| 45 | + <%= f.text_field :end, class: 'diminished-text-field form-control' %> | |
| 46 | + <span class="input-group-btn"> | |
| 47 | + <%= link_to '∞'.html_safe, 'javascript:void(0)', :onClick => "jQuery( '#mezuro_range_end' ).val('INF');", class: 'btn btn-default align-button' %> | |
| 48 | + </span> | |
| 49 | + </div> | |
| 40 | 50 | </div> |
| 41 | 51 | <div class="help-container"> |
| 42 | 52 | <p> | ... | ... |
app/views/projects/_form.html.erb
| ... | ... | @@ -2,18 +2,18 @@ |
| 2 | 2 | <%= render :partial => 'shared/form_errors', :locals => {:object => @project} %> |
| 3 | 3 | |
| 4 | 4 | <div class="row margin-left-none"> |
| 5 | - <div class="form-table span9"> | |
| 5 | + <div class="form-table col-md-9"> | |
| 6 | 6 | <div class="form-row"> |
| 7 | 7 | <div class="field-container"> |
| 8 | 8 | <%= f.label :name, class: 'control-label' %><br> |
| 9 | - <%= f.text_field :name, class: 'text-field ' %> | |
| 9 | + <%= f.text_field :name, class: 'text-field form-control' %> | |
| 10 | 10 | </div> |
| 11 | 11 | </div> |
| 12 | 12 | |
| 13 | 13 | <div class="form-row"> |
| 14 | 14 | <div class="field-container"> |
| 15 | 15 | <%= f.label :description, class: 'control-label' %><br> |
| 16 | - <%= f.text_area :description, class: 'text-area' %> | |
| 16 | + <%= f.text_area :description, class: 'text-area form-control' %> | |
| 17 | 17 | </div> |
| 18 | 18 | </div> |
| 19 | 19 | </div> | ... | ... |
app/views/reading_groups/_form.html.erb
| ... | ... | @@ -2,19 +2,19 @@ |
| 2 | 2 | <%= render :partial => 'shared/form_errors', :locals => {:object => @reading_group} %> |
| 3 | 3 | |
| 4 | 4 | <div class="row margin-left-none"> |
| 5 | - <div class="form-table span9"> | |
| 5 | + <div class="form-table col-md-9"> | |
| 6 | 6 | |
| 7 | 7 | <div class="form-row"> |
| 8 | 8 | <div class="field-container"> |
| 9 | 9 | <%= f.label :name, class: 'control-label' %> |
| 10 | - <%= f.text_field :name, class: 'text-field' %> | |
| 10 | + <%= f.text_field :name, class: 'text-field form-control' %> | |
| 11 | 11 | </div> |
| 12 | 12 | </div> |
| 13 | 13 | |
| 14 | 14 | <div class="form-row"> |
| 15 | 15 | <div class="field-container"> |
| 16 | 16 | <%= f.label :description, class: 'control-label' %> |
| 17 | - <%= f.text_area :description, class: 'text-area' %> | |
| 17 | + <%= f.text_area :description, class: 'text-area form-control' %> | |
| 18 | 18 | </div> |
| 19 | 19 | </div> |
| 20 | 20 | </div> | ... | ... |
app/views/readings/_form.html.erb
| 1 | 1 | <%= render :partial => 'shared/form_errors', :locals => {:object => @reading} %> |
| 2 | 2 | |
| 3 | 3 | <div class="row margin-left-none"> |
| 4 | - <div class="form-table span9"> | |
| 4 | + <div class="form-table col-md-9"> | |
| 5 | 5 | |
| 6 | 6 | <div class="form-row"> |
| 7 | 7 | <div class="field-container"> |
| 8 | 8 | <%= f.label :label, class: 'control-label' %> |
| 9 | - <%= f.text_field :label, class: 'text-field' %> | |
| 9 | + <%= f.text_field :label, class: 'text-field form-control' %> | |
| 10 | 10 | </div> |
| 11 | 11 | <div class="help-container"> |
| 12 | 12 | <p> |
| ... | ... | @@ -21,9 +21,11 @@ |
| 21 | 21 | <div class="form-row"> |
| 22 | 22 | <div class="field-container"> |
| 23 | 23 | <%= f.label :color, class: 'control-label' %> |
| 24 | - <div class="input-append" id="color_div" > | |
| 25 | - <%= f.text_field :color, class: 'text-field' %> | |
| 26 | - <input type="button" class="btn btn-info" style="height:30px" id="pickcolor_button" value="Pick color" /> | |
| 24 | + <div class="input-group" id="color_div" style="z-index: 1010"> | |
| 25 | + <%= f.text_field :color, class: 'form-control' %> | |
| 26 | + <span class="input-group-btn"> | |
| 27 | + <input type="button" class="btn btn-info" id="pickcolor_button" value="Pick color" /> | |
| 28 | + </span> | |
| 27 | 29 | </div> |
| 28 | 30 | </div> |
| 29 | 31 | <div class="help-container"> |
| ... | ... | @@ -39,7 +41,7 @@ |
| 39 | 41 | <div class="form-row"> |
| 40 | 42 | <div class="field-container"> |
| 41 | 43 | <%= f.label :grade, class: 'control-label' %> |
| 42 | - <%= f.text_field :grade, class: 'text-field' %> | |
| 44 | + <%= f.text_field :grade, class: 'text-field form-control' %> | |
| 43 | 45 | </div> |
| 44 | 46 | <div class="help-container"> |
| 45 | 47 | <p> | ... | ... |
app/views/repositories/_form.html.erb
| ... | ... | @@ -2,12 +2,12 @@ |
| 2 | 2 | |
| 3 | 3 | |
| 4 | 4 | <div class="row margin-left-none"> |
| 5 | - <div class="form-table span9"> | |
| 5 | + <div class="form-table col-md-9"> | |
| 6 | 6 | |
| 7 | 7 | <div class="form-row"> |
| 8 | 8 | <div class="field-container"> |
| 9 | 9 | <%= f.label :name, class: 'control-label' %> |
| 10 | - <%= f.text_field :name, class: 'text-field' %> | |
| 10 | + <%= f.text_field :name, class: 'text-field form-control' %> | |
| 11 | 11 | </div> |
| 12 | 12 | <div class="help-container"> |
| 13 | 13 | <p> |
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | <div class="form-row"> |
| 20 | 20 | <div class="field-container"> |
| 21 | 21 | <%= f.label :description, class: 'control-label' %> |
| 22 | - <%= f.text_area :description, class: 'text-area' %> | |
| 22 | + <%= f.text_area :description, class: 'text-area form-control' %> | |
| 23 | 23 | </div> |
| 24 | 24 | <div class="help-container"> |
| 25 | 25 | <p> |
| ... | ... | @@ -31,7 +31,7 @@ |
| 31 | 31 | <div class="form-row"> |
| 32 | 32 | <div class="field-container"> |
| 33 | 33 | <%= f.label :license, 'License', class: 'control-label' %> |
| 34 | - <%= f.select( :license, license_options, class: 'text-area' ) %> | |
| 34 | + <%= f.select( :license, license_options, class: 'text-area form-control' ) %> | |
| 35 | 35 | </div> |
| 36 | 36 | <div class="help-container"> |
| 37 | 37 | <p> |
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | <div class="form-row"> |
| 56 | 56 | <div class="field-container"> |
| 57 | 57 | <%= f.label :address, class: 'control-label' %> |
| 58 | - <%= f.text_field :address, class: 'text-field' %> | |
| 58 | + <%= f.text_field :address, class: 'text-field form-control' %> | |
| 59 | 59 | </div> |
| 60 | 60 | <div class="help-container"> |
| 61 | 61 | <p> | ... | ... |