Commit 0145ae7b by Frances Botsford Committed by Andy Armstrong

adjust teams search styles and add search clear

parent 4be74937
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
var view = this; var view = this;
this.getTopic(topicID).done(function (topic) { this.getTopic(topicID).done(function (topic) {
view.mainView = view.createViewWithHeader({ view.mainView = view.createViewWithHeader({
parentTopic: topic, topic: topic,
title: gettext("Create a New Team"), title: gettext("Create a New Team"),
description: gettext("Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know."), description: gettext("Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know."),
mainView: new TeamEditView({ mainView: new TeamEditView({
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
{ {
mainView: view, mainView: view,
subject: team, subject: team,
parentTopic: topic, topic: topic,
headerActionsView: TeamProfileActionsView headerActionsView: TeamProfileActionsView
} }
) )
......
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
} }
.page-header-secondary { .page-header-secondary {
@include text-align(right);
display: inline-block; display: inline-block;
width: flex-grid(4,12); width: flex-grid(4,12);
@include text-align(right);
vertical-align: text-bottom; vertical-align: text-bottom;
} }
} }
...@@ -84,46 +84,59 @@ ...@@ -84,46 +84,59 @@
.page-header-search { .page-header-search {
.wrapper-search-input {
display: inline-block;
position: relative;
vertical-align: middle;
}
.search-label { .search-label {
@extend %text-sr; @extend %text-sr;
} }
.search-field { .search-field {
transition: all $tmg-f2 ease-in-out; transition: all $tmg-f2 ease-in-out;
border: 0; border: 1px solid $gray-l4;
border-bottom: 2px solid transparent; border-radius: 3px;
padding: ($baseline/4) ($baseline/2); padding: ($baseline/4) ($baseline/2);
font-family: inherit; font-family: inherit;
color: $gray; color: $gray;
@include text-align(right);
&:focus {
border-bottom: 2px solid $black;
color: $black;
}
} }
.action-search { .action-search {
@extend %button-reset; @extend %button-reset;
padding: ($baseline/5) ($baseline/2);
vertical-align: middle;
background-color: $gray-l3; background-color: $gray-l3;
padding: ($baseline/5) ($baseline/2);
text-shadow: none; text-shadow: none;
vertical-align: middle;
.icon { .icon {
color: $gray-l3; color: $white;
} }
// STATE: hover and focus // STATE: hover and focus
&:hover, &:hover,
&:focus { &:focus {
background-color: $blue;
}
}
.icon { .action-clear {
@include right(0);
@include margin(0, ($baseline/4), 0, 0);
@extend %button-reset;
position: absolute;
top: 0;
padding: ($baseline/4);
color: $gray-l3;
// STATE: hover and focus
&:hover,
&:focus {
color: $black; color: $black;
} }
} }
} }
}
// main content bits // main content bits
.page-content { .page-content {
...@@ -255,6 +268,11 @@ ...@@ -255,6 +268,11 @@
@include margin-right ($baseline*.75); @include margin-right ($baseline*.75);
color: $gray-d1; color: $gray-d1;
abbr {
border: 0;
text-decoration: none;
}
.icon { .icon {
@include margin-right ($baseline/4); @include margin-right ($baseline/4);
} }
...@@ -328,10 +346,6 @@ ...@@ -328,10 +346,6 @@
&.has-pennant { &.has-pennant {
.wrapper-card-core {
padding-top: ($baseline*2);
}
.pennant { .pennant {
@extend %t-copy-sub2; @extend %t-copy-sub2;
@extend %t-strong; @extend %t-strong;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment