Add flash containers and broadcast messages below subnav
This commit is contained in:
parent
502c53b5fe
commit
a2af779004
13 changed files with 180 additions and 159 deletions
|
@ -20,6 +20,7 @@ v 8.13.0 (unreleased)
|
|||
- Add missing values to linter !6276 (Katarzyna Kobierska Ula Budziszewska)
|
||||
- Fix Long commit messages overflow viewport in file tree
|
||||
- Revert avoid touching file system on Build#artifacts?
|
||||
- Add broadcast messages and alerts below sub-nav
|
||||
- Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
|
||||
- Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
|
||||
- Add organization field to user profile
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
margin: 0;
|
||||
margin-bottom: $gl-padding;
|
||||
font-size: 14px;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
|
||||
.flash-notice {
|
||||
@extend .alert;
|
||||
|
@ -33,6 +35,12 @@
|
|||
}
|
||||
}
|
||||
|
||||
.content-wrapper {
|
||||
.flash-notice .container-fluid {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: $screen-md-min) {
|
||||
ul.notes {
|
||||
.flash-container.timeline-content {
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= content_for :sub_nav do
|
||||
.scrolling-tabs-container.sub-nav-scroll
|
||||
= render 'shared/nav_scroll'
|
||||
.nav-links.sub-nav.scrolling-tabs
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= content_for :sub_nav do
|
||||
.scrolling-tabs-container.sub-nav-scroll
|
||||
= render 'shared/nav_scroll'
|
||||
.nav-links.sub-nav.scrolling-tabs
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
.flash-container.flash-container-page
|
||||
- if alert
|
||||
.flash-alert
|
||||
= alert
|
||||
%div{ class: (container_class) }
|
||||
%span= alert
|
||||
|
||||
- elsif notice
|
||||
.flash-notice
|
||||
= notice
|
||||
%div{ class: (container_class) }
|
||||
%span= notice
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
.container-fluid
|
||||
= render "layouts/nav/#{nav}"
|
||||
.content-wrapper{ class: "#{layout_nav_class}" }
|
||||
= yield :sub_nav
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/flash"
|
||||
= yield :flash_message
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= content_for :sub_nav do
|
||||
.scrolling-tabs-container.sub-nav-scroll
|
||||
= render 'shared/nav_scroll'
|
||||
.nav-links.sub-nav.scrolling-tabs
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
- if current_user
|
||||
= auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
|
||||
|
||||
= content_for :sub_nav do
|
||||
= render "head"
|
||||
|
||||
%div{ class: container_class }
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= content_for :sub_nav do
|
||||
.scrolling-tabs-container.sub-nav-scroll
|
||||
= render 'shared/nav_scroll'
|
||||
.nav-links.sub-nav.scrolling-tabs
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= content_for :sub_nav do
|
||||
.scrolling-tabs-container.sub-nav-scroll
|
||||
= render 'shared/nav_scroll'
|
||||
.nav-links.sub-nav.scrolling-tabs
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
- page_title "Issues"
|
||||
- new_issue_email = @project.new_issue_address(current_user)
|
||||
= content_for :sub_nav do
|
||||
= render "projects/issues/head"
|
||||
|
||||
= content_for :meta_tags do
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= content_for :sub_nav do
|
||||
.scrolling-tabs-container.sub-nav-scroll
|
||||
= render 'shared/nav_scroll'
|
||||
.nav-links.sub-nav.scrolling-tabs
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= content_for :sub_nav do
|
||||
.scrolling-tabs-container.sub-nav-scroll
|
||||
= render 'shared/nav_scroll'
|
||||
.nav-links.sub-nav.scrolling-tabs
|
||||
|
|
Loading…
Reference in a new issue