Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
21ccf896
Commit
21ccf896
authored
May 03, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redesign profile page and group page mobile navigation
parent
f53557a4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
88 additions
and
12 deletions
+88
-12
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+20
-0
app/assets/stylesheets/framework/mobile.scss
app/assets/stylesheets/framework/mobile.scss
+1
-1
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+27
-5
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+30
-0
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+9
-5
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
21ccf896
...
@@ -156,6 +156,26 @@
...
@@ -156,6 +156,26 @@
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
text-align
:
left
;
text-align
:
left
;
padding
:
24px
0
;
padding
:
24px
0
;
.group-info
{
p
{
margin-bottom
:
0
;
}
}
@media
(
max-width
:
$screen-xs-max
)
{
text-align
:
center
;
.avatar
{
float
:
none
;
}
}
}
.group-info
{
h1
{
display
:
inline
;
}
}
}
}
}
...
...
app/assets/stylesheets/framework/mobile.scss
View file @
21ccf896
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
}
}
.rss-btn
{
.rss-btn
{
display
:
none
!
important
;
display
:
none
;
}
}
.project-home-links
{
.project-home-links
{
...
...
app/assets/stylesheets/framework/nav.scss
View file @
21ccf896
...
@@ -198,13 +198,35 @@
...
@@ -198,13 +198,35 @@
.dropdown
{
.dropdown
{
margin-left
:
7px
;
margin-left
:
7px
;
}
}
@media
(
max-width
:
$screen-md-max
)
{
float
:
none
;
margin-bottom
:
10px
;
.btn
{
width
:
20%
;
}
}
}
.nav-links
{
@media
(
max-width
:
$screen-xs-max
)
{
text-align
:
center
;
.rss-btn
,
.dropdown-new
{
display
:
inline-block
;
width
:
48%
;
}
}
}
}
.nav-links
{
border-bottom
:
none
;
border-bottom
:
none
;
white-space
:
nowrap
;
overflow-x
:
auto
;
overflow-y
:
hidden
;
a
{
a
{
padding-top
:
2px
;
padding-top
:
2px
;
}
}
}
}
}
app/assets/stylesheets/framework/variables.scss
View file @
21ccf896
...
@@ -109,7 +109,7 @@ $red-light: #e52c5a;
...
@@ -109,7 +109,7 @@ $red-light: #e52c5a;
$red-normal
:
#d22852
;
$red-normal
:
#d22852
;
$red-dark
:
darken
(
$red-normal
,
5%
);
$red-dark
:
darken
(
$red-normal
,
5%
);
$black
:
#000
000
;
$black
:
#000
;
$black-transparent
:
rgba
(
0
,
0
,
0
,
0
.3
);
$black-transparent
:
rgba
(
0
,
0
,
0
,
0
.3
);
$border-white-light
:
#f1f2f4
;
$border-white-light
:
#f1f2f4
;
...
...
app/assets/stylesheets/pages/profile.scss
View file @
21ccf896
...
@@ -205,3 +205,33 @@
...
@@ -205,3 +205,33 @@
text-align
:
center
;
text-align
:
center
;
}
}
}
}
.user-profile
{
@media
(
max-width
:
$screen-xs-max
)
{
.cover-block
{
padding-top
:
20px
;
}
.cover-controls
{
position
:
static
;
margin-bottom
:
20px
;
.btn
{
display
:
inline-block
;
width
:
48%
;
}
}
}
.cover-controls
{
@media
(
max-width
:
$screen-xs-max
)
{
position
:
static
;
margin-bottom
:
20px
;
.btn
{
display
:
inline-block
;
width
:
48%
;
}
}
}
}
app/views/groups/show.html.haml
View file @
21ccf896
...
@@ -8,8 +8,12 @@
...
@@ -8,8 +8,12 @@
.container-fluid
.container-fluid
=
link_to
group_icon
(
@group
),
target:
'_blank'
do
=
link_to
group_icon
(
@group
),
target:
'_blank'
do
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s90"
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s90"
.group-info
.cover-title
.cover-title
%h1
@
#{
@group
.
path
}
%h1
@
#{
@group
.
path
}
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@group
)
}
=
visibility_level_icon
(
@group
.
visibility_level
,
fw:
false
)
-
if
@group
.
description
.
present?
-
if
@group
.
description
.
present?
.cover-desc.description
.cover-desc.description
...
...
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