diff --git a/static/images/backgrounds/darkteal.png b/static/images/backgrounds/darkteal.png new file mode 100644 index 0000000000..fe7183d73f Binary files /dev/null and b/static/images/backgrounds/darkteal.png differ diff --git a/static/images/backgrounds/lightgreen.png b/static/images/backgrounds/lightgreen.png new file mode 100644 index 0000000000..c88fd6c6fd Binary files /dev/null and b/static/images/backgrounds/lightgreen.png differ diff --git a/static/images/backgrounds/lightteal.png b/static/images/backgrounds/lightteal.png new file mode 100644 index 0000000000..dbe47d320e Binary files /dev/null and b/static/images/backgrounds/lightteal.png differ diff --git a/static/images/backgrounds/mediumteal.png b/static/images/backgrounds/mediumteal.png new file mode 100644 index 0000000000..432a08651a Binary files /dev/null and b/static/images/backgrounds/mediumteal.png differ diff --git a/static/images/logo/zulip2@2x.png b/static/images/logo/zulip2@2x.png new file mode 100644 index 0000000000..45be5e8ec8 Binary files /dev/null and b/static/images/logo/zulip2@2x.png differ diff --git a/static/images/logo/zuliplogo@2x.png b/static/images/logo/zuliplogo@2x.png new file mode 100644 index 0000000000..4b977620f3 Binary files /dev/null and b/static/images/logo/zuliplogo@2x.png differ diff --git a/static/images/logo/zuliplogoreg@2x.png b/static/images/logo/zuliplogoreg@2x.png new file mode 100644 index 0000000000..12d92e9318 Binary files /dev/null and b/static/images/logo/zuliplogoreg@2x.png differ diff --git a/static/images/logo/zulipwlogo@2x.png b/static/images/logo/zulipwlogo@2x.png new file mode 100644 index 0000000000..49960152bf Binary files /dev/null and b/static/images/logo/zulipwlogo@2x.png differ diff --git a/static/styles/zulip.css b/static/styles/zulip.css index 2143b80752..35fa12f028 100644 --- a/static/styles/zulip.css +++ b/static/styles/zulip.css @@ -73,8 +73,8 @@ a { 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-image: url(/static/images/backgrounds/header.jpg); - background-size: 180px 180px; + background-image: url(/static/images/backgrounds/lightteal.png); + background-size: 150px 50px; border-bottom: 1px solid #314945; } @@ -202,7 +202,7 @@ li, } .header-main .logoimage { - width: 45px; + width: 60px; height: auto; } @@ -1682,13 +1682,20 @@ input.recipient_box { #navbar-buttons ul.nav li.active .dropdown-toggle { font-size: 18px; margin-top: 4px; - color: #87cbc0; + color: #dadada; text-shadow: none; padding-left: 0px !important; background-color: inherit; box-shadow: inherit; -webkit-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 { @@ -1742,17 +1749,17 @@ input.recipient_box { border: none; border-top: 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); - -webkit-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.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.3), 0 1px 0px rgba(255, 255, 255, 0.2); + -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'; } #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); - -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); - -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); + 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.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.4); } #searchbox .search_button, diff --git a/templates/zerver/navbar.html b/templates/zerver/navbar.html index e01f69ffa2..2f1e120ae8 100644 --- a/templates/zerver/navbar.html +++ b/templates/zerver/navbar.html @@ -2,7 +2,7 @@
- +