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
Tatuya Kamada
gitlab-ce
Commits
1d6a65a2
Commit
1d6a65a2
authored
Sep 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve paddings and set new colors for links
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7f045a6b
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
21 additions
and
22 deletions
+21
-22
app/assets/stylesheets/base/layout.scss
app/assets/stylesheets/base/layout.scss
+0
-1
app/assets/stylesheets/base/variables.scss
app/assets/stylesheets/base/variables.scss
+2
-1
app/assets/stylesheets/generic/blocks.scss
app/assets/stylesheets/generic/blocks.scss
+1
-1
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+5
-5
app/assets/stylesheets/generic/selects.scss
app/assets/stylesheets/generic/selects.scss
+4
-4
app/assets/stylesheets/generic/sidebar.scss
app/assets/stylesheets/generic/sidebar.scss
+1
-2
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+2
-2
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+2
-2
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+3
-3
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+1
-1
No files found.
app/assets/stylesheets/base/layout.scss
View file @
1d6a65a2
...
@@ -21,7 +21,6 @@ html {
...
@@ -21,7 +21,6 @@ html {
margin-top
:
30px
;
margin-top
:
30px
;
}
}
.container-limited
{
.container-limited
{
max-width
:
$fixed-layout-width
;
max-width
:
$fixed-layout-width
;
}
}
app/assets/stylesheets/base/variables.scss
View file @
1d6a65a2
$style_color
:
#474D57
;
$style_color
:
#474D57
;
$hover
:
#FFFAF1
;
$hover
:
#FFFAF1
;
$gl-text-color
:
#222222
;
$gl-text-color
:
#222222
;
$gl-link-color
:
#4
46e9b
;
$gl-link-color
:
#4
c4e54
;
$nprogress-color
:
#c0392b
;
$nprogress-color
:
#c0392b
;
$gl-font-size
:
16px
;
$gl-font-size
:
16px
;
$list-font-size
:
16px
;
$list-font-size
:
16px
;
...
@@ -14,6 +14,7 @@ $border-color: #E5E5E5;
...
@@ -14,6 +14,7 @@ $border-color: #E5E5E5;
$background-color
:
#f5f5f5
;
$background-color
:
#f5f5f5
;
$header-height
:
73px
;
$header-height
:
73px
;
$fixed-layout-width
:
1200px
;
$fixed-layout-width
:
1200px
;
$gl-gray
:
#7f8fa4
;
/*
/*
...
...
app/assets/stylesheets/generic/blocks.scss
View file @
1d6a65a2
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
}
}
.gray-content-block
{
.gray-content-block
{
margin
:
-1
5
px
;
margin
:
-1
8
px
;
background-color
:
#f8fafc
;
background-color
:
#f8fafc
;
padding
:
18px
;
padding
:
18px
;
margin-bottom
:
0px
;
margin-bottom
:
0px
;
...
...
app/assets/stylesheets/generic/common.scss
View file @
1d6a65a2
/** COLORS **/
/** COLORS **/
.cgray
{
color
:
gray
}
.cgray
{
color
:
$gl-gray
;
}
.clgray
{
color
:
#BBB
}
.clgray
{
color
:
#BBB
}
.cred
{
color
:
#D12F19
}
.cred
{
color
:
#D12F19
}
.cgreen
{
color
:
#4a2
}
.cgreen
{
color
:
#4a2
}
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.underlined-link
{
text-decoration
:
underline
;
}
.underlined-link
{
text-decoration
:
underline
;
}
.hint
{
font-style
:
italic
;
color
:
#999
;
}
.hint
{
font-style
:
italic
;
color
:
#999
;
}
.light
{
color
:
#888
}
.light
{
color
:
$gl-gray
;
}
.slead
{
.slead
{
color
:
#666
;
color
:
#666
;
...
@@ -376,10 +376,10 @@ table {
...
@@ -376,10 +376,10 @@ table {
list-style
:
none
;
list-style
:
none
;
text-align
:
center
;
text-align
:
center
;
margin-top
:
5px
;
margin-top
:
5px
;
margin-bottom
:
1
2
px
;
margin-bottom
:
1
9
px
;
height
:
60px
;
height
:
60px
;
margin-top
:
-1
5
px
;
margin-top
:
-1
8
px
;
padding-top
:
1
5
px
;
padding-top
:
1
8
px
;
li
{
li
{
display
:
inline-block
;
display
:
inline-block
;
...
...
app/assets/stylesheets/generic/selects.scss
View file @
1d6a65a2
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
.select2-choice
{
.select2-choice
{
background
:
#FFF
;
background
:
#FFF
;
border-color
:
#DDD
;
border-color
:
#DDD
;
height
:
34
px
;
height
:
42
px
;
padding
:
6px
14
px
;
padding
:
8px
18
px
;
font-size
:
14px
;
font-size
:
$gl-font-size
;
line-height
:
1
.42857143
;
line-height
:
1
.42857143
;
@include
border-radius
(
4px
);
@include
border-radius
(
4px
);
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
.select2-arrow
{
.select2-arrow
{
background
:
#FFF
;
background
:
#FFF
;
border-left
:
none
;
border-left
:
none
;
padding-top
:
3
px
;
padding-top
:
5
px
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/generic/sidebar.scss
View file @
1d6a65a2
...
@@ -25,8 +25,7 @@
...
@@ -25,8 +25,7 @@
.container-fluid
{
.container-fluid
{
background
:
#FFF
;
background
:
#FFF
;
padding-top
:
15px
;
padding
:
18px
;
padding-bottom
:
15px
;
border
:
1px
solid
#e7e9ed
;
border
:
1px
solid
#e7e9ed
;
min-height
:
90vh
;
min-height
:
90vh
;
}
}
...
...
app/assets/stylesheets/pages/events.scss
View file @
1d6a65a2
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.event-item
{
.event-item
{
font-size
:
16px
;
font-size
:
16px
;
padding
:
18px
;
padding
:
18px
;
margin
:
0
-1
5
px
;
margin
:
0
-1
8
px
;
border-bottom
:
1px
solid
#f1f2f4
;
border-bottom
:
1px
solid
#f1f2f4
;
color
:
#7f8fa4
;
color
:
#7f8fa4
;
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
}
}
.event-body
{
.event-body
{
margin-left
:
6
0
px
;
margin-left
:
6
3
px
;
margin-right
:
80px
;
margin-right
:
80px
;
.event-note
{
.event-note
{
...
...
app/assets/stylesheets/pages/projects.scss
View file @
1d6a65a2
...
@@ -253,7 +253,7 @@ pre.light-well {
...
@@ -253,7 +253,7 @@ pre.light-well {
}
}
.projects-search-form
{
.projects-search-form
{
margin
:
-1
5
px
;
margin
:
-1
8
px
;
background-color
:
#f8fafc
;
background-color
:
#f8fafc
;
padding
:
18px
;
padding
:
18px
;
margin-bottom
:
0px
;
margin-bottom
:
0px
;
...
@@ -281,7 +281,7 @@ pre.light-well {
...
@@ -281,7 +281,7 @@ pre.light-well {
.project-row
{
.project-row
{
padding
:
18px
;
padding
:
18px
;
border-color
:
#f1f2f4
;
border-color
:
#f1f2f4
;
margin
:
0
-1
5
px
;
margin
:
0
-1
8
px
;
&
.no-description
{
&
.no-description
{
.project
{
.project
{
...
...
app/assets/stylesheets/pages/tree.scss
View file @
1d6a65a2
...
@@ -63,15 +63,15 @@
...
@@ -63,15 +63,15 @@
padding-right
:
8px
;
padding-right
:
8px
;
.commit-author-name
{
.commit-author-name
{
color
:
gray
;
color
:
$gl-
gray
;
}
}
}
}
.tree_commit
{
.tree_commit
{
color
:
gray
;
color
:
$gl-
gray
;
.tree-commit-link
{
.tree-commit-link
{
color
:
gray
;
color
:
$gl-
gray
;
&
:hover
{
&
:hover
{
text-decoration
:
underline
;
text-decoration
:
underline
;
...
...
app/views/events/_commit.html.haml
View file @
1d6a65a2
%li
.commit
%li
.commit
.commit-row-title
.commit-row-title
=
link_to
truncate_sha
(
commit
[
:id
]),
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
[
:id
]),
class:
"commit_short_id"
,
alt:
''
=
link_to
truncate_sha
(
commit
[
:id
]),
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
[
:id
]),
class:
"commit_short_id"
,
alt:
''
&
nbsp
;
&
middot
;
=
gfm
event_commit_title
(
commit
[
:message
]),
project:
project
=
gfm
event_commit_title
(
commit
[
:message
]),
project:
project
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