diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..00f5662 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,312 @@ +GIT + remote: git://github.com/seyhunak/twitter-bootstrap-rails.git + revision: 3edf24de985d946f16a2781644289cfdc51ba95b + ref: 3edf24d + specs: + twitter-bootstrap-rails (3.2.0) + actionpack (>= 3.1) + execjs + rails (>= 3.1) + railties (>= 3.1) + +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.1.5) + actionpack (= 4.1.5) + actionview (= 4.1.5) + mail (~> 2.5.4) + actionpack (4.1.5) + actionview (= 4.1.5) + activesupport (= 4.1.5) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionview (4.1.5) + activesupport (= 4.1.5) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.5) + activesupport (= 4.1.5) + builder (~> 3.1) + activerecord (4.1.5) + activemodel (= 4.1.5) + activesupport (= 4.1.5) + arel (~> 5.0.0) + activesupport (4.1.5) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) + arel (5.0.1.20140414130214) + bcrypt (3.1.7) + better_errors (2.0.0) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + capistrano (3.2.1) + i18n + rake (>= 10.0.0) + sshkit (~> 1.3) + capistrano-bundler (1.1.3) + capistrano (~> 3.1) + sshkit (~> 1.2) + capistrano-rails (1.1.2) + capistrano (~> 3.1) + capistrano-bundler (~> 1.1) + capistrano-rvm (0.1.1) + capistrano (~> 3.0) + sshkit (~> 1.2) + capybara (2.4.3) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + chart-js-rails (0.0.7) + railties (> 3.1) + cliver (0.3.2) + coderay (1.1.0) + coffee-rails (4.0.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.3.0) + coffee-script-source + execjs + coffee-script-source (1.8.0) + colorize (0.7.3) + colorpicker (0.0.5) + coveralls (0.7.1) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor + cucumber (1.3.17) + builder (>= 2.1.2) + diff-lcs (>= 1.1.3) + gherkin (~> 2.12) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.1) + cucumber-rails (1.4.1) + capybara (>= 1.1.2, < 3) + cucumber (>= 1.3.8, < 2) + mime-types (~> 1.16) + nokogiri (~> 1.5) + rails (>= 3, < 5) + dalli (2.7.2) + database_cleaner (1.3.0) + debug_inspector (0.0.2) + devise (3.3.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) + diff-lcs (1.2.5) + docile (1.1.5) + erubis (2.7.0) + exception_notification (4.0.1) + actionmailer (>= 3.0.4) + activesupport (>= 3.0.4) + execjs (2.2.1) + factory_girl (4.4.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.4.1) + factory_girl (~> 4.4.0) + railties (>= 3.0.0) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.9.1) + faraday (>= 0.7.4, < 0.10) + gherkin (2.12.2) + multi_json (~> 1.3) + google-analytics-rails (0.0.6) + hike (1.2.3) + i18n (0.6.11) + jbuilder (2.1.3) + activesupport (>= 3.0.0, < 5) + multi_json (~> 1.2) + jquery-rails (3.1.2) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.0) + railties (>= 3.2.16) + json (1.8.1) + kalibro_gatekeeper_client (1.0.0) + activesupport (>= 2.2.1) + faraday_middleware (~> 0.9.0) + konacha (3.2.4) + actionpack (>= 3.1, < 5) + capybara + colorize + railties (>= 3.1, < 5) + sprockets + libv8 (3.16.14.7) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile (0.6.0) + minitest (5.4.2) + mocha (1.1.0) + metaclass (~> 0.0.1) + multi_json (1.10.1) + multi_test (0.1.1) + multipart-post (2.0.0) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) + netrc (0.7.7) + nokogiri (1.6.3.1) + mini_portile (= 0.6.0) + orm_adapter (0.5.0) + pg (0.17.1) + poltergeist (1.5.1) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + polyglot (0.3.5) + rack (1.5.2) + rack-test (0.6.2) + rack (>= 1.0) + rails (4.1.5) + actionmailer (= 4.1.5) + actionpack (= 4.1.5) + actionview (= 4.1.5) + activemodel (= 4.1.5) + activerecord (= 4.1.5) + activesupport (= 4.1.5) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.5) + sprockets-rails (~> 2.0) + railties (4.1.5) + actionpack (= 4.1.5) + activesupport (= 4.1.5) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (10.3.2) + rdoc (4.1.2) + json (~> 1.4) + ref (1.0.5) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rspec-core (3.1.5) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.2) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.1) + sass (3.2.19) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + shoulda-matchers (2.7.0) + activesupport (>= 3.0.0) + simplecov (0.9.1) + docile (~> 1.1.0) + multi_json (~> 1.0) + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + spring (1.1.3) + sprockets (2.11.0) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.1.4) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + sqlite3 (1.3.9) + sshkit (1.5.1) + colorize + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) + term-ansicolor (1.3.0) + tins (~> 1.0) + therubyracer (0.12.1) + libv8 (~> 3.16.14.0) + ref + thor (0.19.1) + thread_safe (0.3.4) + tilt (1.4.1) + tins (1.3.3) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + turbolinks (2.4.0) + coffee-rails + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.5.3) + execjs (>= 0.3.0) + json (>= 1.8.0) + warden (1.2.3) + rack (>= 1.0) + websocket-driver (0.3.4) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + capistrano (~> 3.2.1) + capistrano-bundler + capistrano-rails + capistrano-rvm (~> 0.1.0) + chart-js-rails (~> 0.0.6) + coffee-rails (~> 4.0.0) + colorpicker (~> 0.0.5) + coveralls + cucumber-rails (~> 1.4.0) + dalli (~> 2.7.0) + database_cleaner + devise (~> 3.3.0) + exception_notification (~> 4.0.1) + factory_girl_rails (~> 4.4.1) + google-analytics-rails (~> 0.0.6) + jbuilder (~> 2.1.2) + jquery-rails + jquery-ui-rails (~> 5.0.0) + kalibro_gatekeeper_client (~> 1.0.0) + konacha (~> 3.2.0) + mocha + pg (~> 0.17.0) + poltergeist (~> 1.5.0) + rails (= 4.1.5) + rspec-rails (~> 3.1.0) + sass-rails (~> 4.0.1) + sdoc + shoulda-matchers (~> 2.7.0) + simplecov + spring + sqlite3 + therubyracer + turbolinks + twitter-bootstrap-rails! + uglifier (>= 1.3.0) diff --git a/app/views/metric_configurations/_form.html.erb b/app/views/metric_configurations/_form.html.erb index 7681aed..706686b 100644 --- a/app/views/metric_configurations/_form.html.erb +++ b/app/views/metric_configurations/_form.html.erb @@ -1,12 +1,12 @@ <%= render :partial => 'shared/form_errors', :locals => {:object => @metric_configuration} %>
-
+
<%= f.label :weight, class: 'control-label' %> - <%= f.text_field :weight, class: 'text-field' %> + <%= f.text_field :weight, class: 'text-field form-control' %>

