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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2ab289f6
Commit
2ab289f6
authored
Oct 09, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix navigation conflicts
parent
aa5bfbc9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
16 deletions
+0
-16
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+0
-6
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+0
-3
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+0
-3
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+0
-4
No files found.
app/assets/stylesheets/framework.scss
View file @
2ab289f6
...
@@ -29,12 +29,6 @@
...
@@ -29,12 +29,6 @@
@import
"framework/media_object"
;
@import
"framework/media_object"
;
@import
"framework/mobile"
;
@import
"framework/mobile"
;
@import
"framework/modal"
;
@import
"framework/modal"
;
<<<<<<<
HEAD
@
import
"framework/media_object"
;
@import
"framework/nav"
;
@import
"framework/new-nav"
;
=======
>>>>>>>
ce-com
/
master
@import
"framework/pagination"
;
@import
"framework/pagination"
;
@import
"framework/panels"
;
@import
"framework/panels"
;
@import
"framework/secondary-navigation-elements"
;
@import
"framework/secondary-navigation-elements"
;
...
...
app/assets/stylesheets/pages/boards.scss
View file @
2ab289f6
...
@@ -477,9 +477,6 @@
...
@@ -477,9 +477,6 @@
border-top
:
1px
solid
$border-color
;
border-top
:
1px
solid
$border-color
;
}
}
.page-with-layout-nav.page-with-sub-nav
.issue-boards-sidebar
,
=======
>>>>>>>
ce-com
/
master
.page-with-new-sidebar.page-with-sidebar
.issue-boards-sidebar
{
.page-with-new-sidebar.page-with-sidebar
.issue-boards-sidebar
{
.issuable-sidebar-header
{
.issuable-sidebar-header
{
position
:
relative
;
position
:
relative
;
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
2ab289f6
...
@@ -14,13 +14,10 @@
...
@@ -14,13 +14,10 @@
width
:
$issuable-warning-size
;
width
:
$issuable-warning-size
;
height
:
$issuable-warning-size
;
height
:
$issuable-warning-size
;
text-align
:
center
;
text-align
:
center
;
<<<<<<<
HEAD
=======
&
:first-of-type
{
&
:first-of-type
{
margin-right
:
$issuable-warning-icon-margin
;
margin-right
:
$issuable-warning-icon-margin
;
}
}
>>>>>>>
ce-com
/
master
}
}
.sidebar-item-icon
{
.sidebar-item-icon
{
...
...
app/views/layouts/header/_default.html.haml
View file @
2ab289f6
<
<<<<<<
HEAD
=
render
"layouts/header/ee_license_banner"
=
render
"layouts/header/ee_license_banner"
%header
.navbar.navbar-gitlab.navbar-gitlab-new
==
=====
%header
.navbar.navbar-gitlab
%header
.navbar.navbar-gitlab
>
>>>>>> ce-com/master
%a
.sr-only.gl-accessibility
{
href:
"#content-body"
,
tabindex:
"1"
}
Skip to content
%a
.sr-only.gl-accessibility
{
href:
"#content-body"
,
tabindex:
"1"
}
Skip to content
.container-fluid
.container-fluid
.header-content
.header-content
...
...
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