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
795b8b30
Commit
795b8b30
authored
8 years ago
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update gray block under subnav to match other pages
parent
e6e6989f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
19 deletions
+35
-19
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+16
-0
app/views/projects/compare/index.html.haml
app/views/projects/compare/index.html.haml
+1
-1
app/views/projects/compare/show.html.haml
app/views/projects/compare/show.html.haml
+18
-18
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
795b8b30
...
...
@@ -97,6 +97,22 @@
}
}
.sub-header-block
{
background-color
:
$white-light
;
border-bottom
:
1px
solid
$white-dark
;
padding
:
11px
0
;
margin-bottom
:
11px
;
.oneline
{
line-height
:
35px
;
}
&
.no-bottom-space
{
border-bottom
:
0
;
margin-bottom
:
0
;
}
}
.cover-block
{
text-align
:
center
;
background
:
$background-color
;
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/compare/index.html.haml
View file @
795b8b30
...
...
@@ -3,7 +3,7 @@
=
render
"projects/commits/head"
%div
{
class:
(
container_class
)
}
.
row-content-block.second-block.content-component
-block
.
sub-header
-block
Compare branches, tags or commit ranges.
%br
Fill input field with commit id like
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/compare/show.html.haml
View file @
795b8b30
-
@no_container
=
true
-
page_title
"
#{
params
[
:from
]
}
...
#{
params
[
:to
]
}
"
=
render
"projects/commits/head"
%div
{
class:
(
container_class
)
}
.sub-header-block.no-bottom-space
=
render
"form"
.row-content-block
=
render
"form"
-
if
@commits
.
present?
.prepend-top-default
-
if
@commits
.
present?
=
render
"projects/commits/commit_list"
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
project:
@project
,
diff_refs:
@diff_refs
-
else
.light-well.prepend-top-default
.center
%h4
There isn't anything to compare.
%p
.slead
-
if
params
[
:to
]
==
params
[
:from
]
%span
.label-branch
#{
params
[
:from
]
}
and
%span
.label-branch
#{
params
[
:to
]
}
are the same.
-
else
You'll need to use different branch names to get a valid comparison.
-
else
.light-well
.center
%h4
There isn't anything to compare.
%p
.slead
-
if
params
[
:to
]
==
params
[
:from
]
%span
.label-branch
#{
params
[
:from
]
}
and
%span
.label-branch
#{
params
[
:to
]
}
are the same.
-
else
You'll need to use different branch names to get a valid comparison.
This diff is collapsed.
Click to expand it.
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