contour 2.1.0.beta12 → 2.1.0.beta13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/bootstrap-overrides.css +5 -0
  3. data/app/views/contour/authentications/_login_table.html.erb +1 -1
  4. data/app/views/contour/confirmations/new.html.erb +3 -3
  5. data/app/views/contour/passwords/edit.html.erb +5 -5
  6. data/app/views/contour/passwords/new.html.erb +3 -3
  7. data/app/views/contour/registrations/edit.html.erb +9 -9
  8. data/app/views/contour/registrations/new.html.erb +11 -11
  9. data/app/views/contour/sessions/new.html.erb +6 -6
  10. data/app/views/contour/unlocks/new.html.erb +3 -3
  11. data/lib/contour/version.rb +1 -1
  12. data/lib/generators/contour/scaffold/templates/_form.html.erb +3 -3
  13. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0d8d92a57f3a992e033412888c2bff52b2373886
4
- data.tar.gz: 62a80e3a5e509c65334a53c8a59096242b68cf2a
3
+ metadata.gz: 0cf29abd2de2afa44e98bc377ceda78b4cc1bb06
4
+ data.tar.gz: 66f77f4747ff5cc641f079d4491097fe059ddd4c
5
5
  SHA512:
6
- metadata.gz: 06e56751dc1ead02a9608a5ee244459265929b1514f2045518c89ba1c3fe4064d7f877b406085a0e826d82b83d1b0fb2ed0759a0582249661fbfb3ec1b10b555
7
- data.tar.gz: 1518245064add7dfe26fb9a04a078847c24df54d55665f2a683b768d5fa1952db7e4ebd2695c085f706dd7185b048531ade853460521767395cda6147643fac4
6
+ metadata.gz: cf507ba0249111936a3d711be7b94ff2b4dd537c71eb952281a8493cbd027466d640e7f14160814d5dc39d7ea69e3d132a3d521ecbe4fc0458f05ebce5620a15
7
+ data.tar.gz: 067d7d272140148849f8460be87571cd1c16be5070a13b835ff8cabbcd30daba5b9050e14510dd7aa223a68f55a82859dd0840599985a93ff2c2124bb15bf3b0
data/app/assets/stylesheets/bootstrap-overrides.css CHANGED
@@ -21,6 +21,11 @@ h1, h2, h3, h4, h5, h6 {
21
21
 
22
22
  /* Add spacing for definition lists */
23
23
 
24
+ dl {
25
+ padding-left: 15px;
26
+ padding-right: 15px;
27
+ }
28
+
24
29
  dt, dd {
25
30
  line-height: 18px;
26
31
  min-height: 40px;
data/app/views/contour/authentications/_login_table.html.erb CHANGED
@@ -1,7 +1,7 @@
1
1
  <% if PROVIDERS.size > 0 %>
2
2
  <div class="form-group">
3
3
  <label class="control-label">Sign in with</label>
4
- <div class="col-lg-10">
4
+ <div class="col-md-10">
5
5
  <% PROVIDERS.each do |provider| %>
6
6
  <% provider_name = OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize %>
7
7
  <% image_name = provider.to_s.downcase %>
data/app/views/contour/confirmations/new.html.erb CHANGED
@@ -7,14 +7,14 @@
7
7
  <%= devise_error_messages! %>
8
8
 
9
9
  <div class="form-group">
10
- <%= f.label :email, class: 'col-lg-2 control-label' %>
11
- <div class="col-lg-10">
10
+ <%= f.label :email, class: 'col-md-2 control-label' %>
11
+ <div class="col-md-10">
12
12
  <%= f.email_field :email, class: 'form-control' %>
13
13
  </div>
14
14
  </div>
15
15
 
16
16
  <div class="form-group">
17
- <div class="col-lg-10 col-lg-offset-2">
17
+ <div class="col-md-10 col-md-offset-2">
18
18
  <%= f.submit "Resend confirmation instructions", class: 'btn btn-primary' %>
19
19
  <%= render partial: 'contour/links' %>
20
20
  </div>
data/app/views/contour/passwords/edit.html.erb CHANGED
@@ -8,21 +8,21 @@
8
8
  <%= f.hidden_field :reset_password_token %>
9
9
 
10
10
  <div class="form-group">
11
- <%= f.label :password, "New password", class: 'col-lg-2 control-label' %>
12
- <div class="col-lg-10">
11
+ <%= f.label :password, "New password", class: 'col-md-2 control-label' %>
12
+ <div class="col-md-10">
13
13
  <%= f.password_field :password, class: 'form-control' %>
14
14
  </div>
15
15
  </div>
16
16
 
17
17
  <div class="form-group">
18
- <%= f.label :password_confirmation, "Confirm new password", class: 'col-lg-2 control-label' %>
19
- <div class="col-lg-10">
18
+ <%= f.label :password_confirmation, "Confirm new password", class: 'col-md-2 control-label' %>
19
+ <div class="col-md-10">
20
20
  <%= f.password_field :password_confirmation, class: 'form-control' %>
21
21
  </div>
22
22
  </div>
23
23
 
24
24
  <div class="form-group">
25
- <div class="col-lg-10 col-lg-offset-2">
25
+ <div class="col-md-10 col-md-offset-2">
26
26
  <%= f.submit "Change my password", class: 'btn btn-primary' %>
27
27
  <%= render partial: 'contour/links' %>
28
28
  </div>
data/app/views/contour/passwords/new.html.erb CHANGED
@@ -7,14 +7,14 @@
7
7
  <%= devise_error_messages! %>
8
8
 
9
9
  <div class="form-group">
10
- <%= f.label :email, class: 'col-lg-2 control-label' %>
11
- <div class="col-lg-10">
10
+ <%= f.label :email, class: 'col-md-2 control-label' %>
11
+ <div class="col-md-10">
12
12
  <%= f.email_field :email, class: 'form-control' %>
13
13
  </div>
14
14
  </div>
15
15
 
16
16
  <div class="form-group">
17
- <div class="col-lg-10 col-lg-offset-2">
17
+ <div class="col-md-10 col-md-offset-2">
18
18
  <%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %>
19
19
  <%= render partial: 'contour/links' %>
20
20
  </div>
data/app/views/contour/registrations/edit.html.erb CHANGED
@@ -7,37 +7,37 @@
7
7
  <%= devise_error_messages! %>
8
8
 
9
9
  <div class="form-group">
10
- <%= f.label :email, class: 'col-lg-2 control-label' %>
11
- <div class="col-lg-10">
10
+ <%= f.label :email, class: 'col-md-2 control-label' %>
11
+ <div class="col-md-10">
12
12
  <%= f.email_field :email, class: 'form-control' %>
13
13
  </div>
14
14
  </div>
15
15
 
16
16
  <div class="form-group">
17
- <%= f.label :password, class: 'col-lg-2 control-label' %>
18
- <div class="col-lg-10">
17
+ <%= f.label :password, class: 'col-md-2 control-label' %>
18
+ <div class="col-md-10">
19
19
  <%= f.password_field :password, autocomplete: "off", class: 'form-control' %>
20
20
  <i class="help-block">(leave blank if you don't want to change it)</i>
21
21
  </div>
22
22
  </div>
23
23
 
24
24
  <div class="form-group">
25
- <%= f.label :password_confirmation, class: 'col-lg-2 control-label' %>
26
- <div class="col-lg-10">
25
+ <%= f.label :password_confirmation, class: 'col-md-2 control-label' %>
26
+ <div class="col-md-10">
27
27
  <%= f.password_field :password_confirmation, class: 'form-control' %>
28
28
  </div>
29
29
  </div>
30
30
 
31
31
  <div class="form-group">
32
- <%= f.label :current_password, class: 'col-lg-2 control-label' %>
33
- <div class="col-lg-10">
32
+ <%= f.label :current_password, class: 'col-md-2 control-label' %>
33
+ <div class="col-md-10">
34
34
  <%= f.password_field :current_password, class: 'form-control' %>
35
35
  <i class="help-block">(we need your current password to confirm your changes)</i>
36
36
  </div>
37
37
  </div>
38
38
 
39
39
  <div class="form-group">
40
- <div class="col-lg-10 col-lg-offset-2">
40
+ <div class="col-md-10 col-md-offset-2">
41
41
  <%= f.submit "Update", class: 'btn btn-primary' %>
42
42
  </div>
43
43
  </div>
data/app/views/contour/registrations/new.html.erb CHANGED
@@ -8,45 +8,45 @@
8
8
 
9
9
  <% Contour.sign_up_fields.each do |field_hash| %>
10
10
  <div class="form-group">
11
- <%= f.label field_hash[:attribute], class: 'col-lg-2 control-label' %>
12
- <div class="col-lg-10">
11
+ <%= f.label field_hash[:attribute], class: 'col-md-2 control-label' %>
12
+ <div class="col-md-10">
13
13
  <%= f.send(field_hash[:type], field_hash[:attribute], class: 'form-control') %>
14
14
  </div>
15
15
  </div>
16
16
  <% end %>
17
17
 
18
18
  <div class="form-group">
19
- <%= f.label :email, class: 'col-lg-2 control-label' %>
20
- <div class="col-lg-10">
19
+ <%= f.label :email, class: 'col-md-2 control-label' %>
20
+ <div class="col-md-10">
21
21
  <%= f.email_field :email, class: 'form-control' %>
22
22
  </div>
23
23
  </div>
24
24
 
25
25
  <div class="form-group">
26
- <%= f.label :password, class: 'col-lg-2 control-label' %>
27
- <div class="col-lg-10">
26
+ <%= f.label :password, class: 'col-md-2 control-label' %>
27
+ <div class="col-md-10">
28
28
  <%= f.password_field :password, class: 'form-control' %>
29
29
  </div>
30
30
  </div>
31
31
 
32
32
  <div class="form-group">
33
- <%= f.label :password_confirmation, class: 'col-lg-2 control-label' %>
34
- <div class="col-lg-10">
33
+ <%= f.label :password_confirmation, class: 'col-md-2 control-label' %>
34
+ <div class="col-md-10">
35
35
  <%= f.password_field :password_confirmation, class: 'form-control' %>
36
36
  </div>
37
37
  </div>
38
38
 
39
39
  <% Contour.spam_fields.each do |name| %>
40
40
  <div class="form-group control-special">
41
- <%= label_tag "#{resource_name}[#{name}]", name, class: 'col-lg-2 control-label' %>
42
- <div class="col-lg-10">
41
+ <%= label_tag "#{resource_name}[#{name}]", name, class: 'col-md-2 control-label' %>
42
+ <div class="col-md-10">
43
43
  <%= text_field_tag "#{resource_name}[#{name}]", '', class: 'form-control' %>
44
44
  </div>
45
45
  </div>
46
46
  <% end %>
47
47
 
48
48
  <div class="form-group">
49
- <div class="col-lg-10 col-lg-offset-2">
49
+ <div class="col-md-10 col-md-offset-2">
50
50
  <%= f.submit "Sign up", class: 'btn btn-primary' %>
51
51
  <%= render partial: 'contour/links' %>
52
52
  </div>
data/app/views/contour/sessions/new.html.erb CHANGED
@@ -8,29 +8,29 @@
8
8
 
9
9
  <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), html: { class: 'form-horizontal' }) do |f| %>
10
10
  <div class="form-group">
11
- <%= f.label :email, class: 'col-lg-2 control-label' %>
12
- <div class="col-lg-10">
11
+ <%= f.label :email, class: 'col-md-2 control-label' %>
12
+ <div class="col-md-10">
13
13
  <%= f.email_field :email, class: 'form-control' %>
14
14
  </div>
15
15
  </div>
16
16
 
17
17
  <div class="form-group">
18
- <%= f.label :password, class: 'col-lg-2 control-label' %>
19
- <div class="col-lg-10">
18
+ <%= f.label :password, class: 'col-md-2 control-label' %>
19
+ <div class="col-md-10">
20
20
  <%= f.password_field :password, class: 'form-control' %>
21
21
  </div>
22
22
  </div>
23
23
 
24
24
  <% if devise_mapping.rememberable? -%>
25
25
  <div class="form-group">
26
- <div class="col-lg-10 checkbox">
26
+ <div class="col-md-10 checkbox">
27
27
  <%= f.check_box :remember_me %> <%= f.label :remember_me %>
28
28
  </div>
29
29
  </div>
30
30
  <% end -%>
31
31
 
32
32
  <div class="form-group">
33
- <div class="col-lg-10 col-lg-offset-2">
33
+ <div class="col-md-10 col-md-offset-2">
34
34
  <%= f.submit "Sign in", class: 'btn btn-primary' %>
35
35
  <%= render partial: 'contour/links' %>
36
36
  </div>
data/app/views/contour/unlocks/new.html.erb CHANGED
@@ -7,14 +7,14 @@
7
7
  <%= devise_error_messages! %>
8
8
 
9
9
  <div class="form-group">
10
- <%= f.label :email, class: 'col-lg-2 control-label' %>
11
- <div class="col-lg-10">
10
+ <%= f.label :email, class: 'col-md-2 control-label' %>
11
+ <div class="col-md-10">
12
12
  <%= f.email_field :email, class: 'form-control' %>
13
13
  </div>
14
14
  </div>
15
15
 
16
16
  <div class="form-group">
17
- <div class="col-lg-10 col-lg-offset-2">
17
+ <div class="col-md-10 col-md-offset-2">
18
18
  <%= f.submit "Resend unlock instructions", class: 'btn btn-primary' %>
19
19
  <%= render partial: 'contour/links' %>
20
20
  </div>
data/lib/contour/version.rb CHANGED
@@ -3,7 +3,7 @@ module Contour
3
3
  MAJOR = 2
4
4
  MINOR = 1
5
5
  TINY = 0
6
- BUILD = "beta12" # nil, "pre", "rc", "rc2"
6
+ BUILD = "beta13" # nil, "pre", "rc", "rc2"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
9
9
  end
data/lib/generators/contour/scaffold/templates/_form.html.erb CHANGED
@@ -17,8 +17,8 @@
17
17
 
18
18
  <%- columns.each do |column| -%>
19
19
  <div class="form-group">
20
- <%%= f.label :<%= column.name %>, nil, class: 'col-lg-2 control-label' %>
21
- <div class="col-lg-10">
20
+ <%%= f.label :<%= column.name %>, nil, class: 'col-md-2 control-label' %>
21
+ <div class="col-md-10">
22
22
  <%- if column.name.split('_').last == 'id' -%>
23
23
  <%%= f.select :<%= column.name %>, [['---', nil]] + <%= column.name.split('_')[0..-2].join('_').camelize %>.current.collect{|<%= column.name.first %>| [<%= column.name.first %>.name, <%= column.name.first %>.id]}, {}, class: 'form-control' %>
24
24
  <%- elsif column.field_type == :date_select -%>
@@ -32,7 +32,7 @@
32
32
  <%- end -%>
33
33
 
34
34
  <div class="form-group">
35
- <div class="col-lg-10 col-lg-offset-2">
35
+ <div class="col-md-10 col-md-offset-2">
36
36
  <%%= f.submit nil, class: 'btn btn-primary' %>
37
37
  <%%= cancel %>
38
38
  </div>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: contour
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0.beta12
4
+ version: 2.1.0.beta13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Remo Mueller