twitter-bootstrap-rails 2.0.2 → 2.0.3
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.
- data/README.md +16 -25
- data/lib/generators/bootstrap/install/install_generator.rb +36 -12
- data/lib/generators/bootstrap/install/templates/application.css +0 -1
- data/lib/generators/bootstrap/install/templates/bootstrap.coffee +1 -10
- data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +17 -0
- data/lib/generators/bootstrap/layout/templates/layout.html.erb +17 -16
- data/lib/generators/bootstrap/layout/templates/layout.html.haml +4 -4
- data/lib/generators/bootstrap/layout/templates/layout.html.slim +4 -4
- data/lib/generators/bootstrap/themed/templates/_form.html.erb +19 -12
- data/lib/generators/bootstrap/themed/templates/edit.html.erb +1 -4
- data/lib/generators/bootstrap/themed/templates/index.html.erb +24 -28
- data/lib/generators/bootstrap/themed/templates/new.html.erb +1 -3
- data/lib/generators/bootstrap/themed/templates/show.html.erb +11 -7
- data/lib/twitter/bootstrap/rails/version.rb +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +8 -5
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +3 -3
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +5 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +6 -5
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +3 -3
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +2 -2
- data/vendor/toolkit/twitter/bootstrap/bootstrap.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/button-groups.less +4 -2
- data/vendor/toolkit/twitter/bootstrap/buttons.less +25 -7
- data/vendor/toolkit/twitter/bootstrap/code.less +13 -0
- data/vendor/toolkit/twitter/bootstrap/dropdowns.less +1 -2
- data/vendor/toolkit/twitter/bootstrap/forms.less +51 -44
- data/vendor/toolkit/twitter/bootstrap/labels.less +23 -7
- data/vendor/toolkit/twitter/bootstrap/mixins.less +79 -26
- data/vendor/toolkit/twitter/bootstrap/modals.less +11 -0
- data/vendor/toolkit/twitter/bootstrap/navbar.less +13 -6
- data/vendor/toolkit/twitter/bootstrap/navs.less +21 -12
- data/vendor/toolkit/twitter/bootstrap/reset.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/responsive.less +10 -6
- data/vendor/toolkit/twitter/bootstrap/sprites.less +9 -7
- data/vendor/toolkit/twitter/bootstrap/tables.less +14 -3
- data/vendor/toolkit/twitter/bootstrap/thumbnails.less +2 -2
- data/vendor/toolkit/twitter/bootstrap/type.less +3 -2
- data/vendor/toolkit/twitter/bootstrap/variables.less +15 -7
- data/vendor/toolkit/twitter/bootstrap_base.less +2 -0
- metadata +13 -14
- data/lib/generators/bootstrap/install/templates/bootstrap.less +0 -6
- data/vendor/assets/stylesheets/twitter/bootstrap.css.less +0 -1
- data/vendor/toolkit/twitter/bootstrap.less +0 -1
@@ -6,27 +6,29 @@
|
|
6
6
|
// ICONS
|
7
7
|
// -----
|
8
8
|
|
9
|
-
// All icons receive the styles of the <i> tag with a base class
|
10
|
-
// of .i and are then given a unique class to add width, height,
|
9
|
+
// All icons receive the styles of the <i> tag with a base class
|
10
|
+
// of .i and are then given a unique class to add width, height,
|
11
11
|
// and background-position. Your resulting HTML will look like
|
12
|
-
// <i class="
|
12
|
+
// <i class="icon-inbox"></i>.
|
13
13
|
|
14
14
|
// For the white version of the icons, just add the .icon-white class:
|
15
|
-
// <i class="
|
15
|
+
// <i class="icon-inbox icon-white"></i>
|
16
16
|
|
17
|
-
[class^="icon-"]
|
17
|
+
[class^="icon-"],
|
18
|
+
[class*=" icon-"] {
|
18
19
|
display: inline-block;
|
19
20
|
width: 14px;
|
20
21
|
height: 14px;
|
22
|
+
line-height: 14px;
|
21
23
|
vertical-align: text-top;
|
22
|
-
background-image:
|
24
|
+
background-image: url(@iconSpritePath);
|
23
25
|
background-position: 14px 14px;
|
24
26
|
background-repeat: no-repeat;
|
25
27
|
|
26
28
|
.ie7-restore-right-whitespace();
|
27
29
|
}
|
28
30
|
.icon-white {
|
29
|
-
background-image:
|
31
|
+
background-image: url(@iconWhiteSpritePath);
|
30
32
|
}
|
31
33
|
|
32
34
|
.icon-glass { background-position: 0 0; }
|
@@ -25,14 +25,15 @@ table {
|
|
25
25
|
padding: 8px;
|
26
26
|
line-height: @baseLineHeight;
|
27
27
|
text-align: left;
|
28
|
+
vertical-align: top;
|
28
29
|
border-top: 1px solid #ddd;
|
29
30
|
}
|
30
31
|
th {
|
31
32
|
font-weight: bold;
|
32
|
-
vertical-align: bottom;
|
33
33
|
}
|
34
|
-
|
35
|
-
|
34
|
+
// Bottom align for column headings
|
35
|
+
thead th {
|
36
|
+
vertical-align: bottom;
|
36
37
|
}
|
37
38
|
// Remove top border from thead by default
|
38
39
|
thead:first-child tr th,
|
@@ -113,6 +114,16 @@ table {
|
|
113
114
|
}
|
114
115
|
|
115
116
|
|
117
|
+
// HOVER EFFECT
|
118
|
+
// ------------
|
119
|
+
// Placed here since it has to come after the potential zebra striping
|
120
|
+
.table {
|
121
|
+
tbody tr:hover td,
|
122
|
+
tbody tr:hover th {
|
123
|
+
background-color: #f5f5f5;
|
124
|
+
}
|
125
|
+
}
|
126
|
+
|
116
127
|
|
117
128
|
// TABLE CELL SIZING
|
118
129
|
// -----------------
|
@@ -2,13 +2,13 @@
|
|
2
2
|
// ----------
|
3
3
|
|
4
4
|
.thumbnails {
|
5
|
-
margin-left:
|
5
|
+
margin-left: -@gridGutterWidth;
|
6
6
|
list-style: none;
|
7
7
|
.clearfix();
|
8
8
|
}
|
9
9
|
.thumbnails > li {
|
10
10
|
float: left;
|
11
|
-
margin: 0 0 @baseLineHeight
|
11
|
+
margin: 0 0 @baseLineHeight @gridGutterWidth;
|
12
12
|
}
|
13
13
|
.thumbnail {
|
14
14
|
display: block;
|
@@ -110,7 +110,8 @@ ol {
|
|
110
110
|
li {
|
111
111
|
line-height: @baseLineHeight;
|
112
112
|
}
|
113
|
-
ul.unstyled
|
113
|
+
ul.unstyled,
|
114
|
+
ol.unstyled {
|
114
115
|
margin-left: 0;
|
115
116
|
list-style: none;
|
116
117
|
}
|
@@ -137,7 +138,7 @@ dd {
|
|
137
138
|
hr {
|
138
139
|
margin: @baseLineHeight 0;
|
139
140
|
border: 0;
|
140
|
-
border-top: 1px solid
|
141
|
+
border-top: 1px solid @hrBorder;
|
141
142
|
border-bottom: 1px solid @white;
|
142
143
|
}
|
143
144
|
|
@@ -47,20 +47,28 @@
|
|
47
47
|
// Z-index master list
|
48
48
|
// Used for a bird's eye view of components dependent on the z-axis
|
49
49
|
// Try to avoid customizing these :)
|
50
|
-
@zindexDropdown:
|
51
|
-
@zindexPopover:
|
52
|
-
@zindexTooltip:
|
53
|
-
@zindexFixedNavbar:
|
54
|
-
@zindexModalBackdrop:
|
55
|
-
@zindexModal:
|
50
|
+
@zindexDropdown: 1000;
|
51
|
+
@zindexPopover: 1010;
|
52
|
+
@zindexTooltip: 1020;
|
53
|
+
@zindexFixedNavbar: 1030;
|
54
|
+
@zindexModalBackdrop: 1040;
|
55
|
+
@zindexModal: 1050;
|
56
|
+
|
57
|
+
// Sprite icons path
|
58
|
+
@iconSpritePath: "../img/glyphicons-halflings.png";
|
59
|
+
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
|
56
60
|
|
57
61
|
// Input placeholder text color
|
58
|
-
@placeholderText:
|
62
|
+
@placeholderText: @grayLight;
|
63
|
+
|
64
|
+
// Hr border color
|
65
|
+
@hrBorder: @grayLighter;
|
59
66
|
|
60
67
|
// Navbar
|
61
68
|
@navbarHeight: 40px;
|
62
69
|
@navbarBackground: @grayDarker;
|
63
70
|
@navbarBackgroundHighlight: @grayDark;
|
71
|
+
@navbarLinkBackgroundHover: transparent;
|
64
72
|
|
65
73
|
@navbarText: @grayLight;
|
66
74
|
@navbarLinkColor: @grayLight;
|
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.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-02-
|
12
|
+
date: 2012-02-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: railties
|
16
|
-
requirement: &
|
16
|
+
requirement: &72966450 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '3.1'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *72966450
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: actionpack
|
27
|
-
requirement: &
|
27
|
+
requirement: &72966170 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,21 +32,21 @@ dependencies:
|
|
32
32
|
version: '3.1'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *72966170
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: less-rails
|
38
|
-
requirement: &
|
38
|
+
requirement: &72965850 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version: 2.1.
|
43
|
+
version: 2.1.6
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *72965850
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: rails
|
49
|
-
requirement: &
|
49
|
+
requirement: &72965510 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,7 +54,7 @@ dependencies:
|
|
54
54
|
version: '3.1'
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *72965510
|
58
58
|
description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
|
59
59
|
Rails 3.1 Asset Pipeline
|
60
60
|
email:
|
@@ -84,9 +84,9 @@ files:
|
|
84
84
|
- lib/generators/bootstrap/themed/templates/index.html.haml
|
85
85
|
- lib/generators/bootstrap/themed/templates/index.html.slim
|
86
86
|
- lib/generators/bootstrap/install/templates/bootstrap.coffee
|
87
|
+
- lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
|
87
88
|
- lib/generators/bootstrap/install/templates/application.js
|
88
89
|
- lib/generators/bootstrap/install/templates/application.css
|
89
|
-
- lib/generators/bootstrap/install/templates/bootstrap.less
|
90
90
|
- lib/generators/bootstrap/install/install_generator.rb
|
91
91
|
- lib/twitter-bootstrap-rails.rb
|
92
92
|
- lib/twitter/bootstrap/rails/bootstrap.rb
|
@@ -94,7 +94,6 @@ files:
|
|
94
94
|
- lib/twitter/bootstrap/rails/engine.rb
|
95
95
|
- vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
|
96
96
|
- vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
|
97
|
-
- vendor/assets/stylesheets/twitter/bootstrap.css.less
|
98
97
|
- vendor/assets/javascripts/twitter/bootstrap.js
|
99
98
|
- vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
|
100
99
|
- vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js
|
@@ -108,7 +107,7 @@ files:
|
|
108
107
|
- vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js
|
109
108
|
- vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
|
110
109
|
- vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
|
111
|
-
- vendor/toolkit/twitter/
|
110
|
+
- vendor/toolkit/twitter/bootstrap_base.less
|
112
111
|
- vendor/toolkit/twitter/bootstrap/thumbnails.less
|
113
112
|
- vendor/toolkit/twitter/bootstrap/code.less
|
114
113
|
- vendor/toolkit/twitter/bootstrap/navbar.less
|
@@ -1 +0,0 @@
|
|
1
|
-
@import "twitter/bootstrap/bootstrap";
|
@@ -1 +0,0 @@
|
|
1
|
-
@import "bootstrap/bootstrap.less";
|