Commit 9a5556af authored by Phil Hughes's avatar Phil Hughes

Fixed tabs on desktop being all over the place

parent 598973c3
...@@ -17,56 +17,52 @@ export default { ...@@ -17,56 +17,52 @@ export default {
}, },
template: ` template: `
<div class="scrolling-tabs-container"> <ul class="nav-links scrolling-tabs">
<div class="fade-left"><i class="fa fa-angle-left"></i></div> <li
<div class="fade-right"><i class="fa fa-angle-right"></i></div> class="js-pipelines-tab-all"
<ul class="nav-links scrolling-tabs"> :class="{ 'active': scope === 'all'}">
<li <a :href="paths.allPath">
class="js-pipelines-tab-all" All
:class="{ 'active': scope === 'all'}"> <span class="badge js-totalbuilds-count">
<a :href="paths.allPath"> {{count.all}}
All </span>
<span class="badge js-totalbuilds-count"> </a>
{{count.all}} </li>
</span> <li class="js-pipelines-tab-pending"
</a> :class="{ 'active': scope === 'pending'}">
</li> <a :href="paths.pendingPath">
<li class="js-pipelines-tab-pending" Pending
:class="{ 'active': scope === 'pending'}"> <span class="badge">
<a :href="paths.pendingPath"> {{count.pending}}
Pending </span>
<span class="badge"> </a>
{{count.pending}} </li>
</span> <li class="js-pipelines-tab-running"
</a> :class="{ 'active': scope === 'running'}">
</li> <a :href="paths.runningPath">
<li class="js-pipelines-tab-running" Running
:class="{ 'active': scope === 'running'}"> <span class="badge">
<a :href="paths.runningPath"> {{count.running}}
Running </span>
<span class="badge"> </a>
{{count.running}} </li>
</span> <li class="js-pipelines-tab-finished"
</a> :class="{ 'active': scope === 'finished'}">
</li> <a :href="paths.finishedPath">
<li class="js-pipelines-tab-finished" Finished
:class="{ 'active': scope === 'finished'}"> <span class="badge">
<a :href="paths.finishedPath"> {{count.finished}}
Finished </span>
<span class="badge"> </a>
{{count.finished}} </li>
</span> <li class="js-pipelines-tab-branches"
</a> :class="{ 'active': scope === 'branches'}">
</li> <a :href="paths.branchesPath">Branches</a>
<li class="js-pipelines-tab-branches" </li>
:class="{ 'active': scope === 'branches'}"> <li class="js-pipelines-tab-tags"
<a :href="paths.branchesPath">Branches</a> :class="{ 'active': scope === 'tags'}">
</li> <a :href="paths.tagsPath">Tags</a>
<li class="js-pipelines-tab-tags" </li>
:class="{ 'active': scope === 'tags'}"> </ul>
<a :href="paths.tagsPath">Tags</a>
</li>
</ul>
</div>
`, `,
}; };
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
<div :class="cssClass"> <div :class="cssClass">
<div <div
class="top-area" class="top-area scrolling-tabs-container"
v-if="!isLoading && !shouldRenderEmptyState"> v-if="!isLoading && !shouldRenderEmptyState">
<navigation-tabs <navigation-tabs
:scope="scope" :scope="scope"
......
...@@ -480,6 +480,12 @@ ...@@ -480,6 +480,12 @@
.inner-page-scroll-tabs { .inner-page-scroll-tabs {
position: relative; position: relative;
.fade-right,
.fade-left {
top: 17px;
bottom: 0;
}
.fade-right { .fade-right {
@include fade(left, $white-light); @include fade(left, $white-light);
right: 0; right: 0;
......
= content_for :flash_message do = content_for :flash_message do
= render 'shared/project_limit' = render 'shared/project_limit'
.top-area.scrolling-tabs-container .top-area.scrolling-tabs-container.inner-page-scroll-tabs
.inner-page-scroll-tabs .fade-left= icon('angle-left')
.fade-left= icon('angle-left') .fade-right= icon('angle-right')
.fade-right= icon('angle-right') %ul.nav-links.scrolling-tabs
%ul.nav-links.scrolling-tabs = nav_link(page: [dashboard_projects_path, root_path]) do
= nav_link(page: [dashboard_projects_path, root_path]) do = link_to dashboard_projects_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
= link_to dashboard_projects_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do Your projects
Your projects = nav_link(page: starred_dashboard_projects_path) do
= nav_link(page: starred_dashboard_projects_path) do = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
= link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do Starred projects
Starred projects = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path]) do
= nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path]) do = link_to explore_root_path, title: 'Explore', data: {placement: 'right'} do
= link_to explore_root_path, title: 'Explore', data: {placement: 'right'} do Explore projects
Explore projects
.nav-controls .nav-controls
= render 'shared/projects/search_form' = render 'shared/projects/search_form'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment