From 2327a683f403ef398356a1b1d55b31828255ba27 Mon Sep 17 00:00:00 2001 From: airled Date: Fri, 15 Apr 2016 22:42:31 +0300 Subject: [PATCH] better css --- app/assets/stylesheets/application.css | 10 +++++++ .../stylesheets/bootstrap_and_overrides.css | 2 +- app/views/layouts/application.html.erb | 27 +++++++++---------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 686945d..c460c21 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -20,3 +20,13 @@ hr { .pagination, .pagination-sm{ margin-top: 0px; } +ul { + margin: 0px; +} +.navbar { + margin-bottom: 0px; +} +.navbar-form { + border-top: 0px; + border-bottom: 0px; +} diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css b/app/assets/stylesheets/bootstrap_and_overrides.css index 131fcfd..c9bf593 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css +++ b/app/assets/stylesheets/bootstrap_and_overrides.css @@ -4,4 +4,4 @@ Use Font Awesome icons (default) To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites" =require twitter-bootstrap-static/fontawesome - */ \ No newline at end of file + */ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 37c2a2e..d386071 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -38,8 +38,8 @@ - -
+
+
Railiner -
+ <%= form_for :form, url: find_path, method: :get, :html => {"class" => 'navbar-form navbar-left form-inline'} do |f| %> +
+ <%= f.autocomplete_field :product, autocomplete_product_name_path, placeholder: "Найти продукт", class: "form-control" %> +
+ <%= f.submit 'Найти', class: "btn btn-primary" %> + <%= f.check_box 'out' %> + не в продаже + <% end %> +
  • <%= link_to "Группы", "/groups" %>
  • <%= link_to "Категории", "/categories" %>
    • - <% if user_signed_in? && current_user.admin? %> -
  • <%= link_to "Информация", "/info" %>
    • - <% end %> - - <%= form_for :form, url: find_path, method: :get, :html => {"class" => 'navbar-form navbar-left'} do |f| %> -
    - <%= f.autocomplete_field :product, autocomplete_product_name_path, placeholder: "Найти продукт", class: "form-control" %> - <%= f.submit 'Найти', class: "btn btn-primary" %> - <%= f.check_box 'out' %> + не в продаже -
    - <% end %> +
  • <%= link_to "Информация", "/info" if user_signed_in? && current_user.admin? %>
    • <% if user_signed_in? %>
  • <%= link_to current_user.email, users_profile_path %>
    • @@ -79,7 +76,7 @@
-
+
<%= bootstrap_flash %>