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
b127bfe0
Commit
b127bfe0
authored
Jul 01, 2015
by
frances botsford
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8468 from edx/frances/teams-listings
Team card/listing
parents
9e0ed9b7
15b91044
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
219 additions
and
7 deletions
+219
-7
lms/static/sass/elements/_controls.scss
+15
-2
lms/static/sass/views/_teams.scss
+204
-5
lms/templates/ux/reference/teams-base.html
+0
-0
No files found.
lms/static/sass/elements/_controls.scss
View file @
b127bfe0
...
...
@@ -294,8 +294,8 @@
@extend
%btn-primary
;
border
:
1px
solid
darken
(
$action-primary-bg
,
10%
);
border-radius
:
3px
;
padding
:
(
$baseline
/
2
)
$baseline
;
background-color
:
$action-primary-fg
;
padding
:
8px
$baseline
;
background-color
:
transparent
;
color
:
darken
(
$action-primary-bg
,
10%
);
text-align
:
center
;
...
...
@@ -339,6 +339,19 @@
}
}
%btn-pl-secondary-base
{
@extend
%btn-pl-default-base
;
@include
transition
(
border
$tmg-f2
ease-in-out
);
border
:
1px
solid
transparent
;
color
:
$action-primary-bg
;
&
:hover
{
border
:
1px
solid
$gray-l2
;
background-color
:
transparent
;
color
:
$action-primary-bg
;
}
}
// ====================
// application: canned actions
...
...
lms/static/sass/views/_teams.scss
View file @
b127bfe0
...
...
@@ -9,8 +9,14 @@
}
}
p
,
span
{
color
:
inherit
;
font-weight
:
inherit
;
}
.icon
{
font-family
:
"FontAwesome"
;
color
:
inherit
;
}
%button-reset
{
...
...
@@ -82,7 +88,7 @@
}
.search-field
{
transition
:
all
.25s
ease-in-out
;
transition
:
all
$tmg-f2
ease-in-out
;
border
:
0
;
border-bottom
:
2px
solid
transparent
;
padding
:
(
$baseline
/
4
)
(
$baseline
/
2
);
...
...
@@ -105,6 +111,7 @@
color
:
$gray-l3
;
}
// STATE: hover and focus
&
:hover
,
&
:focus
{
...
...
@@ -122,7 +129,7 @@
.page-content-nav
{
margin-bottom
:
$baseline
;
border-bottom
:
2
px
solid
$gray-l5
;
border-bottom
:
3
px
solid
$gray-l5
;
.nav-item
{
display
:
inline-block
;
...
...
@@ -136,6 +143,7 @@
color
:
$gray-d2
;
}
// STATE: hover and focus
&
:hover
,
&
:focus
{
border-bottom
:
3px
solid
$link-color
;
...
...
@@ -148,6 +156,196 @@
@extend
%t-weight4
;
}
.listing-tools
{
@extend
%t-copy-sub1
;
margin
:
(
$baseline
/
10
)
$baseline
;
color
:
$gray-l1
;
label
{
// override
color
:
inherit
;
font-size
:
inherit
;
}
.listing-sort-select
{
@extend
%t-copy-sub1
;
@extend
%t-regular
;
border
:
0
;
}
}
.card
{
@include
clearfix
();
transition
:
all
$tmg-f2
ease-in-out
;
position
:
relative
;
display
:
inline-block
;
vertical-align
:
top
;
width
:
30%
;
// TODO: susy grid
margin
:
(
$baseline
)
1
.2%
;
border
:
1px
solid
$gray-l4
;
border-bottom
:
2px
solid
$gray-l3
;
border-radius
:
3px
;
background-color
:
$white
;
color
:
$black
;
// STATE: hover, active, and focus
&
:hover
,
&
:active
,
&
:focus
{
box-shadow
:
0
0
5px
1px
$m-blue-t1
;
.card-description
{
color
:
$base-font-color
;
}
}
.wrapper-card-core
{
@include
clearfix
();
padding
:
(
$baseline
);
}
.card-type
{
@extend
%t-copy-sub2
;
text-transform
:
uppercase
;
color
:
$gray
;
}
.card-title
{
@extend
%t-title5
;
@extend
%t-strong
;
margin-bottom
:
rem
(
.5
);
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.card-description
{
@extend
%t-copy-sub1
;
color
:
$gray
;
}
.card-actions
{
@include
clearfix
();
.action-view
{
@extend
%btn-pl-default-base
;
float
:
right
;
margin
:
(
$baseline
/
4
)
0
;
}
}
.wrapper-card-meta
{
@include
clearfix
();
@extend
%t-copy-sub1
;
padding
:
(
$baseline
/
2
)
$baseline
;
background-color
:
$gray-l5
;
color
:
$gray
;
.meta-detail
{
margin-top
:
(
$baseline
/
4
);
margin-right
:
(
$baseline
*.
75
);
color
:
$gray
;
.icon
{
margin-right
:
(
$baseline
/
4
);
}
}
.list-member-thumbs
{
@extend
%ui-no-list
;
display
:
inline-block
;
vertical-align
:
text-bottom
;
.item-member-thumb
{
display
:
inline-block
;
}
img
{
width
:
$baseline
;
height
:
$baseline
;
margin
:
0
(
$baseline
/
4
);
}
}
}
&
.square-card
{
.card-description
{
// replace with js or char limit
height
:
4rem
;
overflow
:
hidden
;
}
.wrapper-card-meta
{
&
.has-actions
{
.card-meta
,
.card-actions
{
display
:
inline-block
;
width
:
48%
;
// TODO: susy grid
vertical-align
:
middle
;
}
}
}
}
&
.list-card
{
width
:
auto
;
display
:
block
;
.card-core
{
display
:
inline-block
;
vertical-align
:
middle
;
width
:
84%
;
// TODO: susy grid
}
.card-meta
{
@include
clearfix
();
}
.meta-detail
{
display
:
inline-block
;
}
.team-activity
{
float
:
right
;
}
.card-actions
{
display
:
inline-block
;
vertical-align
:
middle
;
width
:
15%
;
// TODO: susy grid
}
}
&
.has-pennant
{
.wrapper-card-core
{
padding-top
:
(
$baseline
*
2
);
}
.pennant
{
@extend
%t-copy-sub2
;
@extend
%t-strong
;
display
:
block
;
position
:
absolute
;
top
:
(
$baseline
/
2
);
left
:
-
(
$baseline
/
4
);
box-shadow
:
1px
1px
1px
0
$blue-d1
;
background-color
:
$m-blue-l2
;
padding
:
(
$baseline
/
10
)
(
$baseline
*.
75
);
text-transform
:
uppercase
;
color
:
$white
;
}
}
&
.is-unavailable
{
background-color
:
$gray-l5
;
.wrapper-card-meta
{
background-color
:
$gray-l4
;
}
}
}
.create-team
{
legend
{
...
...
@@ -181,7 +379,7 @@
.input-text
{
@extend
%t-copy-base
;
@include
transition
(
all
$tmg-f2
ease-in-out
0s
)
;
transition
:
all
$tmg-f2
ease-in-out
0s
;
display
:
block
;
width
:
90%
;
height
:
100%
;
...
...
@@ -251,6 +449,7 @@
border
:
1px
solid
transparent
;
color
:
$gray
;
// STATE: hover and focus
&
:hover
,
&
:focus
{
border
:
1px
solid
$link-color
;
...
...
@@ -261,13 +460,13 @@
.required-wrapper
{
display
:
inline-block
;
vertical-align
:
top
;
width
:
60%
;
width
:
60%
;
// TODO: susy grid
}
.optional-wrapper
{
display
:
inline-block
;
vertical-align
:
top
;
width
:
35%
;
width
:
35%
;
// TODO: susy grid
margin-left
:
2%
;
border-left
:
2px
solid
$gray-l4
;
padding-left
:
2%
;
...
...
lms/templates/ux/reference/teams-base.html
View file @
b127bfe0
This diff is collapsed.
Click to expand it.
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