From edad6180466930393f5ca73c0f349ed573ea7bf8 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Fri, 15 Apr 2016 14:22:05 -0700 Subject: [PATCH 1/7] Add overrides to not inherit old style guide in member search --- assets/css/topcoder.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/assets/css/topcoder.scss b/assets/css/topcoder.scss index def992afd..f41f104d4 100644 --- a/assets/css/topcoder.scss +++ b/assets/css/topcoder.scss @@ -549,4 +549,18 @@ $switch-inactive-color: $gray; .member-search-view { background-color: transparent; } + + // Overrides old style guide + a { + cursor: auto !important; + transition: none !important; + text-decoration: none !important; + color: inherit !important; + + &:visited, &:hover, &:active { + color: inherit !important; + cursor: auto !important; + text-decoration: none !important; + } + } } From f3da4350b7e5043c5da6fc68286ec372f51daf0e Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Mon, 18 Apr 2016 07:48:22 -0700 Subject: [PATCH 2/7] Fix error message --- app/profile/about/about.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/profile/about/about.controller.js b/app/profile/about/about.controller.js index 0c20d0af0..ac006fb23 100644 --- a/app/profile/about/about.controller.js +++ b/app/profile/about/about.controller.js @@ -34,7 +34,7 @@ import angular from 'angular' profileVm.status.externalLinks = CONSTANTS.STATE_READY }).catch(function(err) { - logger.error('Could retrive web links and external accounts', err) + logger.error('Could not retrieve web links and external accounts', err) profileVm.status.externalLinks = CONSTANTS.STATE_ERROR }) From 2dbd01f057614c5f9773ffe32eb154c0098e0166 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Mon, 18 Apr 2016 09:17:43 -0700 Subject: [PATCH 3/7] Trigger to pick up new member search updates From 0daa2e34bdfcc918cfc2eb4aa8e2243bc2d2206c Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Wed, 20 Apr 2016 09:58:46 -0700 Subject: [PATCH 4/7] Trigger travis for final member search From b909448a8202aa5313194c09bdbc5cdd817b716b Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Wed, 20 Apr 2016 10:16:18 -0700 Subject: [PATCH 5/7] Trigger travis for final member search From ce0dd2fb713810935a2b24e77c9bd85efe0ac437 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Wed, 20 Apr 2016 10:26:40 -0700 Subject: [PATCH 6/7] Remove box-shadow on hover from member search field --- app/layout/header/header.jade | 6 +----- assets/css/layout/header.scss | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/layout/header/header.jade b/app/layout/header/header.jade index 8250dc733..3bf6a6946 100644 --- a/app/layout/header/header.jade +++ b/app/layout/header/header.jade @@ -23,11 +23,7 @@ .menu-item-header.show-large #[button.btn-expand-search.search-icon(type="button")] .submenu - input(type="text" placeholder="find members" ng-model="vm.searchTerm" ng-keyup="vm.checkSubmit($event)") - // Suggestion list container - // ul.suggestion-list(ng-if="main.searchTerm.length > 0") - // li(ng-repeat="suggestion in main.suggestions | filter:main.searchTerm | limitTo:5") - // a(href="javascript:;" class="menu-link") {{suggestion}} + input(class="member-search-old-nav" type="text" placeholder="find members by username or skill" ng-model="vm.searchTerm" ng-keyup="vm.checkSubmit($event)") li.menu-item.link-group.user-menu(ng-switch="vm.isAuth", ng-class="{'anonymous-menu': !vm.isAuth}") // Links for logged in user diff --git a/assets/css/layout/header.scss b/assets/css/layout/header.scss index 589e720af..5a5c7a11f 100644 --- a/assets/css/layout/header.scss +++ b/assets/css/layout/header.scss @@ -22,6 +22,10 @@ background-repeat: no-repeat; } +.search-wrapper .member-search-old-nav { + box-shadow: none !important; +} + .tc-text-logo { color: #B7B7B7; font-weight: bold; From 026afd9d2f4558ffb2209e0b3f9e7c956d12273e Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Thu, 21 Apr 2016 14:47:55 -0700 Subject: [PATCH 7/7] Add optional for now so we can deploy --- assets/css/vendors/introjs.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/css/vendors/introjs.scss b/assets/css/vendors/introjs.scss index 636bc5b57..4f19ebcbe 100644 --- a/assets/css/vendors/introjs.scss +++ b/assets/css/vendors/introjs.scss @@ -68,19 +68,19 @@ // Refactor buttons when button mixins and/or style guide is done .introjs-button { - @extend .tc-btn; - @extend .tc-btn-s; + @extend .tc-btn !optional; + @extend .tc-btn-s !optional; } .introjs-skipbutton { - @extend .tc-btn-ghost; + @extend .tc-btn-ghost !optional; float: left; } .introjs-disabled { - @extend .tc-btn-s; - @extend :disabled; + @extend .tc-btn-s !optional; + @extend :disabled !optional; } .introjs-prevbutton {