twitter-bootstrap-rails 2.0.1.0 → 2.0.2
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 +20 -13
- data/lib/generators/bootstrap/install/install_generator.rb +12 -36
- data/lib/generators/bootstrap/install/templates/application.css +1 -0
- data/lib/generators/bootstrap/install/templates/bootstrap.less +6 -0
- data/lib/generators/bootstrap/layout/templates/layout.html.erb +4 -4
- 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 +3 -4
- data/lib/generators/bootstrap/themed/templates/edit.html.erb +2 -1
- data/lib/generators/bootstrap/themed/templates/index.html.erb +26 -25
- data/lib/generators/bootstrap/themed/templates/show.html.erb +3 -3
- data/lib/twitter/bootstrap/rails/version.rb +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +5 -8
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +3 -3
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +2 -5
- 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 +5 -6
- 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/assets/stylesheets/twitter/bootstrap.css.less +1 -0
- 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 +2 -4
- data/vendor/toolkit/twitter/bootstrap/buttons.less +7 -25
- data/vendor/toolkit/twitter/bootstrap/code.less +0 -13
- data/vendor/toolkit/twitter/bootstrap/dropdowns.less +2 -1
- data/vendor/toolkit/twitter/bootstrap/forms.less +44 -51
- data/vendor/toolkit/twitter/bootstrap/labels.less +7 -23
- data/vendor/toolkit/twitter/bootstrap/mixins.less +25 -78
- data/vendor/toolkit/twitter/bootstrap/modals.less +0 -11
- data/vendor/toolkit/twitter/bootstrap/navbar.less +6 -13
- data/vendor/toolkit/twitter/bootstrap/navs.less +12 -21
- data/vendor/toolkit/twitter/bootstrap/reset.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/responsive.less +6 -10
- data/vendor/toolkit/twitter/bootstrap/sprites.less +7 -9
- data/vendor/toolkit/twitter/bootstrap/tables.less +3 -14
- data/vendor/toolkit/twitter/bootstrap/thumbnails.less +2 -2
- data/vendor/toolkit/twitter/bootstrap/type.less +2 -3
- data/vendor/toolkit/twitter/bootstrap/variables.less +7 -15
- data/vendor/toolkit/twitter/bootstrap.less +1 -0
- metadata +14 -13
- data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +0 -13
- data/vendor/toolkit/twitter/bootstrap_base.less +0 -2
data/README.md
CHANGED
@@ -21,10 +21,6 @@ You can run bundle from command line
|
|
21
21
|
bundle install
|
22
22
|
|
23
23
|
|
24
|
-
## Gem Version
|
25
|
-
twitter-bootstrap-rails v2.0.1.0 (Gem Version 0 with Twitter Bootstrap V.2.0.1)
|
26
|
-
|
27
|
-
|
28
24
|
## Installing to App (using Generators)
|
29
25
|
|
30
26
|
You can run following generators to get started with Twitter Bootstrap quickly.
|
@@ -78,20 +74,24 @@ Bootstrap was built with Preboot, an open-source pack of mixins and variables to
|
|
78
74
|
|
79
75
|
## Using stylesheets with Less
|
80
76
|
|
81
|
-
You have to require Bootstrap LESS (
|
77
|
+
You have to require Bootstrap LESS (bootstrap.less) in your application.css
|
82
78
|
|
83
79
|
/*
|
84
|
-
*= require
|
85
|
-
|
80
|
+
*= require twitter/bootstrap
|
81
|
+
*/
|
86
82
|
|
87
83
|
/* Your stylesheets goes here... */
|
88
84
|
|
89
85
|
|
90
|
-
|
91
|
-
|
86
|
+
Now, you can override LESS files provided by Twitter Bootstrap
|
87
|
+
Also, you can import additional files (.ie responsive)
|
88
|
+
|
89
|
+
@import "twitter/bootstrap";
|
92
90
|
|
93
|
-
|
91
|
+
// import responsive layout
|
92
|
+
@import "twitter/bootstrap/responsive";
|
94
93
|
|
94
|
+
// Your custom stylesheets goes here (override Less here)
|
95
95
|
|
96
96
|
|
97
97
|
## Using Javascripts
|
@@ -112,9 +112,17 @@ twitter-bootstrap-rails generates a "bootstrap.js.coffee" file for you
|
|
112
112
|
to /app/assets/javascripts/ folder.
|
113
113
|
|
114
114
|
jQuery ->
|
115
|
-
$("
|
115
|
+
$(".alert-message").alert()
|
116
|
+
$(".tabs").button()
|
117
|
+
$(".carousel").carousel()
|
118
|
+
$(".collapse").collapse()
|
119
|
+
$(".dropdown-toggle").dropdown()
|
120
|
+
$(".modal").modal()
|
121
|
+
$("a[rel]").popover()
|
122
|
+
$(".navbar").scrollspy()
|
123
|
+
$(".tab").tab "show"
|
116
124
|
$(".tooltip").tooltip()
|
117
|
-
$("
|
125
|
+
$(".typeahead").typeahead()
|
118
126
|
|
119
127
|
|
120
128
|
## Using Static CSS, JS (w/o Less)
|
@@ -149,7 +157,6 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
|
|
149
157
|
<li>Added Haml and Slim support</li>
|
150
158
|
<li>Added Responsive layout support</li>
|
151
159
|
<li>Fixes and release 2.0.0</li>
|
152
|
-
<li>Updated to v2.0.1, versioned v2.0.1.0</li>
|
153
160
|
</ul>
|
154
161
|
|
155
162
|
|
@@ -3,49 +3,25 @@ require 'rails/generators'
|
|
3
3
|
module Bootstrap
|
4
4
|
module Generators
|
5
5
|
class InstallGenerator < ::Rails::Generators::Base
|
6
|
-
|
7
6
|
source_root File.expand_path("../templates", __FILE__)
|
8
7
|
desc "This generator installs Twitter Bootstrap to Asset Pipeline"
|
9
8
|
|
10
9
|
def add_assets
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
# Good enough - that'll include our bootstrap_and_overrides.css.less
|
23
|
-
else
|
24
|
-
style_require_block = " *= require bootstrap_and_overrides\n"
|
25
|
-
insert_into_file "app/assets/stylesheets/application.css", style_require_block, :after => "require_self\n"
|
26
|
-
end
|
27
|
-
else
|
28
|
-
copy_file "application.css", "app/assets/stylesheets/application.css"
|
29
|
-
end
|
30
|
-
|
31
|
-
end
|
10
|
+
if File.exist?('app/assets/javascripts/application.js')
|
11
|
+
insert_into_file "app/assets/javascripts/application.js", "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
|
12
|
+
else
|
13
|
+
copy_file "application.js", "app/assets/javascripts/application.js"
|
14
|
+
end
|
15
|
+
if File.exist?('app/assets/stylesheets/application.css')
|
16
|
+
insert_into_file "app/assets/stylesheets/application.css", " *= require twitter/bootstrap\n", :after => "require_self\n"
|
17
|
+
else
|
18
|
+
copy_file "application.css", "app/assets/stylesheets/application.css"
|
19
|
+
end
|
20
|
+
end
|
32
21
|
|
33
22
|
def add_bootstrap
|
34
23
|
copy_file "bootstrap.coffee", "app/assets/javascripts/bootstrap.js.coffee"
|
35
|
-
copy_file "
|
36
|
-
end
|
37
|
-
|
38
|
-
def cleanup_legacy
|
39
|
-
# Remove old requires (if any) that included twitter/bootstrap directly:
|
40
|
-
gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*twitter/bootstrap\s*\n|, "")
|
41
|
-
gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*twitter/bootstrap_responsive\s*\n|, "")
|
42
|
-
if File.exist?('app/assets/stylesheets/bootstrap_override.css.less')
|
43
|
-
puts <<-EOM
|
44
|
-
Warning:
|
45
|
-
app/assets/stylesheets/bootstrap_override.css.less exists
|
46
|
-
It should be removed, as it has been superceded by app/assets/stylesheets/bootstrap_and_overrides.css.less
|
47
|
-
EOM
|
48
|
-
end
|
24
|
+
copy_file "bootstrap.less", "app/assets/stylesheets/bootstrap.css.less"
|
49
25
|
end
|
50
26
|
|
51
27
|
end
|
@@ -3,5 +3,6 @@
|
|
3
3
|
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
|
4
4
|
* the top of the compiled file, but it's generally better to create a new file per style scope.
|
5
5
|
*= require_self
|
6
|
+
*= require twitter/bootstrap
|
6
7
|
*= require_tree .
|
7
8
|
*/
|
@@ -11,12 +11,12 @@
|
|
11
11
|
<![endif]-->
|
12
12
|
|
13
13
|
<!-- Le styles -->
|
14
|
+
<%%= stylesheet_link_tag "application", :media => "all" %>
|
14
15
|
<style>
|
15
16
|
body {
|
16
17
|
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
|
17
18
|
}
|
18
19
|
</style>
|
19
|
-
<%%= stylesheet_link_tag "application", :media => "all" %>
|
20
20
|
|
21
21
|
<!-- Le fav and touch icons -->
|
22
22
|
<link href="images/favicon.ico" rel="shortcut icon">
|
@@ -34,9 +34,9 @@
|
|
34
34
|
<div class="container">
|
35
35
|
<%- end -%>
|
36
36
|
<a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
|
37
|
-
<span class="
|
38
|
-
<span class="
|
39
|
-
<span class="
|
37
|
+
<span class="i-bar"></span>
|
38
|
+
<span class="i-bar"></span>
|
39
|
+
<span class="i-bar"></span>
|
40
40
|
</a>
|
41
41
|
<a class="brand" href="#"><%= app_name %></a>
|
42
42
|
<div class="<%= container_class %> nav-collapse">
|
@@ -8,11 +8,11 @@
|
|
8
8
|
/[if lt IE 9]
|
9
9
|
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
|
10
10
|
/ Le styles
|
11
|
+
= stylesheet_link_tag "application"
|
11
12
|
:css
|
12
13
|
body {
|
13
14
|
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
|
14
15
|
}
|
15
|
-
= stylesheet_link_tag "application", :media => "all"
|
16
16
|
/ Le fav and touch icons
|
17
17
|
%link{:href => "images/favicon.ico", :rel => "shortcut icon"}/
|
18
18
|
%link{:href => "images/apple-touch-icon.png", :rel => "apple-touch-icon"}/
|
@@ -29,9 +29,9 @@
|
|
29
29
|
.container
|
30
30
|
<%- end -%>
|
31
31
|
%a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
|
32
|
-
%span.
|
33
|
-
%span.
|
34
|
-
%span.
|
32
|
+
%span.i-bar
|
33
|
+
%span.i-bar
|
34
|
+
%span.i-bar
|
35
35
|
%a.brand{:href => "#"}<%= app_name %>
|
36
36
|
.<%=container_class%>.nav-collapse
|
37
37
|
%ul.nav
|
@@ -9,11 +9,11 @@ html lang="en"
|
|
9
9
|
/[if lt IE 9]
|
10
10
|
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
|
11
11
|
/! Le styles
|
12
|
+
= stylesheet_link_tag "application"
|
12
13
|
css:
|
13
14
|
body {
|
14
15
|
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
|
15
16
|
}
|
16
|
-
= stylesheet_link_tag "application", :media => "all"
|
17
17
|
/ Le fav and touch icons
|
18
18
|
link href="images/favicon.ico" rel="shortcut icon"
|
19
19
|
link href="images/apple-touch-icon.png" rel="apple-touch-icon"
|
@@ -30,9 +30,9 @@ html lang="en"
|
|
30
30
|
.container
|
31
31
|
<%- end -%>
|
32
32
|
a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
|
33
|
-
span.
|
34
|
-
span.
|
35
|
-
span.
|
33
|
+
span.i-bar
|
34
|
+
span.i-bar
|
35
|
+
span.i-bar
|
36
36
|
a.brand href="#"<%= app_name %>
|
37
37
|
.<%=container_class%>.nav-collapse
|
38
38
|
ul.nav
|
@@ -1,13 +1,12 @@
|
|
1
1
|
<% columns.each do |column| %>
|
2
2
|
<div class="clearfix">
|
3
|
-
|
3
|
+
<%%= f.label :<%= column.name %>, t("activerecord.attributes.<%= model_name.underscore %>.<%= column.name %>", :default => "<%= column.name.humanize %>"), :class => :label %>
|
4
4
|
<div class="input">
|
5
5
|
<%%= f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>' %>
|
6
6
|
</div>
|
7
7
|
</div>
|
8
8
|
<%- end -%>
|
9
|
-
|
10
9
|
<div class="form-actions">
|
11
|
-
|
12
|
-
|
10
|
+
<button class="btn primary" type="submit">Save</button> or
|
11
|
+
<%%= link_to "Cancel", <%= controller_routing_path %>_path %>
|
13
12
|
</div>
|
@@ -1,3 +1,4 @@
|
|
1
|
-
<%%= form_for @<%= model_name.underscore %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :
|
1
|
+
<%%= form_for @<%= model_name.underscore %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => "edit_<%= model_name.underscore %>", :id => "edit_<%= model_name.underscore %>" } do |f| -%>
|
2
|
+
<input name="_method" type="hidden" value="put" />
|
2
3
|
<%%= render :partial => "form", :locals => {:f => f} %>
|
3
4
|
<%% end -%>
|
@@ -1,33 +1,34 @@
|
|
1
1
|
<h1><%= resource_name.titleize %>s</h1>
|
2
2
|
<table class="table table-striped">
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
3
|
+
<thead>
|
4
|
+
<tr>
|
5
|
+
<th>ID</th>
|
6
|
+
<% unless columns.empty? -%>
|
7
|
+
<th>
|
8
|
+
<%%= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= columns.first.name %>", :default => t("activerecord.labels.<%= columns.first.name %>", :default => "<%= columns.first.name.capitalize %>")) %>
|
9
|
+
</th>
|
10
|
+
<% end -%>
|
11
|
+
<th>Created at</th>
|
12
|
+
<th>Actions</th>
|
13
|
+
</tr>
|
14
14
|
</thead>
|
15
15
|
<tbody>
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
16
|
+
<%% @<%= plural_resource_name %>.each do |<%= resource_name %>| -%>
|
17
|
+
<tr>
|
18
|
+
<td><%%= <%= resource_name %>.id %></td>
|
19
|
+
<% unless columns.empty? -%>
|
20
|
+
<td><%%= link_to <%= resource_name %>.<%= columns.first.name %>, <%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
|
21
|
+
</td>
|
22
|
+
<% end -%>
|
23
|
+
<td><%%= <%= resource_name %>.created_at %></td>
|
24
|
+
<td>
|
25
|
+
<%%= link_to "Show", <%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
|
26
|
+
<%%= link_to "Edit", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
|
27
|
+
<%%= link_to "Destroy", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}" %>
|
28
|
+
</td>
|
29
|
+
</tr>
|
29
30
|
<%% end -%>
|
30
|
-
|
31
|
+
</tbody>
|
31
32
|
</table>
|
32
33
|
|
33
34
|
<%%= link_to "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary' %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<%- end -%>
|
5
5
|
|
6
6
|
<div class="form-actions">
|
7
|
-
|
8
|
-
|
9
|
-
|
7
|
+
<%%= link_to "Back", <%= controller_routing_path %>_path, :class => 'btn' %>
|
8
|
+
<%%= link_to "Edit", edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn' %>
|
9
|
+
<%%= link_to "Delete", <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn' %>
|
10
10
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ==========================================================
|
2
|
-
* bootstrap-alert.js v2.0.
|
2
|
+
* bootstrap-alert.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
4
4
|
* ==========================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -51,14 +51,11 @@
|
|
51
51
|
|
52
52
|
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
|
53
53
|
|
54
|
-
$parent
|
55
|
-
.trigger('close')
|
56
|
-
.removeClass('in')
|
54
|
+
$parent.removeClass('in')
|
57
55
|
|
58
56
|
function removeElement() {
|
59
|
-
$parent
|
60
|
-
|
61
|
-
.remove()
|
57
|
+
$parent.remove()
|
58
|
+
$parent.trigger('closed')
|
62
59
|
}
|
63
60
|
|
64
61
|
$.support.transition && $parent.hasClass('fade') ?
|
@@ -91,4 +88,4 @@
|
|
91
88
|
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
|
92
89
|
})
|
93
90
|
|
94
|
-
}( window.jQuery )
|
91
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ============================================================
|
2
|
-
* bootstrap-button.js v2.0.
|
2
|
+
* bootstrap-button.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
4
4
|
* ============================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -91,8 +91,8 @@
|
|
91
91
|
|
92
92
|
$(function () {
|
93
93
|
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
|
94
|
-
$(e.
|
94
|
+
$(e.target).button('toggle')
|
95
95
|
})
|
96
96
|
})
|
97
97
|
|
98
|
-
}( window.jQuery )
|
98
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ==========================================================
|
2
|
-
* bootstrap-carousel.js v2.0.
|
2
|
+
* bootstrap-carousel.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
4
4
|
* ==========================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -61,7 +61,6 @@
|
|
61
61
|
|
62
62
|
, pause: function () {
|
63
63
|
clearInterval(this.interval)
|
64
|
-
this.interval = null
|
65
64
|
return this
|
66
65
|
}
|
67
66
|
|
@@ -83,8 +82,6 @@
|
|
83
82
|
, fallback = type == 'next' ? 'first' : 'last'
|
84
83
|
, that = this
|
85
84
|
|
86
|
-
if (!$next.length) return
|
87
|
-
|
88
85
|
this.sliding = true
|
89
86
|
|
90
87
|
isCycling && this.pause()
|
@@ -154,4 +151,4 @@
|
|
154
151
|
})
|
155
152
|
})
|
156
153
|
|
157
|
-
}( window.jQuery )
|
154
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* =============================================================
|
2
|
-
* bootstrap-collapse.js v2.0.
|
2
|
+
* bootstrap-collapse.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
4
4
|
* =============================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -133,4 +133,4 @@
|
|
133
133
|
})
|
134
134
|
})
|
135
135
|
|
136
|
-
}( window.jQuery )
|
136
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ============================================================
|
2
|
-
* bootstrap-dropdown.js v2.0.
|
2
|
+
* bootstrap-dropdown.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
4
4
|
* ============================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -89,4 +89,4 @@
|
|
89
89
|
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
90
90
|
})
|
91
91
|
|
92
|
-
}( window.jQuery )
|
92
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* =========================================================
|
2
|
-
* bootstrap-modal.js v2.0.
|
2
|
+
* bootstrap-modal.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#modals
|
4
4
|
* =========================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -26,7 +26,7 @@
|
|
26
26
|
* ====================== */
|
27
27
|
|
28
28
|
var Modal = function ( content, options ) {
|
29
|
-
this.options = options
|
29
|
+
this.options = $.extend({}, $.fn.modal.defaults, options)
|
30
30
|
this.$element = $(content)
|
31
31
|
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
|
32
32
|
}
|
@@ -177,17 +177,16 @@
|
|
177
177
|
return this.each(function () {
|
178
178
|
var $this = $(this)
|
179
179
|
, data = $this.data('modal')
|
180
|
-
, options =
|
180
|
+
, options = typeof option == 'object' && option
|
181
181
|
if (!data) $this.data('modal', (data = new Modal(this, options)))
|
182
182
|
if (typeof option == 'string') data[option]()
|
183
|
-
else
|
183
|
+
else data.show()
|
184
184
|
})
|
185
185
|
}
|
186
186
|
|
187
187
|
$.fn.modal.defaults = {
|
188
188
|
backdrop: true
|
189
189
|
, keyboard: true
|
190
|
-
, show: true
|
191
190
|
}
|
192
191
|
|
193
192
|
$.fn.modal.Constructor = Modal
|
@@ -207,4 +206,4 @@
|
|
207
206
|
})
|
208
207
|
})
|
209
208
|
|
210
|
-
}( window.jQuery )
|
209
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ===========================================================
|
2
|
-
* bootstrap-popover.js v2.0.
|
2
|
+
* bootstrap-popover.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
4
4
|
* ===========================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -92,4 +92,4 @@
|
|
92
92
|
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
|
93
93
|
})
|
94
94
|
|
95
|
-
}( window.jQuery )
|
95
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* =============================================================
|
2
|
-
* bootstrap-scrollspy.js v2.0.
|
2
|
+
* bootstrap-scrollspy.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
4
4
|
* =============================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -122,4 +122,4 @@
|
|
122
122
|
})
|
123
123
|
})
|
124
124
|
|
125
|
-
}( window.jQuery )
|
125
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ========================================================
|
2
|
-
* bootstrap-tab.js v2.0.
|
2
|
+
* bootstrap-tab.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
4
4
|
* ========================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -127,4 +127,4 @@
|
|
127
127
|
})
|
128
128
|
})
|
129
129
|
|
130
|
-
}( window.jQuery )
|
130
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ===========================================================
|
2
|
-
* bootstrap-tooltip.js v2.0.
|
2
|
+
* bootstrap-tooltip.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
4
4
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
5
5
|
* ===========================================================
|
@@ -267,4 +267,4 @@
|
|
267
267
|
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
|
268
268
|
}
|
269
269
|
|
270
|
-
}( window.jQuery )
|
270
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ===================================================
|
2
|
-
* bootstrap-transition.js v2.0.
|
2
|
+
* bootstrap-transition.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
4
4
|
* ===================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -47,5 +47,5 @@
|
|
47
47
|
})()
|
48
48
|
|
49
49
|
})
|
50
|
-
|
51
|
-
}( window.jQuery )
|
50
|
+
|
51
|
+
}( window.jQuery )
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* =============================================================
|
2
|
-
* bootstrap-typeahead.js v2.0.
|
2
|
+
* bootstrap-typeahead.js v2.0.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
4
4
|
* =============================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -268,4 +268,4 @@
|
|
268
268
|
})
|
269
269
|
})
|
270
270
|
|
271
|
-
}( window.jQuery )
|
271
|
+
}( window.jQuery )
|
@@ -0,0 +1 @@
|
|
1
|
+
@import "twitter/bootstrap/bootstrap";
|
@@ -29,7 +29,7 @@
|
|
29
29
|
position: relative;
|
30
30
|
float: left;
|
31
31
|
margin-left: -1px;
|
32
|
-
.border-radius(
|
32
|
+
.border-radius(0px);
|
33
33
|
}
|
34
34
|
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
|
35
35
|
.btn-group .btn:first-child {
|
@@ -133,8 +133,7 @@
|
|
133
133
|
.btn-primary,
|
134
134
|
.btn-danger,
|
135
135
|
.btn-info,
|
136
|
-
.btn-success
|
137
|
-
.btn-inverse {
|
136
|
+
.btn-success {
|
138
137
|
.caret {
|
139
138
|
border-top-color: @white;
|
140
139
|
.opacity(75);
|
@@ -145,4 +144,3 @@
|
|
145
144
|
.btn-small .caret {
|
146
145
|
margin-top: 4px;
|
147
146
|
}
|
148
|
-
|