Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-analytics-dashboard
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-analytics-dashboard
Commits
6610817c
Commit
6610817c
authored
Sep 12, 2016
by
Dennis Jen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaced learner analytics alert views with pattern library
parent
229d84d1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
71 deletions
+17
-71
analytics_dashboard/static/apps/learners/common/templates/alert.underscore
+15
-20
analytics_dashboard/static/apps/learners/common/views/alert-view.js
+2
-2
analytics_dashboard/static/sass/_config-variables.scss
+0
-5
analytics_dashboard/static/sass/_developer.scss
+0
-8
analytics_dashboard/static/sass/_mixins.scss
+0
-36
No files found.
analytics_dashboard/static/apps/learners/common/templates/alert.underscore
View file @
6610817c
<div class="row">
<div class="row">
<div class="col col-12 sm-col-12">
<div class="alert <%- containerClass %>" role="alert" aria-labelledby="alert-title-information" tabindex="-1">
<div class="col col-12 sm-col-12 <%- containerClass %>" role="alert">
<span class="icon alert-icon fa <%- iconClass %>" aria-hidden="true"></span>
<div class="col col-1 sm-col-1">
<span data-placement="top" class="fa <%- iconClass %> fa-3 alert" aria-hidden="true"></span>
<div class="alert-message">
</div>
<h3 class="alert-title" id="alert-title-information">
<div class="col col-11 sm-col-11">
<%- title %>
<div class="short-message">
</h3>
<%- title %>
<p class="alert-copy-with-title">
</div>
<% if (body) { %>
<% if (body) { %>
<div class="alert-body">
<%- body %>
<%- body %>
</div>
<% } %>
<% } %>
<% if (suggestions.length) { %>
<% if (suggestions.length) { %>
<div>
<ul class="suggestions">
<ul class="suggestions">
<% suggestions.map(function (suggestion) { %>
<% suggestions.map(function (suggestion) { %>
<li><%- suggestion %></li>
<li><%- suggestion %></li>
<% }); %>
<% }); %>
</ul>
</ul>
</div>
<% } %>
<% } %>
<% if (link) { %>
<% if (link) { %>
<div class="link">
<div class="link">
<a href="<%- link.url %>"><%- link.text %></a>
<a href="<%- link.url %>"><%- link.text %></a>
</div>
</div>
<% } %>
<% } %>
</
div
>
</
p
>
</div>
</div>
</div>
</div>
</div>
</div>
analytics_dashboard/static/apps/learners/common/views/alert-view.js
View file @
6610817c
...
@@ -19,11 +19,11 @@ define(function(require) {
...
@@ -19,11 +19,11 @@ define(function(require) {
alertTypes
:
{
alertTypes
:
{
error
:
{
error
:
{
iconClass
:
'fa-exclamation-triangle'
,
iconClass
:
'fa-exclamation-triangle'
,
containerClass
:
'alert-error
-container
'
containerClass
:
'alert-error'
},
},
info
:
{
info
:
{
iconClass
:
'fa-bullhorn'
,
iconClass
:
'fa-bullhorn'
,
containerClass
:
'alert-info
-container
'
containerClass
:
'alert-info
rmation
'
}
}
},
},
...
...
analytics_dashboard/static/sass/_config-variables.scss
View file @
6610817c
...
@@ -249,10 +249,5 @@ $footer-sock-height: $footer-height + $sock-height;
...
@@ -249,10 +249,5 @@ $footer-sock-height: $footer-height + $sock-height;
$description-border-color
:
$edx-gray-l1
;
$description-border-color
:
$edx-gray-l1
;
$description-border
:
1px
solid
$description-border-color
;
$description-border
:
1px
solid
$description-border-color
;
// alerts
$alert-background-color
:
rgb
(
242
,
242
,
242
);
$alert-error-color
:
rgb
(
195
,
53
,
59
);
$alert-info-color
:
rgb
(
111
,
160
,
186
);
// FontAwesome font directory
// FontAwesome font directory
$fa-font-path
:
"/static/bower_components/font-awesome/fonts"
;
$fa-font-path
:
"/static/bower_components/font-awesome/fonts"
;
analytics_dashboard/static/sass/_developer.scss
View file @
6610817c
...
@@ -103,14 +103,6 @@ button.chart-info {
...
@@ -103,14 +103,6 @@ button.chart-info {
}
}
}
}
.alert-error-container
{
// @include alert-container($alert-error-color);
}
.alert-info-container
{
// @include alert-container($alert-info-color);
}
.white-background
{
.white-background
{
background-color
:
white
;
background-color
:
white
;
}
}
...
...
analytics_dashboard/static/sass/_mixins.scss
View file @
6610817c
...
@@ -35,39 +35,3 @@
...
@@ -35,39 +35,3 @@
background-color
:
$navbar-default-link-disabled-bg
;
background-color
:
$navbar-default-link-disabled-bg
;
}
}
}
}
@mixin
alert-container
(
$alert-color
)
{
padding
:
$padding-large-horizontal
$padding-large-vertical
;
padding-bottom
:
(
$padding-large-horizontal
*
2
)
-
$padding-small-horizontal
;
margin-bottom
:
$padding-large-horizontal
*
2
;
background-color
:
$alert-background-color
;
border-top
:
4px
solid
$alert-color
;
i
.alert
{
color
:
$alert-color
;
font-size
:
$font-size-large
*
2
;
padding
:
0
;
}
.short-message
{
font-size
:
$font-size-large
;
font-weight
:
700
;
padding-bottom
:
$padding-small-horizontal
;
}
.alert-body
,
.link
{
padding-bottom
:
$padding-small-horizontal
;
}
// this keeps the gray borders from touching the top band at a 45 degree angle
&
:before
{
border
:
$description-border
;
border-top
:
none
;
content
:
""
;
position
:
absolute
;
bottom
:
0
;
top
:
0
;
left
:
0
;
right
:
0
;
}
}
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