From f407d0e037711037c73798d47872345d107bf233 Mon Sep 17 00:00:00 2001 From: Seth Woodworth Date: Mon, 18 Mar 2013 17:31:04 -0400 Subject: [PATCH] 90% done with note list styling --- karmaworld/assets/css/global.css | 39 +++++++++++++++---- .../templates/courses/course_detail.html | 27 +++++-------- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css index dd401f2..823ea71 100644 --- a/karmaworld/assets/css/global.css +++ b/karmaworld/assets/css/global.css @@ -2,7 +2,12 @@ body { - font-family: "MuseoSlab-700"; + font-family: "MuseoSlab-300"; +} + +time +{ + font: 12px/2em "MuseoSlab-300"; } .half-padding @@ -69,10 +74,14 @@ header#global_header { color: #FFF; padding-top: 18px; - font-size: 12px; + font-size: 14px; cursor: pointer; padding-bottom: 16px; } +#login_container a +{ + float: right; +} #login_container.clicked { @@ -376,8 +385,8 @@ a.course_link, a.course_link:hover, a.school_link, a.school_link:hover, a.prof_l .activity_details_action, .activity_details_action a { - font-family: "MuseoSlab-500"; - font-size: 20px; + font-family: "MuseoSlab-300"; + font-size: 22px; line-height: 125%; } @@ -387,16 +396,20 @@ a.activity_actor, a.activity_actor:hover text-decoration: underline; } -a.activity_target, a.activity_target:hover +a.activity_target { - color: #9ccf00; + color: black; text-decoration: underline; } +a.activity_target:hover +{ + color: #f1592a; +} + .activity_details_context, .activity_details_context a { - font-family: "MuseoSlab-500"; - font-size: 14px; + font-size: 12px; line-height: 2em; } @@ -409,6 +422,8 @@ a.activity_target, a.activity_target:hover .activity_details_callout_copy { line-height: 125%; + font: 14px/1.4em "Georga", Serif; + font-style: italic; } .activity_details_status @@ -659,3 +674,11 @@ p.text a { } + +hr.midrule +{ + border: dotted black; + border-width: 1px 0 0; + width: 60px; + margin: 2em auto; +} diff --git a/karmaworld/templates/courses/course_detail.html b/karmaworld/templates/courses/course_detail.html index f9dd0ba..2538a52 100644 --- a/karmaworld/templates/courses/course_detail.html +++ b/karmaworld/templates/courses/course_detail.html @@ -107,40 +107,31 @@ {{ note.name }} -
- {{ note.uploaded_at|date:"gA" }} // {{ note.uploaded_at|date:"D M d o" }} -
- + {% if note.tags.count > 0 %}
Tags: {% for tag in note.tags.all %} {{ tag.name }} + {% if not forloop.last %}, {% endif %} {% endfor %}
{% endif %} -
-
-
- dashboard_activity_callout_icon_notebook -
-
- - {% if note.text %} - {{ note.text|slice:":500" }}… - {% else %} - {{ note.description }} - {% endif %} -
-
+
+ {{ note.text|slice:":500" }} …
+ +
+ {% endfor %} -- 2.25.1