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/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 }) 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; 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; + } + } } 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 {