summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-07-04 14:05:26 +0100
committerPhil Hughes <me@iamphill.com>2017-07-04 14:10:18 +0100
commit6d3a9cc98e1503b0ef49906833aab094a8e6b686 (patch)
tree30939f1c11628a0fbfa3a4605c82da921183fbd0
parent19437e47095719d956a3520546292d13845edc3b (diff)
downloadgitlab-ce-new-nav-fix-contextual-breadcrumbs.tar.gz
fix some breadcrumb titles that are wrongnew-nav-fix-contextual-breadcrumbs
changed color of divider
-rw-r--r--app/assets/stylesheets/new_nav.scss1
-rw-r--r--app/assets/stylesheets/new_sidebar.scss2
-rw-r--r--app/views/groups/activity.html.haml1
-rw-r--r--app/views/projects/activity.html.haml1
-rw-r--r--app/views/projects/graphs/charts.html.haml1
-rw-r--r--app/views/projects/graphs/show.html.haml1
-rw-r--r--app/views/projects/network/show.html.haml1
7 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index e88b383617b..56368fc58ae 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -376,6 +376,7 @@ header.navbar-gitlab-new {
&::after {
content: "/";
margin: 0 2px 0 5px;
+ color: rgba($black, .65);
}
}
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 17f23f7fce3..a961e4332f1 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -22,7 +22,7 @@ $new-sidebar-width: 220px;
font-weight: 600;
display: flex;
align-items: center;
- padding: 10px 14px;
+ padding: 10px 14px 9px;
.avatar-container {
flex: 0 0 40px;
diff --git a/app/views/groups/activity.html.haml b/app/views/groups/activity.html.haml
index 3969e56f937..adc379e11d4 100644
--- a/app/views/groups/activity.html.haml
+++ b/app/views/groups/activity.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_title = "Activity"
= content_for :meta_tags do
= auto_discovery_link_tag(:atom, group_url(@group, rss_url_options), title: "#{@group.name} activity")
diff --git a/app/views/projects/activity.html.haml b/app/views/projects/activity.html.haml
index ef8d8051cbf..9ff6ac4f8ad 100644
--- a/app/views/projects/activity.html.haml
+++ b/app/views/projects/activity.html.haml
@@ -1,4 +1,5 @@
- @no_container = true
+- @breadcrumb_title = "Activity"
- page_title "Activity"
= render "projects/head"
diff --git a/app/views/projects/graphs/charts.html.haml b/app/views/projects/graphs/charts.html.haml
index 464ac34d961..79872c4ea69 100644
--- a/app/views/projects/graphs/charts.html.haml
+++ b/app/views/projects/graphs/charts.html.haml
@@ -1,4 +1,5 @@
- @no_container = true
+- @breadcrumb_title = "Charts"
- page_title "Charts"
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('common_d3')
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 680f8ae6c8f..239a189caef 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -1,4 +1,5 @@
- @no_container = true
+- @breadcrumb_title = "Contributors"
- page_title "Contributors"
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('common_d3')
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index ed6077f6c6b..c89b037f441 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_title = "Graph"
- page_title "Graph", @ref
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('network')