diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-04 19:27:09 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-04 19:27:09 +0200 |
commit | 0a364762d96f2474e9cd177fba54b7a2e5614e8a (patch) | |
tree | caa7e182f5c77bfc82d5fcaa2fc175c4dd93b69a /app/views/admin | |
parent | 09c2f8c7b10fe78a0e3feead06b6010f88238c79 (diff) | |
download | gitlab-ce-0a364762d96f2474e9cd177fba54b7a2e5614e8a.tar.gz |
twbs3 style for admin, tree, network, commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/admin')
-rw-r--r-- | app/views/admin/dashboard/index.html.haml | 6 | ||||
-rw-r--r-- | app/views/admin/groups/index.html.haml | 3 | ||||
-rw-r--r-- | app/views/admin/users/index.html.haml | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 1cbfc4ac1f8..dd663945ea9 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -4,7 +4,7 @@ You can manage projects, users and other GitLab data from here. %hr .admin_dash.row - .col-md-4 + .col-sm-4 .light-well %h4 Projects .data @@ -12,7 +12,7 @@ %h1= Project.count %hr = link_to 'New Project', new_project_path, class: "btn btn-new" - .col-md-4 + .col-sm-4 .light-well %h4 Users .data @@ -20,7 +20,7 @@ %h1= User.count %hr = link_to 'New User', new_admin_user_path, class: "btn btn-new" - .col-md-4 + .col-sm-4 .light-well %h4 Groups .data diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 70098a442d5..71a0004179c 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -7,7 +7,8 @@ = link_to 'New Group', new_admin_group_path, class: "btn btn-new pull-right" %br = form_tag admin_groups_path, method: :get, class: 'form-inline' do - = text_field_tag :name, params[:name], class: "span6 input-xpadding" + .form-group + = text_field_tag :name, params[:name], class: "form-control input-xpadding" = submit_tag "Search", class: "btn submit btn-primary" %hr diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 55b57b5ebd8..1fa6fdfaff1 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -2,9 +2,11 @@ .col-md-3 .admin-filter = form_tag admin_users_path, method: :get, class: 'form-inline' do - = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'input-xpadding span2' - = button_tag type: 'submit', class: 'btn btn-primary' do - %i.icon-search + .append-bottom-10 + .form-group + = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control' + = button_tag type: 'submit', class: 'btn btn-primary' do + %i.icon-search %ul.nav.nav-pills.nav-stacked %li{class: "#{'active' unless params[:filter]}"} = link_to admin_users_path do |