Skip to content

Commit 241ddd6

Browse files
author
root
committed
Use Redmine Bootstrap Kit plugin
1 parent 51aff0e commit 241ddd6

36 files changed

+24
-4782
lines changed

Diff for: app/views/common/_git_urls.html.erb

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
<% content_for :header_tags do %>
2828
<%= stylesheet_link_tag 'git_urls', :plugin => 'redmine_git_hosting' %>
29-
<%= stylesheet_link_tag 'bootstrap/bootstrap_tooltip', :plugin => 'redmine_git_hosting' %>
29+
<%= stylesheet_link_tag 'bootstrap/bootstrap_tooltip', :plugin => 'redmine_bootstrap_kit' %>
3030

31-
<%= javascript_include_tag 'plugins/bootstrap_tooltip', :plugin => 'redmine_git_hosting' %>
31+
<%= javascript_include_tag 'plugins/bootstrap_tooltip', :plugin => 'redmine_bootstrap_kit' %>
3232
<%= javascript_include_tag 'plugins/zero_clipboard_min', :plugin => 'redmine_git_hosting' %>
3333
<%= javascript_include_tag 'set_zero_clipboard', :plugin => 'redmine_git_hosting' %>
3434

Diff for: app/views/projects/settings/_repositories.html.erb

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<% end %>
6969

7070
<% content_for :header_tags do %>
71-
<%= stylesheet_link_tag 'bootstrap/bootstrap_custom', :plugin => 'redmine_git_hosting' %>
72-
<%= stylesheet_link_tag 'bootstrap/bootstrap_label', :plugin => 'redmine_git_hosting' %>
73-
<%= stylesheet_link_tag 'bootstrap/bootstrap_tables', :plugin => 'redmine_git_hosting' %>
71+
<%= stylesheet_link_tag 'bootstrap/bootstrap_custom', :plugin => 'redmine_bootstrap_kit' %>
72+
<%= stylesheet_link_tag 'bootstrap/bootstrap_label', :plugin => 'redmine_bootstrap_kit' %>
73+
<%= stylesheet_link_tag 'bootstrap/bootstrap_tables', :plugin => 'redmine_bootstrap_kit' %>
7474
<% end %>

Diff for: app/views/repositories/_download_revision.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727

2828
<% content_for :header_tags do %>
29-
<%= stylesheet_link_tag 'font_awesome', :plugin => 'redmine_git_hosting' %>
29+
<%= stylesheet_link_tag 'font_awesome', :plugin => 'redmine_bootstrap_kit' %>
3030
<% end %>
3131

3232
<% end %>

Diff for: app/views/repositories/_form.html.erb

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
<% content_for :header_tags do %>
2-
<%= stylesheet_link_tag 'font_awesome', :plugin => 'redmine_git_hosting' %>
3-
<%= stylesheet_link_tag 'git_urls', :plugin => 'redmine_git_hosting' %>
4-
5-
<%= stylesheet_link_tag 'bootstrap/bootstrap_custom', :plugin => 'redmine_git_hosting' %>
6-
<%= stylesheet_link_tag 'bootstrap/bootstrap_label', :plugin => 'redmine_git_hosting' %>
7-
<%= stylesheet_link_tag 'bootstrap/bootstrap_switch', :plugin => 'redmine_git_hosting' %>
8-
<%= stylesheet_link_tag 'bootstrap/bootstrap_tables', :plugin => 'redmine_git_hosting' %>
2+
<%= stylesheet_link_tag 'font_awesome', :plugin => 'redmine_bootstrap_kit' %>
3+
<%= stylesheet_link_tag 'bootstrap/bootstrap_custom', :plugin => 'redmine_bootstrap_kit' %>
4+
<%= stylesheet_link_tag 'bootstrap/bootstrap_label', :plugin => 'redmine_bootstrap_kit' %>
5+
<%= stylesheet_link_tag 'bootstrap/bootstrap_switch', :plugin => 'redmine_bootstrap_kit' %>
6+
<%= stylesheet_link_tag 'bootstrap/bootstrap_tables', :plugin => 'redmine_bootstrap_kit' %>
97

8+
<%= stylesheet_link_tag 'git_urls', :plugin => 'redmine_git_hosting' %>
109
<%= stylesheet_link_tag 'tag_it/jquery_tagit', :plugin => 'redmine_git_hosting' %>
1110

