twitter-bootstrap-rails 2.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (69) hide show
  1. data/README.md +27 -27
  2. data/Rakefile +1 -1
  3. data/lib/generators/bootstrap/install/install_generator.rb +1 -1
  4. data/lib/generators/bootstrap/install/templates/bootstrap.coffee +5 -15
  5. data/lib/generators/bootstrap/install/templates/bootstrap.less +4 -3
  6. data/lib/generators/bootstrap/layout/layout_generator.rb +14 -4
  7. data/lib/generators/bootstrap/layout/templates/layout.html.erb +112 -49
  8. data/lib/generators/bootstrap/layout/templates/layout.html.haml +90 -0
  9. data/lib/generators/bootstrap/layout/templates/layout.html.slim +77 -0
  10. data/lib/generators/bootstrap/themed/templates/_form.html.erb +1 -1
  11. data/lib/generators/bootstrap/themed/templates/_form.html.haml +11 -0
  12. data/lib/generators/bootstrap/themed/templates/_form.html.slim +11 -0
  13. data/lib/generators/bootstrap/themed/templates/edit.html.haml +3 -0
  14. data/lib/generators/bootstrap/themed/templates/edit.html.slim +3 -0
  15. data/lib/generators/bootstrap/themed/templates/index.html.erb +2 -2
  16. data/lib/generators/bootstrap/themed/templates/index.html.haml +25 -0
  17. data/lib/generators/bootstrap/themed/templates/index.html.slim +25 -0
  18. data/lib/generators/bootstrap/themed/templates/new.html.haml +2 -0
  19. data/lib/generators/bootstrap/themed/templates/new.html.slim +2 -0
  20. data/lib/generators/bootstrap/themed/templates/show.html.erb +5 -4
  21. data/lib/generators/bootstrap/themed/templates/show.html.haml +9 -0
  22. data/lib/generators/bootstrap/themed/templates/show.html.slim +9 -0
  23. data/lib/generators/bootstrap/themed/themed_generator.rb +13 -13
  24. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  25. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
  26. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  27. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +9 -3
  28. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +1 -1
  29. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +3 -3
  30. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +6 -4
  31. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +15 -6
  32. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +7 -3
  33. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +3 -3
  34. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +3 -2
  35. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +10 -5
  36. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +1 -1
  37. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +39 -20
  38. data/vendor/toolkit/twitter/bootstrap/accordion.less +5 -4
  39. data/vendor/toolkit/twitter/bootstrap/alerts.less +1 -0
  40. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +10 -8
  41. data/vendor/toolkit/twitter/bootstrap/button-groups.less +48 -18
  42. data/vendor/toolkit/twitter/bootstrap/buttons.less +137 -88
  43. data/vendor/toolkit/twitter/bootstrap/carousel.less +12 -5
  44. data/vendor/toolkit/twitter/bootstrap/code.less +44 -0
  45. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +23 -2
  46. data/vendor/toolkit/twitter/bootstrap/forms.less +83 -64
  47. data/vendor/toolkit/twitter/bootstrap/grid.less +8 -0
  48. data/vendor/toolkit/twitter/bootstrap/hero-unit.less +20 -0
  49. data/vendor/toolkit/twitter/bootstrap/labels.less +4 -4
  50. data/vendor/toolkit/twitter/bootstrap/layouts.less +17 -0
  51. data/vendor/toolkit/twitter/bootstrap/mixins.less +202 -38
  52. data/vendor/toolkit/twitter/bootstrap/modals.less +9 -2
  53. data/vendor/toolkit/twitter/bootstrap/navbar.less +70 -29
  54. data/vendor/toolkit/twitter/bootstrap/navs.less +70 -64
  55. data/vendor/toolkit/twitter/bootstrap/pager.less +7 -2
  56. data/vendor/toolkit/twitter/bootstrap/pagination.less +1 -0
  57. data/vendor/toolkit/twitter/bootstrap/popovers.less +25 -25
  58. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +14 -18
  59. data/vendor/toolkit/twitter/bootstrap/reset.less +2 -3
  60. data/vendor/toolkit/twitter/bootstrap/responsive.less +219 -164
  61. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +6 -89
  62. data/vendor/toolkit/twitter/bootstrap/sprites.less +137 -99
  63. data/vendor/toolkit/twitter/bootstrap/tables.less +1 -54
  64. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +2 -0
  65. data/vendor/toolkit/twitter/bootstrap/type.less +12 -42
  66. data/vendor/toolkit/twitter/bootstrap/variables.less +23 -14
  67. metadata +34 -18
  68. data/vendor/toolkit/twitter/bootstrap/patterns.less +0 -30
  69. data/vendor/toolkit/twitter/bootstrap/print.less +0 -18
@@ -30,22 +30,14 @@
30
30
  @pink: #c3325f;
31
31
  @purple: #7a43b6;
32
32
 
