BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f88fbd2d
Commit
f88fbd2d
authored
Feb 02, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/adjust-button-group-width-on-mobile' into 'master'
Improve top area navigation See merge request gitlab-org/gitlab-ce!16726
parents
5c08a591
d87b0379
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
35 additions
and
24 deletions
+35
-24
navigation_tabs.vue
...ets/javascripts/vue_shared/components/navigation_tabs.vue
+1
-1
secondary-navigation-elements.scss
.../stylesheets/framework/secondary-navigation-elements.scss
+5
-2
_groups_head.html.haml
app/views/dashboard/_groups_head.html.haml
+1
-1
_projects_head.html.haml
app/views/dashboard/_projects_head.html.haml
+1
-1
_nav.html.haml
app/views/dashboard/projects/_nav.html.haml
+1
-1
index.html.haml
app/views/dashboard/todos/index.html.haml
+1
-1
_tabs.html.haml
app/views/projects/pipeline_schedules/_tabs.html.haml
+1
-1
_with_tabs.html.haml
app/views/projects/pipelines/_with_tabs.html.haml
+1
-1
_event_filter.html.haml
app/views/shared/_event_filter.html.haml
+14
-11
_milestones_filter.html.haml
app/views/shared/_milestones_filter.html.haml
+1
-1
_tabs.html.haml
app/views/shared/builds/_tabs.html.haml
+1
-1
_nav.html.haml
app/views/shared/issuable/_nav.html.haml
+1
-1
_snippets_scope_menu.html.haml
app/views/snippets/_snippets_scope_menu.html.haml
+1
-1
fix-adjust-button-group-width-on-mobile.yml
...gs/unreleased/fix-adjust-button-group-width-on-mobile.yml
+5
-0
No files found.
app/assets/javascripts/vue_shared/components/navigation_tabs.vue
View file @
f88fbd2d
...
...
@@ -48,7 +48,7 @@
};
</
script
>
<
template
>
<ul
class=
"nav-links scrolling-tabs"
>
<ul
class=
"nav-links scrolling-tabs
separator
"
>
<li
v-for=
"(tab, i) in tabs"
:key=
"i"
...
...
app/assets/stylesheets/framework/secondary-navigation-elements.scss
View file @
f88fbd2d
...
...
@@ -82,6 +82,10 @@
/* Small devices (phones, tablets, 768px and lower) */
@media
(
max-width
:
$screen-xs-max
)
{
width
:
100%
;
&
.mobile-separator
{
border-bottom
:
1px
solid
$border-color
;
}
}
}
...
...
@@ -168,9 +172,9 @@
display
:
inline-block
;
}
// Applies on /dashboard/issues
.project-item-select-holder
{
margin
:
0
;
width
:
100%
;
}
}
}
...
...
@@ -340,7 +344,6 @@
.project-item-select-holder.btn-group
{
display
:
flex
;
max-width
:
350px
;
overflow
:
hidden
;
float
:
right
;
...
...
app/views/dashboard/_groups_head.html.haml
View file @
f88fbd2d
.top-area
%ul
.nav-links
%ul
.nav-links
.mobile-separator
=
nav_link
(
page:
dashboard_groups_path
)
do
=
link_to
dashboard_groups_path
,
title:
_
(
"Your groups"
)
do
Your groups
...
...
app/views/dashboard/_projects_head.html.haml
View file @
f88fbd2d
...
...
@@ -4,7 +4,7 @@
.top-area.scrolling-tabs-container.inner-page-scroll-tabs
.fade-left
=
icon
(
'angle-left'
)
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
.mobile-separator
=
nav_link
(
page:
[
dashboard_projects_path
,
root_path
])
do
=
link_to
dashboard_projects_path
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
Your projects
...
...
app/views/dashboard/projects/_nav.html.haml
View file @
f88fbd2d
.nav-block
%ul
.nav-links
%ul
.nav-links
.mobile-separator
=
nav_link
(
html_options:
{
class:
(
"active"
unless
params
[
:personal
].
present?
)
})
do
=
link_to
s_
(
'DashboardProjects|All'
),
dashboard_projects_path
=
nav_link
(
html_options:
{
class:
(
"active"
if
params
[
:personal
].
present?
)
})
do
...
...
app/views/dashboard/todos/index.html.haml
View file @
f88fbd2d
...
...
@@ -4,7 +4,7 @@
-
if
current_user
.
todos
.
any?
.top-area
%ul
.nav-links
%ul
.nav-links
.mobile-separator
%li
.todos-pending
{
class:
active_when
(
params
[
:state
].
blank?
||
params
[
:state
]
==
'pending'
)
}
>
=
link_to
todos_filter_path
(
state:
'pending'
)
do
%span
...
...
app/views/projects/pipeline_schedules/_tabs.html.haml
View file @
f88fbd2d
%ul
.nav-links
%ul
.nav-links
.mobile-separator
%li
{
class:
active_when
(
scope
.
nil?
)
}
>
=
link_to
schedule_path_proc
.
call
(
nil
)
do
=
s_
(
"PipelineSchedules|All"
)
...
...
app/views/projects/pipelines/_with_tabs.html.haml
View file @
f88fbd2d
-
failed_builds
=
@pipeline
.
statuses
.
latest
.
failed
.tabs-holder
%ul
.pipelines-tabs.nav-links.no-top.no-bottom
%ul
.pipelines-tabs.nav-links.no-top.no-bottom
.mobile-separator
%li
.js-pipeline-tab-link
=
link_to
project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'div#js-tab-pipeline'
,
action:
'pipelines'
,
toggle:
'tab'
},
class:
'pipeline-tab'
do
Pipeline
...
...
app/views/shared/_event_filter.html.haml
View file @
f88fbd2d
%ul
.nav-links.event-filter.scrolling-tabs
=
event_filter_link
EventFilter
.
all
,
_
(
'All'
),
s_
(
'EventFilterBy|Filter by all'
)
-
if
event_filter_visible
(
:repository
)
=
event_filter_link
EventFilter
.
push
,
_
(
'Push events'
),
s_
(
'EventFilterBy|Filter by push events'
)
-
if
event_filter_visible
(
:merge_requests
)
=
event_filter_link
EventFilter
.
merged
,
_
(
'Merge events'
),
s_
(
'EventFilterBy|Filter by merge events'
)
-
if
event_filter_visible
(
:issues
)
=
event_filter_link
EventFilter
.
issue
,
_
(
'Issue events'
),
s_
(
'EventFilterBy|Filter by issue events'
)
-
if
comments_visible?
=
event_filter_link
EventFilter
.
comments
,
_
(
'Comments'
),
s_
(
'EventFilterBy|Filter by comments'
)
=
event_filter_link
EventFilter
.
team
,
_
(
'Team'
),
s_
(
'EventFilterBy|Filter by team'
)
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
.fade-left
=
icon
(
'angle-left'
)
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.event-filter.scrolling-tabs
=
event_filter_link
EventFilter
.
all
,
_
(
'All'
),
s_
(
'EventFilterBy|Filter by all'
)
-
if
event_filter_visible
(
:repository
)
=
event_filter_link
EventFilter
.
push
,
_
(
'Push events'
),
s_
(
'EventFilterBy|Filter by push events'
)
-
if
event_filter_visible
(
:merge_requests
)
=
event_filter_link
EventFilter
.
merged
,
_
(
'Merge events'
),
s_
(
'EventFilterBy|Filter by merge events'
)
-
if
event_filter_visible
(
:issues
)
=
event_filter_link
EventFilter
.
issue
,
_
(
'Issue events'
),
s_
(
'EventFilterBy|Filter by issue events'
)
-
if
comments_visible?
=
event_filter_link
EventFilter
.
comments
,
_
(
'Comments'
),
s_
(
'EventFilterBy|Filter by comments'
)
=
event_filter_link
EventFilter
.
team
,
_
(
'Team'
),
s_
(
'EventFilterBy|Filter by team'
)
app/views/shared/_milestones_filter.html.haml
View file @
f88fbd2d
%ul
.nav-links
%ul
.nav-links
.mobile-separator
%li
{
class:
milestone_class_for_state
(
params
[
:state
],
'opened'
,
true
)
}
>
=
link_to
milestones_filter_path
(
state:
'opened'
)
do
Open
...
...
app/views/shared/builds/_tabs.html.haml
View file @
f88fbd2d
%ul
.nav-links
%ul
.nav-links
.mobile-separator
%li
{
class:
active_when
(
scope
.
nil?
)
}
>
=
link_to
build_path_proc
.
call
(
nil
)
do
All
...
...
app/views/shared/issuable/_nav.html.haml
View file @
f88fbd2d
-
type
=
local_assigns
.
fetch
(
:type
,
:issues
)
-
page_context_word
=
type
.
to_s
.
humanize
(
capitalize:
false
)
%ul
.nav-links.issues-state-filters
%ul
.nav-links.issues-state-filters
.mobile-separator
%li
{
class:
active_when
(
params
[
:state
]
==
'opened'
)
}
>
=
link_to
page_filter_path
(
state:
'opened'
,
label:
true
),
id:
'state-opened'
,
title:
"Filter by
#{
page_context_word
}
that are currently opened."
,
data:
{
state:
'opened'
}
do
#{
issuables_state_counter_text
(
type
,
:opened
)
}
...
...
app/views/snippets/_snippets_scope_menu.html.haml
View file @
f88fbd2d
-
subject
=
local_assigns
.
fetch
(
:subject
,
current_user
)
-
include_private
=
local_assigns
.
fetch
(
:include_private
,
false
)
.nav-links.snippet-scope-menu
.nav-links.snippet-scope-menu
.mobile-separator
%li
{
class:
active_when
(
params
[
:scope
].
nil?
)
}
=
link_to
subject_snippets_path
(
subject
)
do
All
...
...
changelogs/unreleased/fix-adjust-button-group-width-on-mobile.yml
0 → 100644
View file @
f88fbd2d
---
title
:
Change button group width on mobile
merge_request
:
16726
author
:
George Tsiolis
type
:
fixed
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