bootstrapped-rails 2.0.7 → 2.0.7.1
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/bootstrapped-rails/version.rb +1 -1
- data/lib/generators/bootstrapped/layout/templates/_bootstrapped-navigation.html.erb +20 -19
- data/lib/generators/bootstrapped/layout/templates/_sidebar.html.erb +1 -1
- data/vendor/assets/stylesheets/bootstrapped/buttons.scss +12 -6
- data/vendor/assets/stylesheets/bootstrapped/navs.scss +3 -0
- metadata +7 -7
@@ -1,22 +1,23 @@
|
|
1
1
|
<div class="navbar navbar-fixed-top">
|
2
|
-
<div class="navbar-inner">
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
2
|
+
<div class="navbar-inner">
|
3
|
+
<%- if layout_type == "fluid" -%>
|
4
|
+
<div class="container-fluid">
|
5
|
+
<%- else -%>
|
6
|
+
<div class="container">
|
7
|
+
<%- end -%>
|
8
|
+
<a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
|
9
|
+
<span class="icon-bar"></span>
|
10
|
+
<span class="icon-bar"></span>
|
11
|
+
<span class="icon-bar"></span>
|
12
|
+
</a>
|
13
|
+
<a class="brand" href="#"><%= app_name %></a>
|
14
|
+
<div class="<%= container_class %> nav-collapse" style="float:right">
|
15
|
+
<ul class="nav">
|
16
|
+
<%- (1..3).each do |i| -%>
|
17
|
+
<li><%%= link_to "Link<%= i %>", "#" %></li>
|
18
|
+
<%- end -%>
|
19
|
+
</ul>
|
20
|
+
</div><!--/.nav-collapse -->
|
21
|
+
</div>
|
21
22
|
</div>
|
22
23
|
</div>
|
@@ -122,7 +122,7 @@
|
|
122
122
|
@include button-background($primaryButtonBackground, adjust-hue($primaryButtonBackground, 20));
|
123
123
|
&:hover {
|
124
124
|
@include button-background(darken($primaryButtonBackground, 6.2%), adjust-hue(darken($primaryButtonBackground, 6.2%), 20));
|
125
|
-
@include transition(background-position .
|
125
|
+
@include transition(background-position .2s linear);
|
126
126
|
}
|
127
127
|
}
|
128
128
|
// Warning appears are orange
|
@@ -130,7 +130,7 @@
|
|
130
130
|
@include button-background(lighten($orange, 15%), $orange);
|
131
131
|
&:hover {
|
132
132
|
@include button-background(darken($orange, 6.2%), adjust-hue(darken($orange, 6.2%), 20));
|
133
|
-
@include transition(background-position .
|
133
|
+
@include transition(background-position .2s linear);
|
134
134
|
}
|
135
135
|
}
|
136
136
|
// Danger and error appear as red
|
@@ -138,7 +138,7 @@
|
|
138
138
|
@include button-background(#ee5f5b, #bd362f);
|
139
139
|
&:hover {
|
140
140
|
@include button-background(darken(#ee5f5b, 6.2%), adjust-hue(darken(#bd362f, 6.2%), 20));
|
141
|
-
@include transition(background-position .
|
141
|
+
@include transition(background-position .2s linear);
|
142
142
|
}
|
143
143
|
}
|
144
144
|
// Success appears as green
|
@@ -146,7 +146,7 @@
|
|
146
146
|
@include button-background(#62c462, #51a351);
|
147
147
|
&:hover {
|
148
148
|
@include button-background(darken(#62c462, 6.2%), adjust-hue(darken(#51a351, 6.2%), 20));
|
149
|
-
@include transition(background-position .
|
149
|
+
@include transition(background-position .2s linear);
|
150
150
|
}
|
151
151
|
}
|
152
152
|
// Info appears as a neutral blue
|
@@ -154,10 +154,16 @@
|
|
154
154
|
@include button-background(#5bc0de, #2f96b4);
|
155
155
|
&:hover {
|
156
156
|
@include button-background(darken(#5bc0de, 6.2%), adjust-hue(darken(#2f96b4, 6.2%), 20));
|
157
|
-
@include transition(background-position .
|
157
|
+
@include transition(background-position .2s linear);
|
158
|
+
}
|
159
|
+
}
|
160
|
+
.btn-inverse, .btn.btn-inverse {
|
161
|
+
@include button-background(#454545, #262626);
|
162
|
+
&:hover {
|
163
|
+
@include button-background(darken(#454545, 6.2%), adjust-hue(darken(#262626, 6.2%), 20));
|
164
|
+
@include transition(background-position .2s linear);
|
158
165
|
}
|
159
166
|
}
|
160
|
-
|
161
167
|
|
162
168
|
// Cross-browser Jank
|
163
169
|
// --------------------------------------------------
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bootstrapped-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.7
|
4
|
+
version: 2.0.7.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2012-03-08 00:00:00.000000000Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: sass
|
16
|
-
requirement: &
|
16
|
+
requirement: &70098669661200 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 3.1.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70098669661200
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: bundler
|
27
|
-
requirement: &
|
27
|
+
requirement: &70098669660260 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 1.0.0
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70098669660260
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: rails
|
38
|
-
requirement: &
|
38
|
+
requirement: &70098669659320 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,7 +43,7 @@ dependencies:
|
|
43
43
|
version: '3.1'
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70098669659320
|
47
47
|
description: ! ' please see summary '
|
48
48
|
email:
|
49
49
|
- han@logicalprep.com
|