From 334e0cbfbf9647fc4560fd2548f0537cd69331f0 Mon Sep 17 00:00:00 2001 From: Marina Samuel Date: Tue, 13 Jan 2015 18:20:46 -0500 Subject: [PATCH 1/2] Adding html and css for experimental message. --- data/about-you.html | 7 ++++ data/css/devmenu/styles.css | 64 ++++++++++++++++++++++++++++++------- 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/data/about-you.html b/data/about-you.html index e99a92c..2738adb 100644 --- a/data/about-you.html +++ b/data/about-you.html @@ -33,6 +33,8 @@
diff --git a/data/css/devmenu/styles.css b/data/css/devmenu/styles.css index ce4cac7..5e7d6ff 100644 --- a/data/css/devmenu/styles.css +++ b/data/css/devmenu/styles.css @@ -210,30 +210,72 @@ li.active { } .dropdown-menu { - background-color: #2F3943; + min-width: 268px; + max-width: 268px; padding: 0px; + border: none; } .dropdown-menu > li > a { - padding: 0; - padding-right: 30px; - padding-left: 30px; - height: 40px; - line-height: 40px; - font-weight: 100; - color: white; + padding: 0px 18px; + height: 55px; + line-height: 55px; + color: #171F26; } .dropdown-menu > li > a:hover { - background-color: #576872; - color: white; + background-color: #F2F2F2; + color: #171F26; } .dropdown-menu .divider { - background-color: #576872; + background-color: #E6E6E6; margin: 0px; } +.dropdown-menu .title-divider { + background-color: #E6E6E6; + height: 2px; +} + +.dropdown-menu .cog-title { + font-weight: 500; + text-transform: uppercase; + height: 45px; + line-height: 45px; +} + +.dropdown-menu .cog-title:hover { + background-color: white; + cursor: auto; +} + +.dropdown-menu .report-bugs { + display: none; + background-color: #F2F2F2; + padding-bottom: 15px; + text-align: center; + font-size: 12px; + border-radius: 4px; +} + +.report-bugs > .blurb { + white-space: normal; + line-height: 20px; + padding: 14px; + padding-top: 20px; + cursor: auto; +} + +.report-bugs button { + background-color: rgb(0, 150, 221); + border: 1px solid rgb(0, 149, 221); + width: 240px; + height: 26px; + border-radius: 4px; + color: white; +} + /* Visual Area */ From 4353078bae0bed926037a7b41a7d5ae998810fbb Mon Sep 17 00:00:00 2001 From: Marina Samuel Date: Tue, 13 Jan 2015 18:21:11 -0500 Subject: [PATCH 2/2] Only show the messaging when viewing the recommend tab, otherwise remove it. --- data/about-you.js | 3 +++ data/charts/InterestDashboard.js | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/data/about-you.js b/data/about-you.js index a464502..1467dfc 100644 --- a/data/about-you.js +++ b/data/about-you.js @@ -99,6 +99,9 @@ aboutYou.controller("vizCtrl", function($scope, dataService) { // Adjusting highligted tab $('#interests_tab').addClass("active"); $('#recommend_tab').removeClass("active"); + + // Remove experimental messaging since we're now removing the recommend tab. + $('.dropdown-menu .report-bugs').css("display", 'none'); } $('#recommend_tab').css("display", displayVal); }; diff --git a/data/charts/InterestDashboard.js b/data/charts/InterestDashboard.js index 0817f76..34b3f70 100644 --- a/data/charts/InterestDashboard.js +++ b/data/charts/InterestDashboard.js @@ -736,6 +736,14 @@ InterestDashboard.prototype = { graph: function(data, table, $scope) { try { + // Show the recommend tab messaging in the cog only when viewing the recommend tab. + $('#interests_tab').on('click', () => { + $('.dropdown-menu .report-bugs').css("display", 'none'); + }); + $('#recommend_tab').on('click', () => { + $('.dropdown-menu .report-bugs').css("display", 'inherit'); + }); + // We got some data so make the Dashboard view active and the 'no history' view inactive $('#yourInterests').addClass("active"); $('#noHistory').removeClass("active");