33
- // Grid system
34
- // Modify the grid styles in mixins.less
35
- @gridColumns: 12;
36
- @gridColumnWidth: 60px;
37
- @gridGutterWidth: 20px;
38
- @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
39
- // Fluid width sidebar
40
- @fluidSidebarWidth: 220px;
41
-
42
33
  // Typography
43
34
  @baseFontSize: 13px;
44
35
  @baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
45
36
  @baseLineHeight: 18px;
37
+ @textColor: @grayDark;
46
38
 
47
39
  // Buttons
48
- @primaryButtonColor: @blue;
40
+ @primaryButtonBackground: @linkColor;
49
41
 
50
42
 
51
43
 
@@ -70,21 +62,38 @@
70
62
  @navbarBackground: @grayDarker;
71
63
  @navbarBackgroundHighlight: @grayDark;
72
64
 
65
+ @navbarText: @grayLight;
66
+ @navbarLinkColor: @grayLight;
67
+ @navbarLinkColorHover: @white;
68
+
73
69
  // Form states and alerts
74
70
  @warningText: #c09853;
75
71
  @warningBackground: #fcf8e3;
76
- @warningBorder: #f3edd2;
72
+ @warningBorder: darken(spin(@warningBackground, -10), 3%);
77
73
 
78
74
  @errorText: #b94a48;
79
75
  @errorBackground: #f2dede;
80
- @errorBorder: #e9c7c7;
76
+ @errorBorder: darken(spin(@errorBackground, -10), 3%);
81
77
 
82
78
  @successText: #468847;
83
79
  @successBackground: #dff0d8;
84
- @successBorder: #cfe8c4;
80
+ @successBorder: darken(spin(@successBackground, -10), 5%);
85
81
 
86
82
  @infoText: #3a87ad;
87
83
  @infoBackground: #d9edf7;
88
- @infoBorder: #bfe1f2;
84
+ @infoBorder: darken(spin(@infoBackground, -10), 7%);
85
+
86
+
87
+
88
+ // GRID
89
+ // --------------------------------------------------
89
90
 
91
+ // Default 940px grid
92
+ @gridColumns: 12;
93
+ @gridColumnWidth: 60px;
94
+ @gridGutterWidth: 20px;
95
+ @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
90
96
 
97
+ // Fluid grid
98
+ @fluidGridColumnWidth: 6.382978723%;
99
+ @fluidGridGutterWidth: 2.127659574%;
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: twitter-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: '2.0'
4
+ version: 2.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,54 +9,54 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-28 00:00:00.000000000 Z
12
+ date: 2012-02-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &79576780 !ruby/object:Gem::Requirement
16
+ requirement: &76143120 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
20
20
  - !ruby/object:Gem::Version
21
- version: 3.2.1
21
+ version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *79576780
24
+ version_requirements: *76143120
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionpack
27
- requirement: &79576160 !ruby/object:Gem::Requirement
27
+ requirement: &76142000 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
31
31
  - !ruby/object:Gem::Version
32
- version: 3.2.1
32
+ version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *79576160
35
+ version_requirements: *76142000
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: less-rails
38
- requirement: &79575560 !ruby/object:Gem::Requirement
38
+ requirement: &76141370 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
42
42
  - !ruby/object:Gem::Version
43
- version: 2.1.2
43
+ version: 2.1.5
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *79575560
46
+ version_requirements: *76141370
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &79574900 !ruby/object:Gem::Requirement
49
+ requirement: &76140040 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
- version: 3.2.1
54
+ version: '3.1'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *79574900
57
+ version_requirements: *76140040
58
58
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
59
- Rails 3.2 Asset Pipeline
59
+ Rails 3.1 Asset Pipeline
60
60
  email:
61
61
  - seyhunak@gmail.com
62
62
  executables: []
@@ -64,13 +64,25 @@ extensions: []
64
64
  extra_rdoc_files: []
65
65
  files:
66
66
  - lib/generators/bootstrap/layout/layout_generator.rb
67
+ - lib/generators/bootstrap/layout/templates/layout.html.slim
67
68
  - lib/generators/bootstrap/layout/templates/layout.html.erb
69
+ - lib/generators/bootstrap/layout/templates/layout.html.haml
68
70
  - lib/generators/bootstrap/themed/themed_generator.rb
71
+ - lib/generators/bootstrap/themed/templates/new.html.slim
69
72
  - lib/generators/bootstrap/themed/templates/show.html.erb
73
+ - lib/generators/bootstrap/themed/templates/show.html.slim
70
74
  - lib/generators/bootstrap/themed/templates/new.html.erb
75
+ - lib/generators/bootstrap/themed/templates/show.html.haml
76
+ - lib/generators/bootstrap/themed/templates/edit.html.haml
77
+ - lib/generators/bootstrap/themed/templates/_form.html.haml
78
+ - lib/generators/bootstrap/themed/templates/_form.html.slim
79
+ - lib/generators/bootstrap/themed/templates/edit.html.slim
80
+ - lib/generators/bootstrap/themed/templates/new.html.haml
71
81
  - lib/generators/bootstrap/themed/templates/index.html.erb
