From 009c3527bb37f8ad526f26d3eef0e13eca94a670 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Mon, 21 May 2018 15:03:23 +0900 Subject: [PATCH] Use bootstrap4 class instead of font-awesome class Signed-off-by: Kenji Okimoto --- app/views/fluentd/errors.html.haml | 2 +- .../fluentd/settings/in_tail/after_file_choose.html.haml | 2 +- app/views/fluentd/settings/in_tail/confirm.html.haml | 2 +- app/views/fluentd/settings/running_backup/show.html.haml | 2 +- app/views/shared/settings/_form.html.haml | 2 +- app/views/shared/vue/_treeview.html.erb | 2 +- app/views/tutorials/chapter1.html.erb | 4 ++-- app/views/tutorials/chapter2.html.haml | 4 ++-- app/views/tutorials/chapter3.html.haml | 4 ++-- app/views/tutorials/chapter4.html.haml | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/views/fluentd/errors.html.haml b/app/views/fluentd/errors.html.haml index 79b9a36..40055b2 100644 --- a/app/views/fluentd/errors.html.haml +++ b/app/views/fluentd/errors.html.haml @@ -1,5 +1,5 @@ - page_title t('fluentd.common.recent_errors', days: @error_duration_days) do - - link_to raw_log_daemon_path(@fluentd), class: "btn btn-primary pull-right mt-3" do + - link_to raw_log_daemon_path(@fluentd), class: "btn btn-primary float-right mt-3" do = icon('fa-download') = t('fluentd.common.raw_log_link') diff --git a/app/views/fluentd/settings/in_tail/after_file_choose.html.haml b/app/views/fluentd/settings/in_tail/after_file_choose.html.haml index bbf4e61..74834d9 100644 --- a/app/views/fluentd/settings/in_tail/after_file_choose.html.haml +++ b/app/views/fluentd/settings/in_tail/after_file_choose.html.haml @@ -16,5 +16,5 @@ %pre.card-body= file_tail(@setting.path, Settings.in_tail_preview_line_count).join("\n") %p - = f.submit t('terms.next'), class: "btn btn-lg btn-primary pull-right" + = f.submit t('terms.next'), class: "btn btn-lg btn-primary float-right" = link_to t('terms.prev'), daemon_setting_in_tail_path(@fluentd), class: "btn btn-lg btn-secondary" diff --git a/app/views/fluentd/settings/in_tail/confirm.html.haml b/app/views/fluentd/settings/in_tail/confirm.html.haml index 0cdaa00..76748a1 100644 --- a/app/views/fluentd/settings/in_tail/confirm.html.haml +++ b/app/views/fluentd/settings/in_tail/confirm.html.haml @@ -10,4 +10,4 @@ %p = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary float-right" = f.submit t('terms.prev'), class: "btn btn-lg btn-secondary", name: "back" - .clearfix.pull-right= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand) + .clearfix.float-right= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand) diff --git a/app/views/fluentd/settings/running_backup/show.html.haml b/app/views/fluentd/settings/running_backup/show.html.haml index 3375bfa..670f767 100644 --- a/app/views/fluentd/settings/running_backup/show.html.haml +++ b/app/views/fluentd/settings/running_backup/show.html.haml @@ -26,6 +26,6 @@ Diff: %div = t(".diff_description") - .pull-right + .float-right = link_to t(".show_current"), daemon_setting_path(@fluentd) = preserve render "/shared/settings/diff" diff --git a/app/views/shared/settings/_form.html.haml b/app/views/shared/settings/_form.html.haml index 2e07147..859ad86 100644 --- a/app/views/shared/settings/_form.html.haml +++ b/app/views/shared/settings/_form.html.haml @@ -14,5 +14,5 @@ #advanced-setting.collapse - @setting.advanced_options.each do |key| = field(f, key) - = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right" + = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary float-right" diff --git a/app/views/shared/vue/_treeview.html.erb b/app/views/shared/vue/_treeview.html.erb index e85fb11..57c7196 100644 --- a/app/views/shared/vue/_treeview.html.erb +++ b/app/views/shared/vue/_treeview.html.erb @@ -27,7 +27,7 @@
{{ preview }}

