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
9fbbae9d
Commit
9fbbae9d
authored
Nov 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small css cleanup
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7d037c11
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
29 deletions
+22
-29
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+0
-5
app/assets/stylesheets/gitlab_bootstrap/files.scss
app/assets/stylesheets/gitlab_bootstrap/files.scss
+2
-2
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+12
-20
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+5
-0
app/assets/stylesheets/selects.scss
app/assets/stylesheets/selects.scss
+1
-0
app/views/projects/commits/_diffs.html.haml
app/views/projects/commits/_diffs.html.haml
+2
-2
No files found.
app/assets/stylesheets/common.scss
View file @
9fbbae9d
...
@@ -358,8 +358,3 @@ table {
...
@@ -358,8 +358,3 @@ table {
background
:
#555
;
background
:
#555
;
color
:
#BBB
;
color
:
#BBB
;
}
}
.project-refs-form
.chosen-container
.chosen-single
span
{
font-weight
:
bold
;
color
:
#555
;
}
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @
9fbbae9d
...
@@ -11,8 +11,8 @@
...
@@ -11,8 +11,8 @@
}
}
.file-title
{
.file-title
{
b
order-bottom
:
1px
solid
#bbb
;
b
ackground
:
#DDD
;
@include
bg-dark-gray-gradient
;
border-bottom
:
1px
solid
#CCC
;
text-shadow
:
0
1px
1px
#fff
;
text-shadow
:
0
1px
1px
#fff
;
margin
:
0
;
margin
:
0
;
font-weight
:
normal
;
font-weight
:
normal
;
...
...
app/assets/stylesheets/sections/commits.scss
View file @
9fbbae9d
...
@@ -16,37 +16,29 @@
...
@@ -16,37 +16,29 @@
.header
{
.header
{
@extend
.clearfix
;
@extend
.clearfix
;
background
:
#DDD
;
border-bottom
:
1px
solid
#CCC
;
padding
:
5px
5px
5px
10px
;
padding
:
5px
5px
5px
10px
;
color
:
#555
;
color
:
#555
;
border-bottom
:
1px
solid
#CCC
;
background
:
#eee
;
// TODO Replace with linear-gradient mixin
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#eee
)
,
to
(
#dfdfdf
));
background-image
:
-webkit-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
background-image
:
-moz-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
background-image
:
-ms-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
background-image
:
-o-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
a
{
color
:
$style_color
;
}
>
span
{
>
span
{
font-family
:
$monospace_font
;
font-family
:
$monospace_font
;
font-size
:
14px
;
font-size
:
14px
;
line-height
:
30px
;
line-height
:
2
;
}
}
a
.view-file
{
.view-file
{
font-weight
:
bold
;
font-weight
:
bold
;
float
:
right
;
background-color
:
#EEE
;
}
}
.commit-short-id
{
.commit-short-id
{
font-family
:
$monospace_font
;
font-family
:
$monospace_font
;
font-size
:
smaller
;
font-size
:
smaller
;
}
}
.file-mode
{
.file-mode
{
font-family
:
$monospace_font
;
font-family
:
$monospace_font
;
}
}
}
}
...
@@ -56,13 +48,13 @@
...
@@ -56,13 +48,13 @@
background
:
#FFF
;
background
:
#FFF
;
color
:
#333
;
color
:
#333
;
font-size
:
12px
;
font-size
:
12px
;
.old
{
.old
{
span
.idiff
{
span
.idiff
{
background-color
:
#FAA
;
background-color
:
#FAA
;
}
}
}
}
.new
{
.new
{
span
.idiff
{
span
.idiff
{
background-color
:
#AFA
;
background-color
:
#AFA
;
}
}
}
}
...
...
app/assets/stylesheets/sections/projects.scss
View file @
9fbbae9d
...
@@ -209,6 +209,11 @@ ul.nav.nav-projects-tabs {
...
@@ -209,6 +209,11 @@ ul.nav.nav-projects-tabs {
left
:
0
;
left
:
0
;
margin-right
:
10px
;
margin-right
:
10px
;
.chosen-single
span
{
font-weight
:
bold
;
color
:
#555
;
}
&
.chosen-container-active
{
&
.chosen-container-active
{
.chosen-drop
{
.chosen-drop
{
min-width
:
400px
;
min-width
:
400px
;
...
...
app/assets/stylesheets/selects.scss
View file @
9fbbae9d
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
}
}
.chosen-search
input
{
.chosen-search
input
{
border
:
1px
solid
#CCC
!
important
;
@include
box-shadow
(
none
!
important
);
@include
box-shadow
(
none
!
important
);
}
}
}
}
...
...
app/views/projects/commits/_diffs.html.haml
View file @
9fbbae9d
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
%span
=
diff
.
old_path
%span
=
diff
.
old_path
-
if
@commit
.
parent_ids
.
present?
-
if
@commit
.
parent_ids
.
present?
=
link_to
project_blob_path
(
project
,
tree_join
(
@commit
.
parent_id
,
diff
.
new_path
)),
{
:class
=>
'btn btn-tiny pull-right view-file'
}
do
=
link_to
project_blob_path
(
project
,
tree_join
(
@commit
.
parent_id
,
diff
.
new_path
)),
{
class:
'btn btn-small view-file'
}
do
View file @
View file @
%span
.commit-short-id
=
@commit
.
short_id
(
6
)
%span
.commit-short-id
=
@commit
.
short_id
(
6
)
-
else
-
else
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
-
if
diff
.
a_mode
&&
diff
.
b_mode
&&
diff
.
a_mode
!=
diff
.
b_mode
-
if
diff
.
a_mode
&&
diff
.
b_mode
&&
diff
.
a_mode
!=
diff
.
b_mode
%span
.file-mode
=
"
#{
diff
.
a_mode
}
→
#{
diff
.
b_mode
}
"
%span
.file-mode
=
"
#{
diff
.
a_mode
}
→
#{
diff
.
b_mode
}
"
=
link_to
project_blob_path
(
project
,
tree_join
(
@commit
.
id
,
diff
.
new_path
)),
{
:class
=>
'btn btn-tiny pull-right view-file'
}
do
=
link_to
project_blob_path
(
project
,
tree_join
(
@commit
.
id
,
diff
.
new_path
)),
{
class:
'btn btn-small view-file'
}
do
View file @
View file @
%span
.commit-short-id
=
@commit
.
short_id
(
6
)
%span
.commit-short-id
=
@commit
.
short_id
(
6
)
...
...
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