summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-06 14:34:41 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-06 14:34:41 +0200
commit8f85c5cdd58c122e5c59dbb2527535b438e3e9b5 (patch)
tree2de2eb7296008c33b87da855c13e623f691cf1e7
parent0b017e8e1782d00da87e4d5b090ee7b37dca3c65 (diff)
downloadgitlab-ce-8f85c5cdd58c122e5c59dbb2527535b438e3e9b5.tar.gz
increate some input width. Added navbar toggle button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/generic/forms.scss4
-rw-r--r--app/views/admin/groups/index.html.haml2
-rw-r--r--app/views/layouts/_head_panel.html.haml4
-rw-r--r--app/views/public/projects/index.html.haml2
4 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss
index 4f80a8a983b..931b75a3234 100644
--- a/app/assets/stylesheets/generic/forms.scss
+++ b/app/assets/stylesheets/generic/forms.scss
@@ -47,3 +47,7 @@ label {
.input-mx-250 {
max-width: 250px;
}
+
+.input-mn-300 {
+ min-width: 300px;
+}
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 71a0004179c..7a373ee586c 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -8,7 +8,7 @@
%br
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
.form-group
- = text_field_tag :name, params[:name], class: "form-control input-xpadding"
+ = text_field_tag :name, params[:name], class: "form-control input-mn-300"
= submit_tag "Search", class: "btn submit btn-primary"
%hr
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index b44006b3ed1..f303e45094a 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -8,6 +8,10 @@
%span.separator
%h1.project_name= title
+ %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
+ %span.sr-only Toggle navigation
+ %i.icon-reorder
+
.navbar-collapse.collapse
%ul.nav.navbar-nav
%li
diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml
index d511a3037aa..2fc93c5b742 100644
--- a/app/views/public/projects/index.html.haml
+++ b/app/views/public/projects/index.html.haml
@@ -7,7 +7,7 @@
.pull-left
= form_tag public_projects_path, method: :get, class: 'form-inline form-tiny' do |f|
.form-group
- = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input", id: "projects_search"
+ = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input input-mn-300", id: "projects_search"
.form-group
= submit_tag 'Search', class: "btn btn-primary wide"