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
8c3debb1
Commit
8c3debb1
authored
Jan 13, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start moving all navigation to one class
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
3b3f755b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
41 additions
and
137 deletions
+41
-137
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+1
-0
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+0
-4
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+0
-27
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+0
-69
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+0
-35
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+38
-0
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
app/views/shared/_event_filter.html.haml
app/views/shared/_event_filter.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework.scss
View file @
8c3debb1
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
@import
"framework/lists.scss"
;
@import
"framework/lists.scss"
;
@import
"framework/markdown_area.scss"
;
@import
"framework/markdown_area.scss"
;
@import
"framework/mobile.scss"
;
@import
"framework/mobile.scss"
;
@import
"framework/nav.scss"
;
@import
"framework/pagination.scss"
;
@import
"framework/pagination.scss"
;
@import
"framework/panels.scss"
;
@import
"framework/panels.scss"
;
@import
"framework/selects.scss"
;
@import
"framework/selects.scss"
;
...
...
app/assets/stylesheets/framework/blocks.scss
View file @
8c3debb1
...
@@ -129,10 +129,6 @@
...
@@ -129,10 +129,6 @@
right
:
auto
;
right
:
auto
;
}
}
}
}
.cover-menu
{
margin
:
0
;
}
}
}
.block-connector
{
.block-connector
{
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
8c3debb1
...
@@ -153,33 +153,6 @@
...
@@ -153,33 +153,6 @@
}
}
}
}
.btn-group-next
{
.btn
{
padding
:
9px
0px
;
font-size
:
15px
;
color
:
#7f8fa4
;
border-color
:
#e7e9ed
;
width
:
140px
;
.badge
{
font-weight
:
normal
;
background-color
:
#eee
;
color
:
#78a
;
}
&
.active
{
border-color
:
$gl-info
;
background
:
$gl-info
;
color
:
#fff
;
.badge
{
color
:
$gl-info
;
background-color
:
white
;
}
}
}
}
.btn-clipboard
{
.btn-clipboard
{
border
:
none
;
border
:
none
;
}
}
app/assets/stylesheets/framework/common.scss
View file @
8c3debb1
...
@@ -374,75 +374,6 @@ table {
...
@@ -374,75 +374,6 @@ table {
}
}
}
}
.center-top-menu
,
.left-top-menu
{
@include
nav-menu
;
text-align
:
center
;
margin-top
:
5px
;
margin-bottom
:
$gl-padding
;
height
:
auto
;
margin-top
:
-
$gl-padding
;
&
.no-bottom
{
margin-bottom
:
0
;
}
&
.no-top
{
margin-top
:
0
;
}
li
a
{
display
:
inline-block
;
padding-top
:
$gl-padding
;
padding-bottom
:
11px
;
margin-bottom
:
-1px
;
}
&
.bottom-border
{
border-bottom
:
1px
solid
$border-color
;
height
:
57px
;
}
&
.wide
{
margin-left
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
}
}
.left-top-menu
{
text-align
:
left
;
border-bottom
:
1px
solid
#EEE
;
}
.center-middle-menu
{
@include
nav-menu
;
padding
:
0
;
text-align
:
center
;
margin
:
-
$gl-padding
;
margin-top
:
0
;
margin-bottom
:
0
;
height
:
58px
;
border-bottom
:
1px
solid
$border-color
;
li
{
&
:after
{
content
:
"|"
;
color
:
$border-gray-light
;
}
&
:last-child
{
&
:after
{
content
:
none
;
}
}
>
a
{
display
:
inline-block
;
text-transform
:
uppercase
;
font-size
:
13px
;
}
}
}
.dropzone
.dz-preview
.dz-progress
{
.dropzone
.dz-preview
.dz-progress
{
border-color
:
$border-color
!
important
;
border-color
:
$border-color
!
important
;
}
}
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
8c3debb1
...
@@ -118,38 +118,3 @@
...
@@ -118,38 +118,3 @@
font-size
:
16px
;
font-size
:
16px
;
line-height
:
24px
;
line-height
:
24px
;
}
}
@mixin
nav-menu
{
padding
:
0
;
margin
:
0
;
list-style
:
none
;
height
:
56px
;
li
{
display
:
inline-block
;
a
{
padding
:
14px
;
font-size
:
15px
;
line-height
:
28px
;
color
:
#959494
;
border-bottom
:
2px
solid
transparent
;
&
:hover
,
&
:active
,
&
:focus
{
text-decoration
:
none
;
outline
:
none
;
}
}
&
.active
a
{
color
:
#616060
;
border-bottom
:
2px
solid
#4688f1
;
}
.badge
{
font-weight
:
normal
;
background-color
:
#eee
;
color
:
#78a
;
}
}
}
app/assets/stylesheets/framework/nav.scss
0 → 100644
View file @
8c3debb1
.nav-links
{
padding
:
0
;
margin
:
0
;
list-style
:
none
;
height
:
56px
;
border-bottom
:
1px
solid
$border-color
;
li
{
display
:
inline-block
;
a
{
display
:
inline-block
;
padding-top
:
$gl-padding
;
padding-bottom
:
11px
;
margin-bottom
:
-1px
;
font-size
:
15px
;
line-height
:
28px
;
color
:
#959494
;
border-bottom
:
2px
solid
transparent
;
&
:hover
,
&
:active
,
&
:focus
{
text-decoration
:
none
;
outline
:
none
;
}
}
&
.active
a
{
color
:
#616060
;
border-bottom
:
2px
solid
#4688f1
;
}
.badge
{
font-weight
:
normal
;
background-color
:
#eee
;
color
:
#78a
;
}
}
}
app/views/groups/show.html.haml
View file @
8c3debb1
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
=
markdown
(
@group
.
description
,
pipeline: :description
)
=
markdown
(
@group
.
description
,
pipeline: :description
)
%ul
.
center-top-menu.cover-menu
%ul
.
nav-links
%li
.active
%li
.active
=
link_to
"#activity"
,
'data-toggle'
=>
'tab'
do
=
link_to
"#activity"
,
'data-toggle'
=>
'tab'
do
Activity
Activity
...
...
app/views/shared/_event_filter.html.haml
View file @
8c3debb1
%ul
.
left-top-menu.event-filter.no-top
%ul
.
nav-links.event-filter
=
event_filter_link
EventFilter
.
push
,
'Push events'
=
event_filter_link
EventFilter
.
push
,
'Push events'
=
event_filter_link
EventFilter
.
merged
,
'Merge events'
=
event_filter_link
EventFilter
.
merged
,
'Merge events'
=
event_filter_link
EventFilter
.
comments
,
'Comments'
=
event_filter_link
EventFilter
.
comments
,
'Comments'
...
...
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