diff --git a/app/views/mezuro_configurations/_form.html.erb b/app/views/mezuro_configurations/_form.html.erb index f6566ac..92e38a7 100644 --- a/app/views/mezuro_configurations/_form.html.erb +++ b/app/views/mezuro_configurations/_form.html.erb @@ -2,19 +2,19 @@ <%= render :partial => 'shared/form_errors', :locals => {:object => @mezuro_configuration} %>

-
+
<%= f.label :name, class: 'control-label' %>
- <%= f.text_field :name, class: 'text-field' %> + <%= f.text_field :name, class: 'text-field form-control' %>
<%= f.label :description, class: 'control-label' %>
- <%= f.text_area :description, class: 'text-area' %> + <%= f.text_area :description, class: 'text-area form-control' %>
diff --git a/app/views/mezuro_ranges/_form.html.erb b/app/views/mezuro_ranges/_form.html.erb index d169e96..2a575a5 100644 --- a/app/views/mezuro_ranges/_form.html.erb +++ b/app/views/mezuro_ranges/_form.html.erb @@ -1,7 +1,7 @@ <%= render :partial => 'shared/form_errors', :locals => {:object => @mezuro_range} %>
-
+
<% if @readings.size == 0 %> @@ -20,11 +20,17 @@
+
- <%= f.label :beginning, class: 'control-label' %> - <%= f.text_field :beginning, class: 'diminished-text-field' %> - <%= link_to '-∞'.html_safe, 'javascript:void(0)', :onClick => "jQuery( '#mezuro_range_beginning' ).val('-INF');", class: 'btn btn-default align-button' %> + <%= f.label :beginning, class: 'control-label' %> +
+ <%= f.text_field :beginning, class: 'diminished-text-field form-control' %> + + <%= link_to '-∞'.html_safe, 'javascript:void(0)', :onClick => "jQuery( '#mezuro_range_beginning' ).val('-INF');", class: 'btn btn-default' %> + +
+

