BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5b7747bd
Commit
5b7747bd
authored
Feb 25, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'affix-sidebar' into 'master'
Improve admin projects and users pages for mobile devices See merge request !1590
parents
82483f95
f43c0429
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
+10
-4
CHANGELOG
CHANGELOG
+1
-0
mobile.scss
app/assets/stylesheets/generic/mobile.scss
+1
-0
index.html.haml
app/views/admin/projects/index.html.haml
+4
-2
index.html.haml
app/views/admin/users/index.html.haml
+4
-2
No files found.
CHANGELOG
View file @
5b7747bd
...
...
@@ -9,6 +9,7 @@ v 7.9.0 (unreleased)
- Improve trigger merge request hook when source project branch has been updated (Kirill Zaitsev)
- Save web edit in new branch
- Fix ordering of imported but unchanged projects (Marco Wessel)
- Mobile UI improvements: make aside content expandable
v 7.8.1
- Fix run of custom post receive hooks
...
...
app/assets/stylesheets/generic/mobile.scss
View file @
5b7747bd
...
...
@@ -69,5 +69,6 @@
background
:
#EEE
;
font-size
:
20px
;
color
:
#777
;
z-index
:
100
;
@include
box-shadow
(
0
1px
2px
#DDD
);
}
app/views/admin/projects/index.html.haml
View file @
5b7747bd
.row
.col-md-3
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
%aside
.col-md-3
.admin-filter
=
form_tag
admin_namespaces_projects_path
,
method: :get
,
class:
''
do
.form-group
...
...
@@ -36,7 +38,7 @@
=
button_tag
"Search"
,
class:
"btn submit btn-primary"
=
link_to
"Reset"
,
admin_namespaces_projects_path
,
class:
"btn btn-cancel"
.col-md-9
%section
.col-md-9
.panel.panel-default
.panel-heading
Projects (
#{
@projects
.
total_count
}
)
...
...
app/views/admin/users/index.html.haml
View file @
5b7747bd
.row
.col-md-3
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
%aside
.col-md-3
.admin-filter
%ul
.nav.nav-pills.nav-stacked
%li
{
class:
"#{'active' unless params[:filter]}"
}
...
...
@@ -27,7 +29,7 @@
%hr
=
link_to
'Reset'
,
admin_users_path
,
class:
"btn btn-cancel"
.col-md-9
%section
.col-md-9
.panel.panel-default
.panel-heading
Users (
#{
@users
.
total_count
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment