Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix top notification display to appear above the floating recipient bar 

(imported from commit 0a5915af3589db09ee2bc294afced0a21352fde2)
This commit is contained in:
Allen Rabinovich 2014-02-07 12:02:29 -07:00
parent da3ac9ae1b
commit 4c4cd1ed8e
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
static/styles/zulip.css
View File

@ -117,7 +117,7 @@ a {
position: fixed; position: fixed;
margin-top: 50px; margin-top: 50px;
width: 250px; width: 250px;
z-index:99; z-index:100;
padding-left: 10px; padding-left: 10px;
} }
@ -303,10 +303,6 @@ a:hover code {
max-width: 250px; max-width: 250px;
} }
#left-sidebar {
z-index: 4;
}
#left-sidebar .brand { #left-sidebar .brand {
display: table-row; display: table-row;
} }
@ -3551,7 +3547,7 @@ div.edit_bot {
width: 100%; width: 100%;
top: 41px; top: 41px;
left: 0px; left: 0px;
z-index: 3; z-index: 99;
} }
#home .alert-bar { #home .alert-bar {
@ -3562,17 +3558,12 @@ div.edit_bot {
} }
#home .alert-bar-contents { #home .alert-bar-contents {
background: #9bff8b;
background: rgba(163,211,147,0.95); background: rgba(163,211,147,0.95);
border-bottom: 1px solid #ffffff;
border-right: 1px solid #ffffff;
border-left: 1px solid #ffffff;
border-radius: 2px;
font-weight: 400; font-weight: 400;
padding: 10px 35px 10px 10px; padding: 10px 35px 10px 10px;
display: inline-block; display: inline-block;
box-shadow: 0px 0px 4px -1px rgba(0,0,0,0.7);
position: relative; position: relative;
z-index: 99;
} }
#home .alert-bar .alert-icon { #home .alert-bar .alert-icon {

9
templates/zerver/home.html
View File

@ -1,13 +1,4 @@
{# Home tab of the app, containing messages. #} {# Home tab of the app, containing messages. #}
<div id="alert-bar-container" class="alert-bar-container" style='display: none;'>
<div id="alert-bar" class="alert-bar">
<div id="alert-bar-contents" class="alert-bar-contents">
<div id="custom-alert-bar-content"></div>
<i class="icon-vector-remove close-alert-icon"></i>
</div>
</div>
</div>
<div class="message_area_padder message_list" id="main_div"> <div class="message_area_padder message_list" id="main_div">
<div id="loading_more_messages_indicator"></div> <div id="loading_more_messages_indicator"></div>
<div id="page_loading_indicator"></div> <div id="page_loading_indicator"></div>

8
templates/zerver/index.html
View File

@ -91,6 +91,14 @@ var page_params = {{ page_params }};
<div class="column-middle"> <div class="column-middle">
<div class="column-middle-inner tab-content"> <div class="column-middle-inner tab-content">
<div class="tab-pane active" id="home"> <div class="tab-pane active" id="home">
<div id="alert-bar-container" class="alert-bar-container" style='display: none;'>
<div id="alert-bar" class="alert-bar">
<div id="alert-bar-contents" class="alert-bar-contents">
<div id="custom-alert-bar-content"></div>
<i class="icon-vector-remove close-alert-icon"></i>
</div>
</div>
</div>
<div class="fixed-app" id="floating_recipient_bar"> <div class="fixed-app" id="floating_recipient_bar">
<div class="app-main recipient_bar_content"> <div class="app-main recipient_bar_content">
<div class="column-middle column-overlay recipient-bar-main"> <div class="column-middle column-overlay recipient-bar-main">