Commit 5b7747bd authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'affix-sidebar' into 'master'

Improve admin projects and users pages for mobile devices

See merge request !1590
parents 82483f95 f43c0429
...@@ -9,6 +9,7 @@ v 7.9.0 (unreleased) ...@@ -9,6 +9,7 @@ v 7.9.0 (unreleased)
- Improve trigger merge request hook when source project branch has been updated (Kirill Zaitsev) - Improve trigger merge request hook when source project branch has been updated (Kirill Zaitsev)
- Save web edit in new branch - Save web edit in new branch
- Fix ordering of imported but unchanged projects (Marco Wessel) - Fix ordering of imported but unchanged projects (Marco Wessel)
- Mobile UI improvements: make aside content expandable
v 7.8.1 v 7.8.1
- Fix run of custom post receive hooks - Fix run of custom post receive hooks
......
...@@ -69,5 +69,6 @@ ...@@ -69,5 +69,6 @@
background: #EEE; background: #EEE;
font-size: 20px; font-size: 20px;
color: #777; color: #777;
z-index: 100;
@include box-shadow(0 1px 2px #DDD); @include box-shadow(0 1px 2px #DDD);
} }
.row .row
.col-md-3 = link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%aside.col-md-3
.admin-filter .admin-filter
= form_tag admin_namespaces_projects_path, method: :get, class: '' do = form_tag admin_namespaces_projects_path, method: :get, class: '' do
.form-group .form-group
...@@ -36,7 +38,7 @@ ...@@ -36,7 +38,7 @@
= button_tag "Search", class: "btn submit btn-primary" = button_tag "Search", class: "btn submit btn-primary"
= link_to "Reset", admin_namespaces_projects_path, class: "btn btn-cancel" = link_to "Reset", admin_namespaces_projects_path, class: "btn btn-cancel"
.col-md-9 %section.col-md-9
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
Projects (#{@projects.total_count}) Projects (#{@projects.total_count})
......
.row .row
.col-md-3 = link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%aside.col-md-3
.admin-filter .admin-filter
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: "#{'active' unless params[:filter]}"} %li{class: "#{'active' unless params[:filter]}"}
...@@ -27,7 +29,7 @@ ...@@ -27,7 +29,7 @@
%hr %hr
= link_to 'Reset', admin_users_path, class: "btn btn-cancel" = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
.col-md-9 %section.col-md-9
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
Users (#{@users.total_count}) Users (#{@users.total_count})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment