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

Additional fixes for relayout regressions. 

Specifically:
   * Fix the settings menu positioning and appearance
   * Restyle menu and add arrow on top
   * Remove labels from new message buttons in narrow windows and adjust the close button on the composition pane

(imported from commit 586753b6526289b32ec0a90b62d8b2ac1c8182cd)
This commit is contained in:
Allen Rabinovich 2013-08-15 14:03:28 -07:00
parent 3345199604
commit 17e07d551f
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
static/styles/zulip.css
View File

@ -1109,7 +1109,7 @@ blockquote p {
display: none;
position: absolute;
right: 5px;
top: 10px;
top: 17px;
}
/* Like .nav-tabs > li > a */
@ -1324,6 +1324,28 @@ input.recipient_box {
width: -moz-max-content;
}
.dropdown-menu {
left: -10px;
min-width: 180px;
-webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
}
.dropdown-menu:after {
position: absolute;
width: 0px;
height: 0px;
top: -6px;
left: 11px;
display: inline-block;
border-right: 6px solid transparent;
border-bottom: 6px solid #fff;
border-left: 6px solid transparent;
content: '';
}
#navbar-buttons ul.nav .dropdown-toggle,
#navbar-buttons ul.nav li.active .dropdown-toggle {
font-size: 18px;
@ -2365,6 +2387,18 @@ div.edit_bot {
top: 3px;
}
.dropdown-menu {
left: -160px;
min-width: 180px;
-webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
}
.dropdown-menu:after {
left: 160px;
}
.column-middle {
margin-left: -200px;
margin-right: 0px;
@ -2429,6 +2463,12 @@ div.edit_bot {
}
@media (max-width: 500px) {
.compose_stream_button_label, .compose_private_button_label {
display: none;
}
}
/*
@media (max-width: 480px) {
@ -2477,12 +2517,6 @@ div.edit_bot {
}
}
@media (max-width: 480px) {
.compose_stream_button_label, .compose_private_button_label {
display: none;
}
}
@media (max-width: 767px) {
.sidebar-nav {
padding: 0.5em;

2
templates/zerver/navbar.html
View File

@ -32,7 +32,7 @@
<a id="settings-dropdown" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
<i class="icon-vector-cog"></i>
</a>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="settings-dropdown">
<ul class="dropdown-menu" role="menu" aria-labelledby="settings-dropdown">
<li title="Messages">
<a href="#home" data-toggle="tab">
<i class="icon-vector-list"></i> Messages