diff --git a/app/assets/stylesheets/campaign.css.scss b/app/assets/stylesheets/campaign.css.scss index 8d3ad91..c87ccd1 100644 --- a/app/assets/stylesheets/campaign.css.scss +++ b/app/assets/stylesheets/campaign.css.scss @@ -2,6 +2,14 @@ body { margin-top: 50px; } +h2 { + margin-top: 0; +} + +strong, label, th { + color: #395C84; +} + ul { list-style: none; padding-left: 0; @@ -11,6 +19,16 @@ ul { font-size: .85em; } +.alert { + margin-bottom: 0; + margin-top: 1.5em; + padding: 5px 10px; +} + +.alert-form { + margin-top: .5em !important; +} + // $medgray: #3A9AC9; .videolisting { diff --git a/app/views/application/_flashes.html.erb b/app/views/application/_flashes.html.erb index ae7ff75..863d505 100644 --- a/app/views/application/_flashes.html.erb +++ b/app/views/application/_flashes.html.erb @@ -1,5 +1,13 @@ -
- <% flash.each do |key, value| -%> -
<%= value %>
- <% end -%> -
+
+
+
+ <% flash.each do |key, value| -%> + <% if flash[:notice] %> +
<%= value %>
+ <% else %> +
<%= value %>
+ <% end %> + <% end -%> +
+
+
\ No newline at end of file diff --git a/app/views/campaigns/_form.html.erb b/app/views/campaigns/_form.html.erb index 40dc352..6644c55 100644 --- a/app/views/campaigns/_form.html.erb +++ b/app/views/campaigns/_form.html.erb @@ -4,9 +4,8 @@ file: :vertical_file_input, boolean: :vertical_boolean }) do |frm| %> - <% if @campaign.errors.any? %> -
-
+
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb index dc9f370..432ff69 100644 --- a/config/initializers/simple_form_bootstrap.rb +++ b/config/initializers/simple_form_bootstrap.rb @@ -9,7 +9,7 @@ SimpleForm.setup do |config| b.use :label b.wrapper tag: 'div', class: 'controls' do |ba| ba.use :input - ba.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + ba.use :error, wrap_with: { tag: 'div', class: 'alert alert-danger alert-form' } ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } end end @@ -23,7 +23,7 @@ SimpleForm.setup do |config| prepend.use :input end input.use :hint, wrap_with: { tag: 'span', class: 'help-block' } - input.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + input.use :error, wrap_with: { tag: 'div', class: 'alert alert-danger alert-form' } end end @@ -36,7 +36,7 @@ SimpleForm.setup do |config| append.use :input end input.use :hint, wrap_with: { tag: 'span', class: 'help-block' } - input.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + input.use :error, wrap_with: { tag: 'div', class: 'alert alert-danger alert-form' } end end