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
d659c1d1
Commit
d659c1d1
authored
Mar 17, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More actively use css variabled to prevent colors duplication
parent
cb3b6718
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
31 additions
and
31 deletions
+31
-31
app/assets/stylesheets/generic/files.scss
app/assets/stylesheets/generic/files.scss
+1
-1
app/assets/stylesheets/generic/lists.scss
app/assets/stylesheets/generic/lists.scss
+5
-4
app/assets/stylesheets/generic/nav_sidebar.scss
app/assets/stylesheets/generic/nav_sidebar.scss
+17
-17
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/generic/typography.scss
+1
-2
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+1
-1
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+1
-1
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+1
-1
app/views/notify/project_was_moved_email.html.haml
app/views/notify/project_was_moved_email.html.haml
+2
-2
No files found.
app/assets/stylesheets/generic/files.scss
View file @
d659c1d1
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
}
}
.author
,
.author
,
.blame_commit
{
.blame_commit
{
background
:
#f5f5f5
;
background
:
$background-color
;
vertical-align
:
top
;
vertical-align
:
top
;
}
}
.lines
{
.lines
{
...
...
app/assets/stylesheets/generic/lists.scss
View file @
d659c1d1
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
color
:
#8a6d3b
;
color
:
#8a6d3b
;
}
}
&
.smoke
{
background-color
:
#f5f5f5
;
}
&
.smoke
{
background-color
:
$background-color
;
}
&
:hover
{
&
:hover
{
background
:
$hover
;
background
:
$hover
;
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
border-bottom
:
none
;
border-bottom
:
none
;
&
.bottom
{
&
.bottom
{
background
:
#f5f5f5
;
background
:
$background-color
;
}
}
}
}
...
@@ -74,9 +74,10 @@
...
@@ -74,9 +74,10 @@
}
}
.row_title
{
.row_title
{
color
:
#444
;
color
:
$text-color
;
&
:hover
{
&
:hover
{
color
:
#444
;
color
:
$text-color
;
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
}
}
...
...
app/assets/stylesheets/generic/nav_sidebar.scss
View file @
d659c1d1
.page-with-sidebar
{
.page-with-sidebar
{
background
:
#F5F5F5
;
background
:
$background-color
;
.sidebar-wrapper
{
.sidebar-wrapper
{
position
:
fixed
;
position
:
fixed
;
top
:
0
;
top
:
0
;
left
:
0
;
left
:
0
;
height
:
100%
;
height
:
100%
;
border-right
:
1px
solid
#EAEAEA
;
border-right
:
1px
solid
$border-color
;
}
}
}
}
.sidebar-wrapper
{
.sidebar-wrapper
{
z-index
:
99
;
z-index
:
99
;
background
:
#F5F5F5
;
background
:
$background-color
;
}
}
.content-wrapper
{
.content-wrapper
{
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
.nav-sidebar
li
{
.nav-sidebar
li
{
&
.active
a
{
&
.active
a
{
color
:
#333
;
color
:
$text-color
;
background
:
#FFF
!
important
;
background
:
#FFF
!
important
;
font-weight
:
bold
;
font-weight
:
bold
;
border
:
1px
solid
#EEE
;
border
:
1px
solid
#EEE
;
...
@@ -52,32 +52,33 @@
...
@@ -52,32 +52,33 @@
}
}
i
{
i
{
color
:
#444
;
color
:
$text-color
;
}
}
}
}
}
}
.nav-sidebar
li
{
.nav-sidebar
li
{
text-shadow
:
0
1px
1px
$border-color
;
&
.separate-item
{
&
.separate-item
{
border-top
:
1px
solid
#ddd
;
border-top
:
1px
solid
$border-color
;
padding-top
:
10px
;
padding-top
:
10px
;
margin-top
:
10px
;
margin-top
:
10px
;
}
}
a
{
a
{
color
:
#
555
;
color
:
#
3b5a5b
;
display
:
block
;
display
:
block
;
text-decoration
:
none
;
text-decoration
:
none
;
padding
:
8px
15px
;
padding
:
8px
15px
;
font-size
:
13px
;
font-size
:
13px
;
line-height
:
20px
;
line-height
:
20px
;
text-shadow
:
0
1px
2px
#FFF
;
padding-left
:
20px
;
padding-left
:
20px
;
&
:hover
{
&
:hover
{
text-decoration
:
none
;
text-decoration
:
none
;
color
:
#333
;
color
:
$text-color
;
background
:
#
EEE
;
background
:
#
f2f6f7
;
}
}
&
:active
,
&
:focus
{
&
:active
,
&
:focus
{
...
@@ -86,7 +87,7 @@
...
@@ -86,7 +87,7 @@
i
{
i
{
width
:
20px
;
width
:
20px
;
color
:
#888
;
color
:
$gray-dark
;
margin-right
:
23px
;
margin-right
:
23px
;
}
}
}
}
...
@@ -156,18 +157,17 @@
...
@@ -156,18 +157,17 @@
position
:
fixed
;
position
:
fixed
;
top
:
46px
;
top
:
46px
;
padding
:
5px
13px
5px
13px
;
padding
:
5px
13px
5px
13px
;
left
:
19
7
px
;
left
:
19
8
px
;
font-size
:
13px
;
font-size
:
13px
;
background
:
#EEE
;
background
:
transparent
;
color
:
black
;
color
:
black
;
border-left
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.035
)
;
border-left
:
1px
solid
$border-color
;
border-
right
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.035
)
;
border-
bottom
:
1px
solid
$border-color
;
}
}
.collapse-nav
a
:hover
{
.collapse-nav
a
:hover
{
text-decoration
:
none
;
text-decoration
:
none
;
color
:
#333
;
background
:
#f2f6f7
;
background
:
#eaeaea
;
}
}
@media
(
max-width
:
$screen-md-max
)
{
@media
(
max-width
:
$screen-md-max
)
{
...
...
app/assets/stylesheets/generic/typography.scss
View file @
d659c1d1
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
*/
*/
.page-title
{
.page-title
{
margin-top
:
0px
;
margin-top
:
0px
;
color
:
#333
;
line-height
:
1
.5
;
line-height
:
1
.5
;
font-weight
:
normal
;
font-weight
:
normal
;
margin-bottom
:
5px
;
margin-bottom
:
5px
;
...
@@ -16,7 +15,7 @@ pre {
...
@@ -16,7 +15,7 @@ pre {
&
.dark
{
&
.dark
{
background
:
#333
;
background
:
#333
;
color
:
#f5f5f5
;
color
:
$background-color
;
}
}
}
}
...
...
app/assets/stylesheets/pages/diff.scss
View file @
d659c1d1
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
margin
:
0px
;
margin
:
0px
;
padding
:
0px
;
padding
:
0px
;
border
:
none
;
border
:
none
;
background
:
#F5F5F5
;
background
:
$background-color
;
color
:
rgba
(
0
,
0
,
0
,
0
.3
);
color
:
rgba
(
0
,
0
,
0
,
0
.3
);
padding
:
0px
5px
;
padding
:
0px
5px
;
border-right
:
1px
solid
$border-color
;
border-right
:
1px
solid
$border-color
;
...
...
app/assets/stylesheets/pages/editor.scss
View file @
d659c1d1
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
}
}
.editor-ref
{
.editor-ref
{
background
:
#f5f5f5
;
background
:
$background-color
;
padding
:
11px
15px
;
padding
:
11px
15px
;
border-right
:
1px
solid
#CCC
;
border-right
:
1px
solid
#CCC
;
display
:
inline-block
;
display
:
inline-block
;
...
...
app/assets/stylesheets/pages/events.scss
View file @
d659c1d1
...
@@ -188,7 +188,7 @@
...
@@ -188,7 +188,7 @@
li
a
{
li
a
{
font-size
:
13px
;
font-size
:
13px
;
padding
:
5px
10px
;
padding
:
5px
10px
;
background
:
rgba
(
0
,
0
,
0
,
0
.045
)
;
background
:
$background-color
;
margin-left
:
4px
;
margin-left
:
4px
;
}
}
}
}
app/assets/stylesheets/pages/merge_requests.scss
View file @
d659c1d1
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
font-size
:
15px
;
font-size
:
15px
;
border-bottom
:
1px
solid
#BBB
;
border-bottom
:
1px
solid
#BBB
;
color
:
#777
;
color
:
#777
;
background-color
:
#F5F5F5
;
background-color
:
$background-color
;
&
.ci-success
{
&
.ci-success
{
color
:
$gl-success
;
color
:
$gl-success
;
...
...
app/assets/stylesheets/pages/tree.scss
View file @
d659c1d1
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
}
}
&
.selected
{
&
.selected
{
td
{
td
{
background
:
#f5f5f5
;
background
:
$background-color
;
border-top
:
1px
solid
#EEE
;
border-top
:
1px
solid
#EEE
;
border-bottom
:
1px
solid
#EEE
;
border-bottom
:
1px
solid
#EEE
;
}
}
...
...
app/views/notify/project_was_moved_email.html.haml
View file @
d659c1d1
...
@@ -6,10 +6,10 @@
...
@@ -6,10 +6,10 @@
=
@project
.
name_with_namespace
=
@project
.
name_with_namespace
%p
%p
To update the remote url in your local repository run (for ssh):
To update the remote url in your local repository run (for ssh):
%p
{
style:
"background:
#f5f5f5
; padding:10px; border:1px solid #ddd"
}
%p
{
style:
"background:
$background-color
; padding:10px; border:1px solid #ddd"
}
git remote set-url origin
#{
@project
.
ssh_url_to_repo
}
git remote set-url origin
#{
@project
.
ssh_url_to_repo
}
%p
%p
or for http(s):
or for http(s):
%p
{
style:
"background:
#f5f5f5
; padding:10px; border:1px solid #ddd"
}
%p
{
style:
"background:
$background-color
; padding:10px; border:1px solid #ddd"
}
git remote set-url origin
#{
@project
.
http_url_to_repo
}
git remote set-url origin
#{
@project
.
http_url_to_repo
}
%br
%br
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