Visual updates to the navbar

(imported from commit c55988ce1f1af105662ee4e8c9d4cccf4ef847c2)
This commit is contained in:
Allen Rabinovich 2013-09-12 20:43:59 -07:00
parent 1e912c7e22
commit 176346183b
10 changed files with 19 additions and 12 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -73,8 +73,8 @@ a {
background: -ms-linear-gradient(top, rgba(172,197,193,1) 0%,rgba(220,241,234,1) 100%); /* IE10+ */ background: -ms-linear-gradient(top, rgba(172,197,193,1) 0%,rgba(220,241,234,1) 100%); /* IE10+ */
background: linear-gradient(to bottom, rgba(172,197,193,1) 0%,rgba(220,241,234,1) 100%); /* W3C */ background: linear-gradient(to bottom, rgba(172,197,193,1) 0%,rgba(220,241,234,1) 100%); /* W3C */
background-image: url(/static/images/backgrounds/header.jpg); background-image: url(/static/images/backgrounds/lightteal.png);
background-size: 180px 180px; background-size: 150px 50px;
border-bottom: 1px solid #314945; border-bottom: 1px solid #314945;
} }
@ -202,7 +202,7 @@ li,
} }
.header-main .logoimage { .header-main .logoimage {
width: 45px; width: 60px;
height: auto; height: auto;
} }
@ -1682,13 +1682,20 @@ input.recipient_box {
#navbar-buttons ul.nav li.active .dropdown-toggle { #navbar-buttons ul.nav li.active .dropdown-toggle {
font-size: 18px; font-size: 18px;
margin-top: 4px; margin-top: 4px;
color: #87cbc0; color: #dadada;
text-shadow: none; text-shadow: none;
padding-left: 0px !important; padding-left: 0px !important;
background-color: inherit; background-color: inherit;
box-shadow: inherit; box-shadow: inherit;
-webkit-box-shadow: inherit; -webkit-box-shadow: inherit;
-moz-box-shadow: inherit; -moz-box-shadow: inherit;
display: block;
width: 15px;
}
#navbar-buttons ul.nav .dropdown-toggle,
#navbar-buttons ul.nav li.active .dropdown-toggle:hover {
color: #eeeeee;
} }
#navbar-buttons ul.nav li.dropdown.open .dropdown-toggle { #navbar-buttons ul.nav li.dropdown.open .dropdown-toggle {
@ -1742,17 +1749,17 @@ input.recipient_box {
border: none; border: none;
border-top: 1px solid #777; border-top: 1px solid #777;
border-left: 1px solid #777; border-left: 1px solid #777;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2);
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2);
font-family: 'Humbug'; font-family: 'Humbug';
} }
#search_query:focus { #search_query:focus {
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7), 0px 0px 8px rgba(255,255,255, 0.3); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7), 0px 0px 8px rgba(255,255,255, 0.4);
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7), 0px 0px 8px rgba(255,255,255, 0.3); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7), 0px 0px 8px rgba(255,255,255, 0.4);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7), 0px 0px 8px rgba(255,255,255, 0.3); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.7), 0px 0px 8px rgba(255,255,255, 0.4);
} }
#searchbox .search_button, #searchbox .search_button,

View File

@ -2,7 +2,7 @@
<div class="header-main" id="top_navbar"> <div class="header-main" id="top_navbar">
<div class="column-left"> <div class="column-left">
<div> <div>
<a class="brand logo" href="#"><img src="/static/images/logo/zulip@2x.png" class="logoimage" alt="Zulip" content="Zulip"></a> <a class="brand logo" href="#"><img src="/static/images/logo/zuliplogoreg@2x.png" class="logoimage" alt="Zulip" content="Zulip"></a>
</div> </div>
</div> </div>
<div class="column-middle" id="navbar-middle"> <div class="column-middle" id="navbar-middle">
@ -16,7 +16,7 @@
<form id="searchbox_form" class="form-search navbar-search"> <form id="searchbox_form" class="form-search navbar-search">
<div id="search_arrows" class="input-append"> <div id="search_arrows" class="input-append">
<i class="icon-vector-search"></i> <i class="icon-vector-search"></i>
<input class="search-query input-block-level" id="search_query" type="text" placeholder="Search…" <input class="search-query input-block-level" id="search_query" type="text" placeholder="Search or narrow…"
autocomplete="off"> autocomplete="off">
{# Start the button off disabled since there is no active search #} {# Start the button off disabled since there is no active search #}
<button class="btn search_button" type="button" id="search_exit" disabled="disabled"><i class="icon-vector-remove"></i></button> <button class="btn search_button" type="button" id="search_exit" disabled="disabled"><i class="icon-vector-remove"></i></button>