90% done with note list styling

diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css
index dd401f2e19bfad6a659693c28351e3e2f21efd44..823ea71685d6d54cbdd8625ee483d7a664b88b17 100644 (file)
--- 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 f9dd0ba4e3dd0ed7ec1fa5d7df9c1ca8fb652ad9..2538a5216364198456f04a75487730a3ffcfca29 100644 (file)
--- a/karmaworld/templates/courses/course_detail.html
+++ b/karmaworld/templates/courses/course_detail.html
@@ -107,40 +107,31 @@
                 <a href="{{ note.get_absolute_url }}" class="activity_target">{{ note.name }}</a>
               </div>
 
-              <div class="activity_timestamp"> <!-- TODO: use the <time> tag -->
-                {{ note.uploaded_at|date:"gA" }} // {{ note.uploaded_at|date:"D M d o" }}
-              </div>
-
+              <time datetime="{{ note.uploaded_at }}">
+                {{ note.uploaded_at|date:"l M d o" }}
+              </time>
 
               {% if note.tags.count > 0 %}
               <div class="activity_details_context">
                 Tags:
                   {% for tag in note.tags.all %}
                     {{ tag.name }}
+                    {% if not forloop.last %}, {% endif %}
                   {% endfor %}
               </div>
               {% endif %}
 
 
-              <div class="activity_details_callout">
-                <div class="row">
-                  <div class="one column">
-                    <img src="{{ STATIC_URL }}img/dashboard_activity_callout_icon_notebook.png" alt="dashboard_activity_callout_icon_notebook" width="44" height="44" />
-                  </div>
-                  <div class="eleven columns activity_details_callout_copy">
-
-                    {% if note.text %}
-                      {{ note.text|slice:":500" }}&hellip;
-                    {% else %}
-                      {{ note.description }}
-                    {% endif %}
-                  </div>
-                </div>
+              <div class="activity_details_callout_copy">
+                {{ note.text|slice:":500" }} &hellip;
               </div>
 
 
             </div><!-- /notes_result -->
           </div><!-- /notes_result_container -->
+
+          <hr class=midrule>
+
           {% endfor %}
         </div>
       </div>