This Range's lower limit. @@ -35,8 +41,12 @@

<%= f.label :end, class: 'control-label' %> - <%= f.text_field :end, class: 'diminished-text-field' %> - <%= link_to '∞'.html_safe, 'javascript:void(0)', :onClick => "jQuery( '#mezuro_range_end' ).val('INF');", class: 'btn btn-default align-button' %> +
+ <%= f.text_field :end, class: 'diminished-text-field form-control' %> + + <%= link_to '∞'.html_safe, 'javascript:void(0)', :onClick => "jQuery( '#mezuro_range_end' ).val('INF');", class: 'btn btn-default align-button' %> + +

diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb index 982254d..6c2ff90 100644 --- a/app/views/projects/_form.html.erb +++ b/app/views/projects/_form.html.erb @@ -2,18 +2,18 @@ <%= render :partial => 'shared/form_errors', :locals => {:object => @project} %>

-
+
<%= f.label :name, class: 'control-label' %>
- <%= f.text_field :name, class: 'text-field ' %> + <%= f.text_field :name, class: 'text-field form-control' %>
<%= f.label :description, class: 'control-label' %>
- <%= f.text_area :description, class: 'text-area' %> + <%= f.text_area :description, class: 'text-area form-control' %>
diff --git a/app/views/reading_groups/_form.html.erb b/app/views/reading_groups/_form.html.erb index 0e4debd..77970ae 100644 --- a/app/views/reading_groups/_form.html.erb +++ b/app/views/reading_groups/_form.html.erb @@ -2,19 +2,19 @@ <%= render :partial => 'shared/form_errors', :locals => {:object => @reading_group} %>
-
+
<%= f.label :name, class: 'control-label' %> - <%= f.text_field :name, class: 'text-field' %> + <%= f.text_field :name, class: 'text-field form-control' %>
<%= f.label :description, class: 'control-label' %> - <%= f.text_area :description, class: 'text-area' %> + <%= f.text_area :description, class: 'text-area form-control' %>
diff --git a/app/views/readings/_form.html.erb b/app/views/readings/_form.html.erb index f46c685..e22799a 100644 --- a/app/views/readings/_form.html.erb +++ b/app/views/readings/_form.html.erb @@ -1,12 +1,12 @@ <%= render :partial => 'shared/form_errors', :locals => {:object => @reading} %>
-
+
<%= f.label :label, class: 'control-label' %> - <%= f.text_field :label, class: 'text-field' %> + <%= f.text_field :label, class: 'text-field form-control' %>

@@ -21,9 +21,11 @@

<%= f.label :color, class: 'control-label' %> -
- <%= f.text_field :color, class: 'text-field' %> - +
+ <%= f.text_field :color, class: 'form-control' %> + + +
@@ -39,7 +41,7 @@
<%= f.label :grade, class: 'control-label' %> - <%= f.text_field :grade, class: 'text-field' %> + <%= f.text_field :grade, class: 'text-field form-control' %>

diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb index bd97656..f05c622 100644 --- a/app/views/repositories/_form.html.erb +++ b/app/views/repositories/_form.html.erb @@ -2,12 +2,12 @@

-
+
<%= f.label :name, class: 'control-label' %> - <%= f.text_field :name, class: 'text-field' %> + <%= f.text_field :name, class: 'text-field form-control' %>

@@ -19,7 +19,7 @@

<%= f.label :description, class: 'control-label' %> - <%= f.text_area :description, class: 'text-area' %> + <%= f.text_area :description, class: 'text-area form-control' %>

@@ -31,7 +31,7 @@

<%= f.label :license, 'License', class: 'control-label' %> - <%= f.select( :license, license_options, class: 'text-area' ) %> + <%= f.select( :license, license_options, class: 'text-area form-control' ) %>

@@ -55,7 +55,7 @@

<%= f.label :address, class: 'control-label' %> - <%= f.text_field :address, class: 'text-field' %> + <%= f.text_field :address, class: 'text-field form-control' %>

-- libgit2 0.21.2