From 929c4d1a135d0b7835aecee677de9f0d5faf95e6 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Wed, 7 Nov 2012 13:40:05 -0500 Subject: [PATCH 1/4] now the nav menu is prettier --- static/css/sitewide.css | 34 ++++++++---------- .../images/menu_bar_down_arrow_textblue.png | Bin 0 -> 2843 bytes static/images/menu_bar_up_arrow_textblue.png | Bin 0 -> 3007 bytes static/less/sitewide.less | 15 +++----- 4 files changed, 20 insertions(+), 29 deletions(-) create mode 100644 static/images/menu_bar_down_arrow_textblue.png create mode 100644 static/images/menu_bar_up_arrow_textblue.png diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 100253a0..964daa26 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -637,7 +637,7 @@ ul.menu { position: relative; } .js-topmenu#authenticated.highlight span#welcome { - background-image: url("/static/images/menu_bar_up_arrow.png"); + background-image: url("/static/images/menu_bar_up_arrow_textblue.png"); } .js-topmenu ul#user_menu { display: none; @@ -687,7 +687,6 @@ ul.menu { letter-spacing: -0.05em; } .js-topmenu ul li span#welcome { - color: #8dc63f; height: 36px; line-height: 36px; display: block; @@ -703,7 +702,7 @@ ul.menu { padding: 0 10px; margin-right: 5px; padding-right: 22px; - background-image: url("/static/images/menu_bar_down_arrow.png"); + background-image: url("/static/images/menu_bar_down_arrow_textblue.png"); background-repeat: no-repeat; background-position: right; } @@ -735,12 +734,12 @@ ul.menu { } .js-topmenu ul .unseen_count { border: solid 2px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: 700px; + -webkit-border-radius: 700px; + border-radius: 700px; + -moz-border-radius: 700px; + -webkit-border-radius: 700px; + border-radius: 700px; padding: 3px; line-height: 16px; width: 16px; @@ -751,7 +750,7 @@ ul.menu { .js-topmenu ul .unseen_count#i_haz_notifications { background-color: #8dc63f; color: white; - border-color: #8dc63f; + border-color: white; } .js-topmenu ul .unseen_count#no_notifications_for_you { border-color: #edf3f4; @@ -759,12 +758,12 @@ ul.menu { color: #3d4e53; } #i_haz_notifications_badge { - -moz-border-radius: 18px; - -webkit-border-radius: 18px; - border-radius: 18px; - -moz-border-radius: 18px; - -webkit-border-radius: 18px; - border-radius: 18px; + -moz-border-radius: 700px; + -webkit-border-radius: 700px; + border-radius: 700px; + -moz-border-radius: 700px; + -webkit-border-radius: 700px; + border-radius: 700px; font-size: 13px; border: solid 2px white; margin-left: -7px; @@ -818,9 +817,6 @@ ul.menu { .js-search-inner { float: right; } -#welcome { - overflow: hidden; -} #locationhash { /* used solely to contain template variables for tabs.js; should not display */ diff --git a/static/images/menu_bar_down_arrow_textblue.png b/static/images/menu_bar_down_arrow_textblue.png new file mode 100644 index 0000000000000000000000000000000000000000..2a99709545ee320f57715f0aeb481c4cfb99eadd GIT binary patch literal 2843 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 Date: Wed, 7 Nov 2012 13:45:10 -0500 Subject: [PATCH 2/4] add badge link to notifications page and suppress menu drop-down when clicking on it --- frontend/templates/base.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/templates/base.html b/frontend/templates/base.html index a9c460a9..b1473b34 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -40,9 +40,14 @@ @@ -109,7 +114,7 @@ Generic Ungluer Avatar {% endif %} {% if unseen_count %} - {{ unseen_count }} + {{ unseen_count }} {% endif %} {% comment %} From affa8239c3da6534c9c69bd0e1ba549339164701 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Wed, 7 Nov 2012 13:45:19 -0500 Subject: [PATCH 3/4] more prettifying --- static/css/sitewide.css | 1 + static/less/sitewide.less | 1 + 2 files changed, 2 insertions(+) diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 964daa26..5841fd68 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -772,6 +772,7 @@ ul.menu { background: #8dc63f; color: white; position: absolute; + line-height: normal; } .js-search { float: left; diff --git a/static/less/sitewide.less b/static/less/sitewide.less index c9f1f8ab..91135808 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -405,6 +405,7 @@ ul.menu{ background: @call-to-action; color: white; position: absolute; + line-height: normal; } .js-search { From 13b4957d06f1e756d2f0d44150406b90f96811b0 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Tue, 13 Nov 2012 11:23:44 -0800 Subject: [PATCH 4/4] Update Sn test to work with latest UI tweaks --- test/campaigntest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/campaigntest.py b/test/campaigntest.py index beda9c89..beac0b3e 100644 --- a/test/campaigntest.py +++ b/test/campaigntest.py @@ -189,7 +189,7 @@ def test_relaunch(unglue_it_url = settings.LIVE_SERVER_TEST_URL, do_local=True, input_username = WebDriverWait(sel,20).until(lambda d : d.find_element_by_css_selector("input#id_username")) input_username.send_keys(USER) sel.find_element_by_css_selector("input#id_password").send_keys(PASSWORD) - sel.find_element_by_css_selector("input[value*='sign in']").click() + sel.find_element_by_css_selector("input[value*='Sign In']").click() # click on biggest campaign list # I have no idea why selenium thinks a is not displayed....so that's why I'm going up one element.