From: Seth Woodworth <seth@sethish.com>
Date: Mon, 18 Mar 2013 17:19:44 +0000 (-0400)
Subject: include font-awesome from cdn and restyle upload button
X-Git-Tag: release-20150131~498^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=af7c9dfd67a05cc3701585c904dd511d39988e81;p=oweals%2Fkarmaworld.git

include font-awesome from cdn and restyle upload button
---

diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css
index 3f64bcd..dd401f2 100644
--- a/karmaworld/assets/css/global.css
+++ b/karmaworld/assets/css/global.css
@@ -453,20 +453,16 @@ a.activity_target, a.activity_target:hover
   text-transform: uppercase;
 }
 
-#upload_button_container
-{
-  height: 70px;
-  margin: 10px 0px;
-}
-
 #upload_button
 {
   height: 66px;
   margin: 1px;
-  font-family: "MuseoSlab-900";
-  font-size: 32px;
+  font-family: "MuseoSlab-300";
+  font-size: 30px;
   text-align: center;
   padding-top: 20px;
+  color: #f05a28;
+  text-transform: uppercase;
 }
 
 /* COPY */
diff --git a/karmaworld/templates/base.html b/karmaworld/templates/base.html
index f344cac..466bfba 100644
--- a/karmaworld/templates/base.html
+++ b/karmaworld/templates/base.html
@@ -11,6 +11,8 @@
   <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/lightbox.css">
   <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}ajaxuploader/css/fileuploader.css">
   <link rel="stylesheet" href="http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css">
+  <!-- include Font Awesome -->
+  <link href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" rel="stylesheet">
 
   <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
   <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
diff --git a/karmaworld/templates/courses/course_detail.html b/karmaworld/templates/courses/course_detail.html
index ef96dea..f9dd0ba 100644
--- a/karmaworld/templates/courses/course_detail.html
+++ b/karmaworld/templates/courses/course_detail.html
@@ -59,10 +59,8 @@
 
       <div class="row">
         <div class="three columns centered">
-          <div id="upload_button_container" class="button_bevel" >
-            <div id="upload_button" course="button_interior" data-id="{{ course.id }}" class="inverted_button">
-              upload
-            </div>
+          <div id="upload_button" data-id="{{ course.id }}">
+            <i class=icon-upload></i> add a note
           </div>
         </div>
       </div>