- <%= submit_tag submit_button, class: "btn btn-lg btn-primary pull-right", "v-bind:disabled" => "selectedIsDir" %> + <%= submit_tag submit_button, class: "btn btn-lg btn-primary float-right", "v-bind:disabled" => "selectedIsDir" %>

<% end %> diff --git a/app/views/tutorials/chapter1.html.erb b/app/views/tutorials/chapter1.html.erb index 72a2fff..b2ac6d3 100644 --- a/app/views/tutorials/chapter1.html.erb +++ b/app/views/tutorials/chapter1.html.erb @@ -3,7 +3,7 @@ <% page_title t(".page_title") %>

- <%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "pull-right" %> + <%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "float-right" %>

@@ -26,5 +26,5 @@ <%= render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd } %>

- <%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "pull-right" %> + <%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "float-right" %>

diff --git a/app/views/tutorials/chapter2.html.haml b/app/views/tutorials/chapter2.html.haml index 0962b24..6e48400 100644 --- a/app/views/tutorials/chapter2.html.haml +++ b/app/views/tutorials/chapter2.html.haml @@ -2,11 +2,11 @@ %p.clearfix = link_to "<< " << t('tutorials.chapter1.page_title'), tutorials_chapter1_path, class: "pull-left" - = link_to t('tutorials.chapter3.page_title') << " >>", tutorials_chapter3_path, class: "pull-right" + = link_to t('tutorials.chapter3.page_title') << " >>", tutorials_chapter3_path, class: "float-right" :markdown #{t('.lesson_markdown', http_port: @in_http["port"])} %p.clearfix = link_to "<< " << t('tutorials.chapter1.page_title'), tutorials_chapter1_path, class: "pull-left" - = link_to t('tutorials.chapter3.page_title') << " >>", tutorials_chapter3_path, class: "pull-right" + = link_to t('tutorials.chapter3.page_title') << " >>", tutorials_chapter3_path, class: "float-right" diff --git a/app/views/tutorials/chapter3.html.haml b/app/views/tutorials/chapter3.html.haml index 778860e..37de416 100644 --- a/app/views/tutorials/chapter3.html.haml +++ b/app/views/tutorials/chapter3.html.haml @@ -2,11 +2,11 @@ %p.clearfix = link_to "<< " << t('tutorials.chapter2.page_title'), tutorials_chapter2_path, class: "pull-left" - = link_to t('tutorials.chapter4.page_title') << " >>", tutorials_chapter4_path, class: "pull-right" + = link_to t('tutorials.chapter4.page_title') << " >>", tutorials_chapter4_path, class: "float-right" :markdown #{t(".lesson_markdown", edit_config_url: edit_daemon_setting_path(@fluentd))} %p.clearfix = link_to "<< " << t('tutorials.chapter2.page_title'), tutorials_chapter2_path, class: "pull-left" - = link_to t('tutorials.chapter4.page_title') << " >>", tutorials_chapter4_path, class: "pull-right" + = link_to t('tutorials.chapter4.page_title') << " >>", tutorials_chapter4_path, class: "float-right" diff --git a/app/views/tutorials/chapter4.html.haml b/app/views/tutorials/chapter4.html.haml index de617b1..3233dde 100644 --- a/app/views/tutorials/chapter4.html.haml +++ b/app/views/tutorials/chapter4.html.haml @@ -2,11 +2,11 @@ %p.clearfix = link_to "<< " << t('tutorials.chapter3.page_title'), tutorials_chapter3_path, class: "pull-left" - = link_to t('tutorials.chapter5.page_title') << " >>", tutorials_chapter5_path, class: "pull-right" + = link_to t('tutorials.chapter5.page_title') << " >>", tutorials_chapter5_path, class: "float-right" :markdown #{t ".lesson_markdown"} %p.clearfix = link_to "<< " << t('tutorials.chapter3.page_title'), tutorials_chapter3_path, class: "pull-left" - = link_to t('tutorials.chapter5.page_title') << " >>", tutorials_chapter5_path, class: "pull-right" + = link_to t('tutorials.chapter5.page_title') << " >>", tutorials_chapter5_path, class: "float-right"