diff --git a/app/views/fluentd/_form.html.haml b/app/views/fluentd/_form.html.haml index bd3a8e7..8738d4d 100644 --- a/app/views/fluentd/_form.html.haml +++ b/app/views/fluentd/_form.html.haml @@ -1,4 +1,4 @@ -%div.col-lg-6 +%div.col-xs-6 - @fluentd.errors.full_messages.each do |e| %div.alert.alert-danger= e diff --git a/app/views/fluentd/errors.html.haml b/app/views/fluentd/errors.html.haml index 9bebbbc..adfb609 100644 --- a/app/views/fluentd/errors.html.haml +++ b/app/views/fluentd/errors.html.haml @@ -4,7 +4,7 @@ = t('fluentd.common.raw_log_link') %div.row - %div.col-lg-12 + %div.col-xs-12 - @errors.each do |error| %div.panel.panel-default %div.panel-heading diff --git a/app/views/fluentd/log.html.haml b/app/views/fluentd/log.html.haml index bcb22b2..ba655d4 100644 --- a/app/views/fluentd/log.html.haml +++ b/app/views/fluentd/log.html.haml @@ -4,6 +4,6 @@ = t('fluentd.common.raw_log_link') .row - .col-lg-12 + .col-xs-12 = preserve do # partial containing
, so shouldn't break indent
       = render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd }
diff --git a/app/views/fluentd/settings/show.html.haml b/app/views/fluentd/settings/show.html.haml
index 3f7b45d..45f0481 100644
--- a/app/views/fluentd/settings/show.html.haml
+++ b/app/views/fluentd/settings/show.html.haml
@@ -4,7 +4,7 @@
     = t("terms.edit")
 
 .row
-  .col-lg-12
+  .col-xs-12
     %pre
       = preserve do
         = @config
diff --git a/app/views/fluentd/settings/source_and_output.html.haml b/app/views/fluentd/settings/source_and_output.html.haml
index 3e79e32..318a70e 100644
--- a/app/views/fluentd/settings/source_and_output.html.haml
+++ b/app/views/fluentd/settings/source_and_output.html.haml
@@ -3,7 +3,7 @@
 %h2
 
 .row.fluentd-setting-inout
-  .col-lg-4
+  .col-xs-4
     .panel.panel-default
       .panel-heading
         %h4= t('.in')
@@ -16,13 +16,13 @@
           = link_to(daemon_setting_in_syslog_path(@fluentd)) do
             = icon('fa-file-text-o fa-lg')
             = t("fluentd.common.setup_in_syslog")
-  .col-lg-1.arrow-right
+  .col-xs-1.arrow-right
     = icon "fa-arrow-circle-right"
-  .col-lg-2
+  .col-xs-2
     = image_tag "/fluentd-logo.png", style: "max-width: 100%"
-  .col-lg-1.arrow-right
+  .col-xs-1.arrow-right
     = icon "fa-arrow-circle-right"
-  .col-lg-4
+  .col-xs-4
     .panel.panel-default
       .panel-heading
         %h4= t('.out')
diff --git a/app/views/fluentd/show.html.haml b/app/views/fluentd/show.html.haml
index 1be8d04..2bdacbf 100644
--- a/app/views/fluentd/show.html.haml
+++ b/app/views/fluentd/show.html.haml
@@ -1,7 +1,7 @@
 - if @fluentd.present?
   - page_title t('.page_title')
   .row
-    .col-lg-6
+    .col-xs-6
       %div{class: "panel panel-#{@fluentd.agent.running? ? "success":"default"}"}
         .panel-heading
           %h4
@@ -17,7 +17,7 @@
           = link_to icon("fa-play") << t("fluentd.common.start"), start_daemon_agent_path(@fluentd),     method: :put, class: "btn #{@fluentd.agent.running? ? "disabled btn-default" : "btn-primary"}"
           = link_to icon("fa-pause") << t("fluentd.common.stop"), stop_daemon_agent_path(@fluentd),       method: :put, class: "btn #{@fluentd.agent.running? ? "btn-danger" : "disabled btn-default"}"
           = link_to icon("fa-refresh") << t("fluentd.common.restart"), restart_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "btn-warning" : "disabled btn-default"}"
-    .col-lg-6
+    .col-xs-6
       .panel.panel-default
         .panel-heading
           .pull-right
@@ -52,7 +52,7 @@
               %th= @fluentd.class.human_attribute_name(:config_file)
               %td= @fluentd.agent.config_file
   .row
-    .col-lg-12
+    .col-xs-12
       = preserve do # partial containing 
