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
Jérome Perrin
gitlab-ce
Commits
3ad1d320
Commit
3ad1d320
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicated styling for center top menus
parent
0159d78a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
42 deletions
+9
-42
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+0
-13
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+2
-21
app/views/projects/commit/_ci_menu.html.haml
app/views/projects/commit/_ci_menu.html.haml
+1
-1
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+1
-1
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+1
-1
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+2
-3
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
app/views/projects/merge_requests/show/_commits.html.haml
app/views/projects/merge_requests/show/_commits.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/commit.scss
View file @
3ad1d320
...
@@ -108,16 +108,3 @@
...
@@ -108,16 +108,3 @@
z-index
:
2
;
z-index
:
2
;
}
}
}
}
.commit-ci-menu
{
padding
:
0
;
margin
:
0
;
list-style
:
none
;
margin-top
:
5px
;
height
:
56px
;
margin
:
-16px
;
padding
:
16px
;
text-align
:
center
;
margin-top
:
0px
;
margin-bottom
:
2px
;
}
app/assets/stylesheets/pages/merge_requests.scss
View file @
3ad1d320
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
*/
*/
.mr-state-widget
{
.mr-state-widget
{
background
:
#F7F8FA
;
background
:
#F7F8FA
;
margin-bottom
:
20px
;
color
:
$gl-gray
;
color
:
$gl-gray
;
border
:
1px
solid
#dce0e6
;
border
:
1px
solid
#dce0e6
;
@include
border-radius
(
2px
);
@include
border-radius
(
2px
);
...
@@ -116,26 +115,8 @@
...
@@ -116,26 +115,8 @@
}
}
}
}
.merge-request
.merge-request-tabs
{
.merge-request-details
{
@include
nav-menu
;
margin-bottom
:
$gl-padding
;
margin
:
-
$gl-padding
;
padding
:
$gl-padding
;
text-align
:
center
;
margin-bottom
:
1px
;
}
// Mobile
@media
(
max-width
:
480px
)
{
.merge-request
.merge-request-tabs
{
margin
:
0
;
padding
:
0
;
li
{
a
{
padding
:
0
;
}
}
}
}
}
.mr_source_commit
,
.mr_source_commit
,
...
...
app/views/projects/commit/_ci_menu.html.haml
View file @
3ad1d320
%ul
.center-top-menu.commit-ci-menu
%ul
.center-top-menu.
no-top.no-bottom.
commit-ci-menu
=
nav_link
(
path:
'commit#show'
)
do
=
nav_link
(
path:
'commit#show'
)
do
=
link_to
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
)
do
=
link_to
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
)
do
Changes
Changes
...
...
app/views/projects/diffs/_diffs.html.haml
View file @
3ad1d320
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
diff_files
=
safe_diff_files
(
diffs
)
-
diff_files
=
safe_diff_files
(
diffs
)
.gray-content-block.
second
-block.oneline-block
.gray-content-block.
middle
-block.oneline-block
.inline-parallel-buttons
.inline-parallel-buttons
.btn-group
.btn-group
=
inline_diff_btn
=
inline_diff_btn
...
...
app/views/projects/merge_requests/_discussion.html.haml
View file @
3ad1d320
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
render
'shared/show_aside'
=
render
'shared/show_aside'
.gray-content-block.
second
-block.oneline-block
.gray-content-block.
middle
-block.oneline-block
.row
.row
.col-md-9
.col-md-9
.votes-holder.pull-right
.votes-holder.pull-right
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
3ad1d320
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
=
f
.
hidden_field
:target_branch
=
f
.
hidden_field
:target_branch
.mr-compare.merge-request
.mr-compare.merge-request
%ul
.merge-request-tabs
%ul
.merge-request-tabs
.center-top-menu.no-top.no-bottom
%li
.commits-tab
%li
.commits-tab
=
link_to
url_for
(
params
),
data:
{
target:
'#commits'
,
action:
'commits'
,
toggle:
'tab'
}
do
=
link_to
url_for
(
params
),
data:
{
target:
'#commits'
,
action:
'commits'
,
toggle:
'tab'
}
do
Commits
Commits
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
.tab-content
.tab-content
#commits
.commits.tab-pane
#commits
.commits.tab-pane
=
render
"projects/
commits/commits"
,
project:
@project
=
render
"projects/
merge_requests/show/commits"
#diffs
.diffs.tab-pane.active
#diffs
.diffs.tab-pane.active
-
if
@diffs
.
present?
-
if
@diffs
.
present?
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
project:
@project
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
project:
@project
...
@@ -57,4 +57,3 @@
...
@@ -57,4 +57,3 @@
diffs_loaded
:
true
,
diffs_loaded
:
true
,
commits_loaded
:
true
commits_loaded
:
true
});
});
app/views/projects/merge_requests/_show.html.haml
View file @
3ad1d320
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
-
if
@commits
.
present?
-
if
@commits
.
present?
%ul
.merge-request-tabs
%ul
.merge-request-tabs
.center-top-menu.no-top.no-bottom
%li
.notes-tab
%li
.notes-tab
=
link_to
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
data:
{
target:
'#notes'
,
action:
'notes'
,
toggle:
'tab'
}
do
=
link_to
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
data:
{
target:
'#notes'
,
action:
'notes'
,
toggle:
'tab'
}
do
Discussion
Discussion
...
...
app/views/projects/merge_requests/show/_commits.html.haml
View file @
3ad1d320
.gray-content-block.
second
-block.oneline-block
.gray-content-block.
middle
-block.oneline-block
=
icon
(
"sort-amount-desc"
)
=
icon
(
"sort-amount-desc"
)
Most recent commits displayed first
Most recent commits displayed first
...
...
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