Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Qa integration #769

Merged
merged 11 commits into from
Apr 21, 2016
6 changes: 1 addition & 5 deletions app/layout/header/header.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/profile/about/about.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand Down
4 changes: 4 additions & 0 deletions assets/css/layout/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 14 additions & 0 deletions assets/css/topcoder.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
10 changes: 5 additions & 5 deletions assets/css/vendors/introjs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down