12-
<%= javascript_include_tag 'plugins/bootstrap_switch', :plugin => 'redmine_git_hosting' %>
13-
<%= javascript_include_tag 'plugins/bootstrap_transitions', :plugin => 'redmine_git_hosting' %>
11+
<%= javascript_include_tag 'plugins/bootstrap_switch', :plugin => 'redmine_bootstrap_kit' %>
12+
<%= javascript_include_tag 'plugins/bootstrap_transitions', :plugin => 'redmine_bootstrap_kit' %>
13+
<%= javascript_include_tag 'bootstrap', :plugin => 'redmine_bootstrap_kit' %>
14+
1415
<%= javascript_include_tag 'plugins/tag_it', :plugin => 'redmine_git_hosting' %>
1516
<%= javascript_include_tag 'plugins/zero_clipboard_min', :plugin => 'redmine_git_hosting' %>
1617

17-
<%= javascript_include_tag 'bootstrap', :plugin => 'redmine_git_hosting' %>
18-
1918
<%= javascript_tag do %>
2019
$(document).ready(function() {
2120
$('.bootstrap-switch').each(function(index, element) {

Diff for: app/views/repositories/stats.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<% content_for :header_tags do %>
44
<%= stylesheet_link_tag 'application', :plugin => 'redmine_git_hosting' %>
5-
<%= stylesheet_link_tag 'bootstrap/bootstrap_custom', :plugin => 'redmine_git_hosting' %>
5+
<%= stylesheet_link_tag 'bootstrap/bootstrap_custom', :plugin => 'redmine_bootstrap_kit' %>
66
<%= javascript_include_tag 'highcharts/highcharts', :plugin => 'redmine_git_hosting' %>
77
<%= javascript_include_tag 'highcharts/modules/drilldown', :plugin => 'redmine_git_hosting' %>
88
<%= javascript_include_tag 'set_highcharts', :plugin => 'redmine_git_hosting' %>

Diff for: app/views/settings/_redmine_git_hosting.html.erb

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<% content_for :header_tags do %>
22
<%= stylesheet_link_tag 'application', :plugin => 'redmine_git_hosting' %>
33
<%= stylesheet_link_tag 'tag_it/jquery_tagit', :plugin => 'redmine_git_hosting' %>
4-
<%= stylesheet_link_tag 'bootstrap/bootstrap_alert', :plugin => 'redmine_git_hosting' %>
5-
<%= stylesheet_link_tag 'bootstrap/bootstrap_label' , :plugin => 'redmine_git_hosting' %>
6-
<%= stylesheet_link_tag 'bootstrap/bootstrap_switch', :plugin => 'redmine_git_hosting' %>
7-
<%= stylesheet_link_tag 'bootstrap/bootstrap_tables', :plugin => 'redmine_git_hosting' %>
4+
5+
<%= stylesheet_link_tag 'bootstrap/bootstrap_alert', :plugin => 'redmine_bootstrap_kit' %>
6+
<%= stylesheet_link_tag 'bootstrap/bootstrap_label' , :plugin => 'redmine_bootstrap_kit' %>
7+
<%= stylesheet_link_tag 'bootstrap/bootstrap_switch', :plugin => 'redmine_bootstrap_kit' %>
8+
<%= stylesheet_link_tag 'bootstrap/bootstrap_tables', :plugin => 'redmine_bootstrap_kit' %>
89

910
<%= javascript_include_tag 'plugins/tag_it', :plugin => 'redmine_git_hosting' %>
10-
<%= javascript_include_tag 'plugins/bootstrap_switch', :plugin => 'redmine_git_hosting' %>
11-
<%= javascript_include_tag 'bootstrap', :plugin => 'redmine_git_hosting' %>
11+
<%= javascript_include_tag 'plugins/bootstrap_switch', :plugin => 'redmine_bootstrap_kit' %>
12+
<%= javascript_include_tag 'bootstrap', :plugin => 'redmine_bootstrap_kit' %>
1213
<% end %>
1314

1415
<% settings_tabs = [

Diff for: assets/fonts/FontAwesome.otf

-61.4 KB
Binary file not shown.

Diff for: assets/fonts/fontawesome-webfont.eot

-37.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)