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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
4ed9e5f5
Commit
4ed9e5f5
authored
May 04, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update font colors, font sizes, caret icon, avatar size
parent
003b36b4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
5 deletions
+42
-5
app/assets/stylesheets/framework/avatar.scss
app/assets/stylesheets/framework/avatar.scss
+1
-0
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+8
-0
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+30
-3
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/avatar.scss
View file @
4ed9e5f5
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
&
.s46
{
width
:
46px
;
height
:
46px
;
margin-right
:
15px
;
}
&
.s46
{
width
:
46px
;
height
:
46px
;
margin-right
:
15px
;
}
&
.s48
{
width
:
48px
;
height
:
48px
;
margin-right
:
10px
;
}
&
.s48
{
width
:
48px
;
height
:
48px
;
margin-right
:
10px
;
}
&
.s60
{
width
:
60px
;
height
:
60px
;
margin-right
:
12px
;
}
&
.s60
{
width
:
60px
;
height
:
60px
;
margin-right
:
12px
;
}
&
.s70
{
width
:
70px
;
height
:
70px
;
margin-right
:
14px
;
}
&
.s90
{
width
:
90px
;
height
:
90px
;
margin-right
:
15px
;
}
&
.s90
{
width
:
90px
;
height
:
90px
;
margin-right
:
15px
;
}
&
.s110
{
width
:
110px
;
height
:
110px
;
margin-right
:
15px
;
}
&
.s110
{
width
:
110px
;
height
:
110px
;
margin-right
:
15px
;
}
&
.s140
{
width
:
140px
;
height
:
140px
;
margin-right
:
20px
;
}
&
.s140
{
width
:
140px
;
height
:
140px
;
margin-right
:
20px
;
}
...
...
app/assets/stylesheets/framework/blocks.scss
View file @
4ed9e5f5
...
@@ -158,6 +158,10 @@
...
@@ -158,6 +158,10 @@
padding
:
24px
0
;
padding
:
24px
0
;
.group-info
{
.group-info
{
.cover-title
{
margin-top
:
9px
;
}
p
{
p
{
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
...
@@ -173,8 +177,12 @@
...
@@ -173,8 +177,12 @@
}
}
.group-info
{
.group-info
{
h1
{
h1
{
display
:
inline
;
display
:
inline
;
font-weight
:
normal
;
font-size
:
24px
;
color
:
$gl-title-color
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/framework/nav.scss
View file @
4ed9e5f5
...
@@ -203,7 +203,21 @@
...
@@ -203,7 +203,21 @@
.controls
{
.controls
{
float
:
right
;
float
:
right
;
padding
:
12px
5px
0
0
;
padding
:
7px
5px
0
0
;
i
{
color
:
$layout-link-gray
;
}
.fa-rss
,
.fa-cog
{
font-size
:
16px
;
}
.fa-caret-down
{
margin-left
:
5px
;
color
:
$gl-icon-color
;
}
.dropdown
{
.dropdown
{
margin-left
:
7px
;
margin-left
:
7px
;
...
@@ -234,15 +248,28 @@
...
@@ -234,15 +248,28 @@
li
{
li
{
a
{
padding-top
:
10px
;
}
a
,
i
{
color
:
$layout-link-gray
;
}
&
.active
{
a
,
i
{
color
:
$black
;
}
}
.badge
{
.badge
{
color
:
$gl-icon-color
;
color
:
$gl-icon-color
;
}
}
}
}
}
}
}
}
.page-with-layout-nav
{
.page-with-layout-nav
{
margin-top
:
5
6
px
;
margin-top
:
5
2
px
;
}
}
app/assets/stylesheets/framework/variables.scss
View file @
4ed9e5f5
...
@@ -75,6 +75,7 @@ $settings-icon-size: 18px;
...
@@ -75,6 +75,7 @@ $settings-icon-size: 18px;
$provider-btn-group-border
:
#e5e5e5
;
$provider-btn-group-border
:
#e5e5e5
;
$provider-btn-not-active-color
:
#4688f1
;
$provider-btn-not-active-color
:
#4688f1
;
$link-underline-blue
:
#4a8bee
;
$link-underline-blue
:
#4a8bee
;
$layout-link-gray
:
#7e7c7c
;
/*
/*
* Color schema
* Color schema
...
...
app/views/groups/show.html.haml
View file @
4ed9e5f5
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.cover-block.groups-cover-block
.cover-block.groups-cover-block
.container-fluid.container-limited
.container-fluid.container-limited
=
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 s
9
0"
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s
7
0"
.group-info
.group-info
.cover-title
.cover-title
%h1
%h1
...
...
app/views/layouts/nav/_group.html.haml
View file @
4ed9e5f5
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%span
.dropdown.group-settings-dropdown
%span
.dropdown.group-settings-dropdown
%a
.dropdown-new.btn.btn-gray
#group-settings-button
{
href:
'#'
,
'data-toggle'
=>
'dropdown'
}
%a
.dropdown-new.btn.btn-gray
#group-settings-button
{
href:
'#'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
'cog'
)
=
icon
(
'cog'
)
=
icon
(
'
angle
-down'
)
=
icon
(
'
caret
-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
%ul
.dropdown-menu.dropdown-menu-align-right
=
nav_link
(
path:
'groups#projects'
)
do
=
nav_link
(
path:
'groups#projects'
)
do
=
link_to
projects_group_path
(
@group
),
title:
'Projects'
do
=
link_to
projects_group_path
(
@group
),
title:
'Projects'
do
...
...
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