72
82
  - lib/generators/bootstrap/themed/templates/_form.html.erb
73
83
  - lib/generators/bootstrap/themed/templates/edit.html.erb
84
+ - lib/generators/bootstrap/themed/templates/index.html.haml
85
+ - lib/generators/bootstrap/themed/templates/index.html.slim
74
86
  - lib/generators/bootstrap/install/templates/bootstrap.coffee
75
87
  - lib/generators/bootstrap/install/templates/application.js
76
88
  - lib/generators/bootstrap/install/templates/application.css
@@ -80,6 +92,8 @@ files:
80
92
  - lib/twitter/bootstrap/rails/bootstrap.rb
81
93
  - lib/twitter/bootstrap/rails/version.rb
82
94
  - lib/twitter/bootstrap/rails/engine.rb
95
+ - vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
96
+ - vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
83
97
  - vendor/assets/stylesheets/twitter/bootstrap.css.less
84
98
  - vendor/assets/javascripts/twitter/bootstrap.js
85
99
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
@@ -96,13 +110,14 @@ files:
96
110
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
97
111
  - vendor/toolkit/twitter/bootstrap.less
98
112
  - vendor/toolkit/twitter/bootstrap/thumbnails.less
113
+ - vendor/toolkit/twitter/bootstrap/code.less
99
114
  - vendor/toolkit/twitter/bootstrap/navbar.less
100
- - vendor/toolkit/twitter/bootstrap/patterns.less
101
115
  - vendor/toolkit/twitter/bootstrap/pagination.less
102
116
  - vendor/toolkit/twitter/bootstrap/close.less
103
117
  - vendor/toolkit/twitter/bootstrap/utilities.less
104
118
  - vendor/toolkit/twitter/bootstrap/carousel.less
105
119
  - vendor/toolkit/twitter/bootstrap/tables.less
120
+ - vendor/toolkit/twitter/bootstrap/grid.less
106
121
  - vendor/toolkit/twitter/bootstrap/labels.less
107
122
  - vendor/toolkit/twitter/bootstrap/tooltip.less
108
123
  - vendor/toolkit/twitter/bootstrap/component-animations.less
@@ -111,10 +126,11 @@ files:
111
126
  - vendor/toolkit/twitter/bootstrap/alerts.less
112
127
  - vendor/toolkit/twitter/bootstrap/scaffolding.less
113
128
  - vendor/toolkit/twitter/bootstrap/navs.less
114
- - vendor/toolkit/twitter/bootstrap/print.less
129
+ - vendor/toolkit/twitter/bootstrap/hero-unit.less
115
130
  - vendor/toolkit/twitter/bootstrap/sprites.less
116
131
  - vendor/toolkit/twitter/bootstrap/forms.less
117
132
  - vendor/toolkit/twitter/bootstrap/button-groups.less
133
+ - vendor/toolkit/twitter/bootstrap/layouts.less
118
134
  - vendor/toolkit/twitter/bootstrap/progress-bars.less
119
135
  - vendor/toolkit/twitter/bootstrap/breadcrumbs.less
120
136
  - vendor/toolkit/twitter/bootstrap/reset.less
@@ -153,5 +169,5 @@ rubyforge_project: twitter-bootstrap-rails
153
169
  rubygems_version: 1.8.11
154
170
  signing_key:
155
171
  specification_version: 3
156
- summary: Bootstrap CSS toolkit for Rails 3.2 Asset Pipeline
172
+ summary: Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline
157
173
  test_files: []
@@ -1,30 +0,0 @@
1
- // Patterns.less
2
- // Repeatable UI elements outside the base styles provided from the scaffolding
3
- // ----------------------------------------------------------------------------
4
-
5
-
6
- // PAGE HEADERS
7
- // ------------
8
-
9
- .hero-unit {
10
- padding: 60px;
11
- margin-bottom: 30px;
12
- background-color: #f5f5f5;
13
- .border-radius(6px);
14
- h1 {
15
- margin-bottom: 0;
16
- font-size: 60px;
17
- line-height: 1;
18
- letter-spacing: -1px;
19
- }
20
- p {
21
- font-size: 18px;
22
- font-weight: 200;
23
- line-height: @baseLineHeight * 1.5;
24
- }
25
- }
26
- footer {
27
- padding-top: @baseLineHeight - 1;
28
- margin-top: @baseLineHeight - 1;
29
- border-top: 1px solid #eee;
30
- }
@@ -1,18 +0,0 @@
1
- /*!
2
- * Bootstrap @VERSION for Print
3
- *
4
- * Copyright 2012 Twitter, Inc
5
- * Licensed under the Apache License v2.0
6
- * http://www.apache.org/licenses/LICENSE-2.0
7
- *
8
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
9
- * Date: @DATE
10
- */
11
-
12
-
13
- // HIDE UNECESSARY COMPONENTS
14
- // --------------------------
15
-
16
- .navbar-fixed {
17
- display: none;
18
- }