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
6d6bfa7f
Commit
6d6bfa7f
authored
Jul 21, 2015
by
Frances Botsford
Committed by
Daniel Friedman
Jul 22, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added incontext option to system message styles for teams
parent
db6755fa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
6 deletions
+34
-6
lms/static/sass/base/_variables.scss
+3
-3
lms/static/sass/elements/_system-feedback.scss
+12
-1
lms/templates/ux/reference/teams-base.html
+9
-1
lms/templates/ux/reference/teams-create.html
+10
-1
No files found.
lms/static/sass/base/_variables.scss
View file @
6d6bfa7f
...
@@ -150,7 +150,7 @@ $yellow: rgb(255, 252, 221);
...
@@ -150,7 +150,7 @@ $yellow: rgb(255, 252, 221);
// ====================
// ====================
// COLORS: old variables
// COLORS: old variables
// DEPRECATED: use colors in lists above
// DEPRECATED: use colors in lists above
$error-red
:
rgb
(
253
,
87
,
87
);
$error-red
:
rgb
(
253
,
87
,
87
);
$danger-red
:
rgb
(
212
,
64
,
64
);
$danger-red
:
rgb
(
212
,
64
,
64
);
$light-gray
:
rgb
(
221
,
221
,
221
);
$light-gray
:
rgb
(
221
,
221
,
221
);
...
@@ -163,7 +163,7 @@ $light-gray: rgb(221,221,221); // #dddddd
...
@@ -163,7 +163,7 @@ $light-gray: rgb(221,221,221); // #dddddd
// ====================
// ====================
// used by descriptor css
// used by descriptor css
// DEPRECATED: use colors in lists above
// DEPRECATED: use colors in lists above
$lightGrey
:
rgb
(
237
,
241
,
245
);
// #edf1f5
$lightGrey
:
rgb
(
237
,
241
,
245
);
// #edf1f5
$darkGrey
:
rgb
(
136
,
145
,
161
);
// #8891a1
$darkGrey
:
rgb
(
136
,
145
,
161
);
// #8891a1
$lightGrey1
:
$gray-l3
;
$lightGrey1
:
$gray-l3
;
...
@@ -355,7 +355,7 @@ $highlight-color: rgb(255,255,0);
...
@@ -355,7 +355,7 @@ $highlight-color: rgb(255,255,0);
// Notifications
// Notifications
$notify-banner-bg-1
:
rgb
(
56
,
56
,
56
);
$notify-banner-bg-1
:
rgb
(
56
,
56
,
56
);
$notify-banner-bg-2
:
rgb
(
136
,
136
,
136
);
$notify-banner-bg-2
:
rgb
(
136
,
136
,
136
);
$notify-banner-bg-3
:
rgb
(
223
,
223
,
223
)
;
$notify-banner-bg-3
:
$shadow-l2
;
$alert-color
:
rgb
(
212
,
64
,
64
);
//rich red
$alert-color
:
rgb
(
212
,
64
,
64
);
//rich red
$warning-color
:
rgb
(
237
,
189
,
60
);
//rich yellow
$warning-color
:
rgb
(
237
,
189
,
60
);
//rich yellow
...
...
lms/static/sass/elements/_system-feedback.scss
View file @
6d6bfa7f
// lms - elements - system feedback
// lms - elements - system feedback
// ====================
// ====================
// messages
//
pre-pattern library
messages
// UI : message
// UI : message
.wrapper-msg
{
.wrapper-msg
{
...
@@ -111,6 +111,7 @@
...
@@ -111,6 +111,7 @@
&
.urgency-low
{
&
.urgency-low
{
background
:
$notify-banner-bg-3
;
background
:
$notify-banner-bg-3
;
box-shadow
:
0
1px
2px
$shadow
;
.msg
{
.msg
{
color
:
$black
;
color
:
$black
;
...
@@ -132,6 +133,16 @@
...
@@ -132,6 +133,16 @@
&
.success
{
&
.success
{
border-top
:
3px
solid
$success-color
;
border-top
:
3px
solid
$success-color
;
}
}
&
.is-incontext
{
margin
:
$baseline
;
.msg
{
max-width
:
unset
;
min-width
:
auto
;
}
}
}
}
...
...
lms/templates/ux/reference/teams-base.html
View file @
6d6bfa7f
...
@@ -151,6 +151,15 @@ Teams | Course name
...
@@ -151,6 +151,15 @@ Teams | Course name
</div>
</div>
</div>
</div>
</header>
</header>
<div
class=
"wrapper-msg is-incontext urgency-low warning"
>
<div
class=
"msg"
>
<div
class=
"msg-content"
>
<div
class=
"copy"
>
<p>
We couldn't find the team "blah".
</p>
</div>
</div>
</div>
</div>
<div
class=
"page-content"
>
<div
class=
"page-content"
>
<nav
class=
"page-content-nav"
aria-label=
"Team"
>
<nav
class=
"page-content-nav"
aria-label=
"Team"
>
...
@@ -159,7 +168,6 @@ Teams | Course name
...
@@ -159,7 +168,6 @@ Teams | Course name
</nav>
</nav>
<div
class=
"page-content-main"
>
<div
class=
"page-content-main"
>
<!-- may need a form with submit here -->
<div
class=
"listing-tools"
>
<div
class=
"listing-tools"
>
<span
class=
"listing-count"
>
1-10 of 24 topics
</span>
|
<span
class=
"listing-count"
>
1-10 of 24 topics
</span>
|
<span
class=
"field listing-sort"
>
<span
class=
"field listing-sort"
>
...
...
lms/templates/ux/reference/teams-create.html
View file @
6d6bfa7f
...
@@ -139,7 +139,16 @@ Create New Team | [Course name]
...
@@ -139,7 +139,16 @@ Create New Team | [Course name]
<p
class=
"page-description"
>
If you cannot find an existing team to join or would like to team up with a group of friends, create a new team.
</p>
<p
class=
"page-description"
>
If you cannot find an existing team to join or would like to team up with a group of friends, create a new team.
</p>
</div>
</div>
</header>
</header>
<div
class=
"wrapper-msg is-incontext urgency-low warning"
>
<div
class=
"msg"
>
<div
class=
"msg-content"
>
<h3
class=
"title"
>
Oops!
</h3>
<div
class=
"copy"
>
<p>
We couldn't create your team because something needs to be fixed below.
</p>
</div>
</div>
</div>
</div>
<div
class=
"page-content"
>
<div
class=
"page-content"
>
<form
class=
"create-team"
>
<form
class=
"create-team"
>
...
...
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