, so shouldn't break indent
         = render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd }
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9906d77..ac18111 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -88,15 +88,15 @@
           <%= render partial: "shared/flash" %>
           <% if content_for?(:page_head) %>
             
-
+

<%= content_for(:page_head) %>

- +
<% end %>
-
+
<%= yield %>
diff --git a/app/views/misc/information.html.haml b/app/views/misc/information.html.haml index e9787e4..41b7244 100644 --- a/app/views/misc/information.html.haml +++ b/app/views/misc/information.html.haml @@ -5,14 +5,14 @@ - if FluentdUI.update_available? .row - .col-lg-12 + .col-xs-12 %p = link_to misc_update_daemon_ui_path, class: "btn btn-primary btn-lg", method: :post do = t('.update_fluentd_ui', version: FluentdUI.latest_version, title: fluentd_ui_title) = t('.update_fluentd_ui_caution', brand: fluentd_ui_brand) .row - %div.col-lg-6 + %div.col-xs-6 %div.panel.panel-default %div.panel-heading %h4= t ".version" @@ -25,7 +25,7 @@ %dt fluentd-ui %dd= FluentdUI::VERSION - %div.col-lg-6 + %div.col-xs-6 %div.panel.panel-default %div.panel-heading %h4= t('.installed_plugins') @@ -45,7 +45,7 @@ = t "plugins.common.no_installed" .row - %div.col-lg-12 + %div.col-xs-12 %div.panel.panel-default %div.panel-heading %h4{"data-toggle" => "collapse", "href" => "#env-table"} diff --git a/app/views/plugins/installed.html.haml b/app/views/plugins/installed.html.haml index c4db3da..cc836a5 100644 --- a/app/views/plugins/installed.html.haml +++ b/app/views/plugins/installed.html.haml @@ -3,13 +3,13 @@ %table{class: "table table-striped table-hover", id: "plugins-table"} %thead %tr - %th.col-lg-1 - %th.col-lg-1= t('plugins.common.name') + %th.col-xs-1 + %th.col-xs-1= t('plugins.common.name') %th{width: 160}= t('plugins.common.authors') %th{width: 320}= t('plugins.common.summary') - %th.col-lg-1= t('plugins.common.installed_version') - %th.col-lg-1= t('plugins.common.latest_version') - %th.col-lg-1 + %th.col-xs-1= t('plugins.common.installed_version') + %th.col-xs-1= t('plugins.common.latest_version') + %th.col-xs-1 %tbody - @plugins.each do |plugin| %tr diff --git a/app/views/plugins/updated.html.haml b/app/views/plugins/updated.html.haml index c5091b7..985bde5 100644 --- a/app/views/plugins/updated.html.haml +++ b/app/views/plugins/updated.html.haml @@ -6,11 +6,11 @@ = form_tag(bulk_upgrade_plugins_path, method: :patch) do %table{class: "table table-striped table-hover"} %tr - %th.col-lg-2= t('plugins.common.name') - %th.col-lg-2= t('plugins.common.authors') - %th.col-lg-6= t('plugins.common.summary') - %th.col-lg-1= t('plugins.common.installed_version') - %th.col-lg-1= t('plugins.common.latest_version') + %th.col-xs-2= t('plugins.common.name') + %th.col-xs-2= t('plugins.common.authors') + %th.col-xs-6= t('plugins.common.summary') + %th.col-xs-1= t('plugins.common.installed_version') + %th.col-xs-1= t('plugins.common.latest_version') - @plugins.each do |plugin| %tr %td diff --git a/app/views/shared/_initial_setup.html.haml b/app/views/shared/_initial_setup.html.haml index da664fd..6e79421 100644 --- a/app/views/shared/_initial_setup.html.haml +++ b/app/views/shared/_initial_setup.html.haml @@ -1,10 +1,10 @@ - page_title "fluentd" %div.row - %div.col-lg-6 + %div.col-xs-6 %div.well %span= link_to icon("fa-cog") << t("terms.setup", target: "fluentd"), new_daemon_path(variant: "fluentd_gem"), class: "btn btn-primary btn-lg" - %div.col-lg-6 + %div.col-xs-6 %div.well %span = link_to icon("fa-cog") << t("terms.setup", target: "td-agent"), new_daemon_path(variant: "td-agent"), class: "btn btn-lg #{has_td_agent_system? ? "btn-primary" : "btn-default disabled"}" diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 60e24a3..bea6238 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -2,7 +2,7 @@ -%div.col-lg-6 +%div.col-xs-6 - @user.errors.full_messages.each do |e| %div.alert.alert-danger= e