diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-16 09:09:58 -0500 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-06-21 12:15:49 -0400 |
commit | 6f642fd423f32a05711e8cf97d79b57cd6e489f3 (patch) | |
tree | 96f0f2b480d9616568c27d25c3606fbc41dc9b74 | |
parent | a02c3d09d3670c7b7543461bf4d3c4d5fc08f418 (diff) | |
download | gitlab-ce-6f642fd423f32a05711e8cf97d79b57cd6e489f3.tar.gz |
Add new style for sub header block info
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 4 | ||||
-rw-r--r-- | app/views/projects/graphs/ci.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/graphs/commits.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/graphs/languages.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/graphs/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/wikis/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/wikis/git_access.html.haml | 4 |
8 files changed, 18 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index d5fe5bc2ef1..7626ac41e50 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -97,6 +97,17 @@ } } +.sub-header-block { + background-color: $white-light; + border-bottom: 1px solid $white-dark; + margin: 11px 0; + padding-bottom: 11px; + + .oneline { + line-height: 35px; + } +} + .cover-block { text-align: center; background: $background-color; diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 694f09c0464..0281b06d3ba 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -111,10 +111,6 @@ width: 50%; line-height: 28px; - &.wiki-page { - padding: 16px 10px 11px; - } - /* Small devices (phones, tablets, 768px and lower) */ @media (max-width: $screen-sm-min) { width: 100%; diff --git a/app/views/projects/graphs/ci.html.haml b/app/views/projects/graphs/ci.html.haml index 6a40cff0e09..e695d3ae369 100644 --- a/app/views/projects/graphs/ci.html.haml +++ b/app/views/projects/graphs/ci.html.haml @@ -3,7 +3,7 @@ = render 'head' %div{ class: (container_class) } - .row-content-block.append-bottom-default + .sub-header-block .oneline A collection of graphs for Continuous Integration diff --git a/app/views/projects/graphs/commits.html.haml b/app/views/projects/graphs/commits.html.haml index 2b858c5e0f6..0daffe68f6f 100644 --- a/app/views/projects/graphs/commits.html.haml +++ b/app/views/projects/graphs/commits.html.haml @@ -3,7 +3,7 @@ = render 'head' %div{ class: (container_class) } - .row-content-block.append-bottom-default + .sub-header-block .tree-ref-holder = render 'shared/ref_switcher', destination: 'graphs_commits' %ul.breadcrumb.repo-breadcrumb diff --git a/app/views/projects/graphs/languages.html.haml b/app/views/projects/graphs/languages.html.haml index 415414a4ebb..6d97f552a8e 100644 --- a/app/views/projects/graphs/languages.html.haml +++ b/app/views/projects/graphs/languages.html.haml @@ -3,7 +3,7 @@ = render 'head' %div{ class: (container_class) } - .row-content-block.append-bottom-default + .sub-header-block .oneline Programming languages used in this repository diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml index 61706c1d0fe..9f7e2a361ff 100644 --- a/app/views/projects/graphs/show.html.haml +++ b/app/views/projects/graphs/show.html.haml @@ -3,7 +3,7 @@ = render 'head' %div{ class: (container_class) } - .row-content-block.append-bottom-default + .sub-header-block .tree-ref-holder = render 'shared/ref_switcher', destination: 'graphs' %ul.breadcrumb.repo-breadcrumb diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml index 81cb709d053..af9d23bbfb3 100644 --- a/app/views/projects/wikis/edit.html.haml +++ b/app/views/projects/wikis/edit.html.haml @@ -4,7 +4,7 @@ %div{ class: (container_class) } .top-area - .nav-text.wiki-page + .nav-text %strong - if @page.persisted? = link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page) diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml index e129df16123..6caf7230f35 100644 --- a/app/views/projects/wikis/git_access.html.haml +++ b/app/views/projects/wikis/git_access.html.haml @@ -3,7 +3,7 @@ = render 'nav' %div{ class: (container_class) } - .row-content-block + .sub-header-block %span.oneline Git access for %strong= @project_wiki.path_with_namespace @@ -11,7 +11,7 @@ .pull-right = render "shared/clone_panel", project: @project_wiki - .git-empty.prepend-top-default + .prepend-top-default %fieldset %legend Install Gollum: %pre.dark |