Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
0145ae7b
Commit
0145ae7b
authored
Aug 28, 2015
by
Frances Botsford
Committed by
Andy Armstrong
Sep 02, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjust teams search styles and add search clear
parent
4be74937
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
21 deletions
+35
-21
lms/djangoapps/teams/static/teams/js/views/teams_tab.js
+2
-2
lms/static/sass/views/_teams.scss
+33
-19
No files found.
lms/djangoapps/teams/static/teams/js/views/teams_tab.js
View file @
0145ae7b
...
...
@@ -206,7 +206,7 @@
var
view
=
this
;
this
.
getTopic
(
topicID
).
done
(
function
(
topic
)
{
view
.
mainView
=
view
.
createViewWithHeader
({
parentT
opic
:
topic
,
t
opic
:
topic
,
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."
),
mainView
:
new
TeamEditView
({
...
...
@@ -368,7 +368,7 @@
{
mainView
:
view
,
subject
:
team
,
parentT
opic
:
topic
,
t
opic
:
topic
,
headerActionsView
:
TeamProfileActionsView
}
)
...
...
lms/static/sass/views/_teams.scss
View file @
0145ae7b
...
...
@@ -55,9 +55,9 @@
}
.page-header-secondary
{
@include
text-align
(
right
);
display
:
inline-block
;
width
:
flex-grid
(
4
,
12
);
@include
text-align
(
right
);
vertical-align
:
text-bottom
;
}
}
...
...
@@ -84,43 +84,56 @@
.page-header-search
{
.wrapper-search-input
{
display
:
inline-block
;
position
:
relative
;
vertical-align
:
middle
;
}
.search-label
{
@extend
%text-sr
;
}
.search-field
{
transition
:
all
$tmg-f2
ease-in-out
;
border
:
0
;
border-
bottom
:
2px
solid
transparent
;
border
:
1px
solid
$gray-l4
;
border-
radius
:
3px
;
padding
:
(
$baseline
/
4
)
(
$baseline
/
2
);
font-family
:
inherit
;
color
:
$gray
;
@include
text-align
(
right
);
&
:focus
{
border-bottom
:
2px
solid
$black
;
color
:
$black
;
}
}
.action-search
{
@extend
%button-reset
;
padding
:
(
$baseline
/
5
)
(
$baseline
/
2
);
vertical-align
:
middle
;
background-color
:
$gray-l3
;
padding
:
(
$baseline
/
5
)
(
$baseline
/
2
);
text-shadow
:
none
;
vertical-align
:
middle
;
.icon
{
color
:
$
gray-l3
;
color
:
$
white
;
}
// STATE: hover and focus
&
:hover
,
&
:focus
{
background-color
:
$blue
;
}
}
.icon
{
color
:
$black
;
}
.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
;
}
}
}
...
...
@@ -255,6 +268,11 @@
@include
margin-right
(
$baseline
*.
75
);
color
:
$gray-d1
;
abbr
{
border
:
0
;
text-decoration
:
none
;
}
.icon
{
@include
margin-right
(
$baseline
/
4
);
}
...
...
@@ -328,10 +346,6 @@
&
.has-pennant
{
.wrapper-card-core
{
padding-top
:
(
$baseline
*
2
);
}
.pennant
{
@extend
%t-copy-sub2
;
@extend
%t-strong
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment