Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

CLC-909 Design refinements #2

  • Loading branch information...
commit 5d7dd3e86a391a2f0ea704e2e54959d06f42408c 1 parent c6ba25b
@shacker authored
View
11 app/assets/stylesheets/calcentral.scss
@@ -11,9 +11,10 @@ $cc-nav-gradient1-color: #012955;
$cc-nav-gradient2-color: #3b5d86;
$cc-nav-link-color: #fdd692;
$cc-shadow-color: #ccc;
-$cc-widget-section-label-color: #232323;
+$cc-widget-section-label-color: #515151;
$cc-widget-highlight-background-color: #f2fef3;
-$cc-widget-more-background-color: #c8deea;
+$cc-widget-more-background-color: #f5f5f5;
+
/* Foundation button overrides */
.button.small {
@@ -280,7 +281,7 @@ a:hover {
.cc-widget-section-label {
clear: both;
color: $cc-widget-section-label-color;
- font-size: 1.2em;
+ font-size: 14px;
margin-top: 5px;
}
@@ -316,11 +317,11 @@ a:hover {
overflow: hidden;
&:hover {
cursor: pointer;
- background: #e3ffff;
+ background: #e5eded;
}
}
.cc-widget-list-selected {
- background: #c8deea;
+ background: $cc-widget-more-background-color;
.cc-widget-list-selected-title {
font-weight: bold;
}
View
14 app/assets/stylesheets/dashboard.scss
@@ -32,8 +32,8 @@
.cc-emitter-square {
border-radius: 4px;
- height: 16px;
- width: 16px;
+ height: 18px;
+ width: 18px;
}
// Emitter lozenge colors
@@ -56,6 +56,16 @@
.cc-emitter-campus-item {
background: image-url('icon_notifications_campus_16x16.png') no-repeat;
}
+ .cc-widget-section-label-due {
+ font-weight: bold;
+ margin-top: 5px;
+ text-align: right;
+ }
+ .cc-widget-tasks-notifications-date-string {
+ color: #999999;
+ text-align: right;
+ text-transform: uppercase;
+ }
}
/* Shared between mygroups and myclasses */
View
13 app/assets/stylesheets/notifications.scss
@@ -8,14 +8,9 @@
padding-left: 30px;
width: 270px;
}
- .cc-widget-notifications-date-string {
- color: #999999;
- text-align: right;
- text-transform: uppercase;
- }
.row {
- .cc-widget-tasks-notifications-text-column {
- font-size: 14px;
+ .cc-widget-notifications-text-column {
+ line-height: 1.4;
padding-left: 0;
}
.cc-emitter-square {
@@ -27,5 +22,9 @@
font-size: 11px;
padding-left: 0;
}
+ .cc-widget-notification-note-text {
+ font-size: 12px;
+ }
+
}
}
View
6 app/assets/stylesheets/tasks.scss
@@ -16,6 +16,12 @@
padding-left: 5px;
padding-right: 5px;
}
+ .cc-widget-task-note-text {
+ font-size: 14px;
+ }
+ .cc-widget-tasks-notifications-date-string {
+ font-size: 13px;
+ }
}
/* Mobile only */
View
9 app/views/templates/_dashboard.html
@@ -39,7 +39,10 @@
<div data-ng-switch-when="scheduled">
- <h3 class="cc-widget-section-label">Overdue</h3>
+ <div class="row">
+ <h3 class="ten columns cc-widget-section-label">Overdue</h3>
+ <div class="two columns cc-right cc-widget-section-label-due">Due</div>
+ </div>
<ul class="cc-widget-tasks-notifications-list cc-widget-section-bottom">
<li
data-ng-repeat="task in filtered = (tasks | filter:filterOverdue)"
@@ -151,7 +154,7 @@ <h3 class="cc-widget-section-label">Completed</h3>
{{notification.title}}
</div>
- <div class="three mobile-one columns cc-right cc-widget-notifications-date-string">
+ <div class="three mobile-one columns cc-right cc-widget-tasks-notifications-date-string">
{{notification.date_string}}
</div>
</div>
@@ -159,7 +162,7 @@ <h3 class="cc-widget-section-label">Completed</h3>
<div class="cc-widget-tasks-notifications-more" data-ng-show="notification.show">
<div class="row">
<div class="ten columns offset-by-two cc-widget-tasks-notifications-text-column">
- {{notification.summary}}
+ <span class="cc-widget-notification-note-text">{{notification.summary}}</span>
</div>
</div>
<div class="row">
View
12 app/views/templates/_dashboard_task_loop.html
@@ -13,7 +13,7 @@
data-ng-true-value="completed"
data-ng-false-value="needs_action"
data-ng-change="changeTaskState(task)"
- data-ng-show="task.emitter!='Canvas'"
+ data-ng-disabled="task.emitter=='Canvas'"
>
</div>
@@ -25,17 +25,19 @@
</div>
</div>
- <div class="two mobile-one columns cc-mobile-task-date-column cc-right" data-ng-show="this.$parent.section.title != 'Unscheduled'">
+ <div
+ class="two mobile-one columns cc-mobile-task-date-column cc-widget-tasks-notifications-date-string cc-right"
+ data-ng-show="this.$parent.section.title != 'Unscheduled'">
<span data-ng-show="task.bucket == 'Due Today'">TODAY</span>
- <span data-ng-show="task.due_date && task.bucket != 'Due Today'">{{task.due_date.epoch * 1000 | date:'d/yy'}}</span>
+ <span data-ng-show="task.due_date && task.bucket != 'Due Today'">{{task.due_date.epoch * 1000 | date:'MM/d'}}</span>
</div>
</div>
<div class="cc-widget-tasks-notifications-more" data-ng-show="task.show">
<div class="row">
<div class="eight columns offset-by-four cc-widget-tasks-notifications-text-column">
- <span data-ng-show="task.note">{{task.note}}</span>
- <span data-ng-show="!task.note">Details not available.</span>
+ <span data-ng-show="task.note" class="cc-widget-task-note-text">{{task.note}}</span>
+ <span data-ng-show="!task.note" class="cc-widget-task-note-text">Details not available.</span>
</div>
</div>
<div class="row">
Please sign in to comment.
Something went wrong with that request. Please try again.