Design tweaks

diff --git a/karmaworld/assets/css/home.css b/karmaworld/assets/css/home.css
index df069705e3728a2754bfccf6515375ac17796c24..b5426a5f7ed06921f796939c40568b366447d0b6 100644 (file)
--- a/karmaworld/assets/css/home.css
+++ b/karmaworld/assets/css/home.css
@@ -1,5 +1,5 @@
 #splash {
-  padding: 8% 5% 8% 5%;
+  padding: 4% 5% 4% 5%;
   color: #ffffff;
   text-align: center;
   font-size: 3.3em;

diff --git a/karmaworld/assets/css/note_course_pages.css b/karmaworld/assets/css/note_course_pages.css
index 999bad6ed3c169b56f08cc0c39bfc77d37e08770..cf9c33f528ff6357494a9fc3459dbe3994063155 100644 (file)
--- a/karmaworld/assets/css/note_course_pages.css
+++ b/karmaworld/assets/css/note_course_pages.css
@@ -82,7 +82,8 @@ div#note_header {
 }
 
 div.header-title-row {
-  margin: 10px 0 10px 0;
+  margin: 0 0 10px 0;
+  line-height: 1.5;
 }
 
 .header-title {

diff --git a/karmaworld/assets/js/note-detail.js b/karmaworld/assets/js/note-detail.js
index 81e3d7995ffade62e16f284b0dbf05782bc27a91..4fa08b7abc2ca6786490ee7286e1d7cd85e26429 100644 (file)
--- a/karmaworld/assets/js/note-detail.js
+++ b/karmaworld/assets/js/note-detail.js
@@ -131,7 +131,7 @@ function addForm(event) {
   keywordInput.focus();
 }
 
-$(function() {
+function initNoteContentPage() {
 
   $("#thank-button").click(function(event) {
     event.preventDefault();
@@ -273,7 +273,9 @@ $(function() {
       }
     });
   }
+}
 
+function initNoteKeywordsPage() {
   $('.definition').keydown(tabHandler);
   $('#add-row-btn').click(addForm);
 
@@ -288,6 +290,6 @@ $(function() {
     $('#keyword-form').toggle();
   });
 
-});
+}
 
 

diff --git a/karmaworld/templates/notes/note_detail.html b/karmaworld/templates/notes/note_detail.html
index caec759ffa7ccb13e5a73c27d47354a738bdd65f..c341d4bd7c05282a99f0732d283c0d2b85868912 100644 (file)
--- a/karmaworld/templates/notes/note_detail.html
+++ b/karmaworld/templates/notes/note_detail.html
@@ -36,9 +36,18 @@
     <script src="{{ STATIC_URL }}js/annotator-full.min.js"></script>
   {% endcompress %}
   <script>
-    $(function() {
-      $(document).foundation('joyride', 'start');
-    });
+    {% if show_note_container %}
+      $(function() {
+        $(document).foundation('joyride', 'start');
+        initNoteContentPage();
+      });
+    {% endif %}
+
+    {% if show_keywords %}
+      $(function() {
+        initNoteKeywordsPage();
+      });
+    {% endif %}
   </script>
 {% endblock %}