Assorted design fixes

diff --git a/karmaworld/assets/css/dashboard.css b/karmaworld/assets/css/dashboard.css
index 78413ed69c802b7077ba4d58ed9cff0b9ffa1847..426172a45645e168e630fc28805a7a70eb93522c 100644 (file)
--- a/karmaworld/assets/css/dashboard.css
+++ b/karmaworld/assets/css/dashboard.css
@@ -1,3 +1,7 @@
+#dashboard_content {
+  padding-top: 10px;
+}
+
 #stats-container {
   margin: 20px 0 20px 0;
 }

diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css
index 12135296f8b6e30c6722691dad2d77a36e4493c8..601e76ad01b8083402ad6929ce908559eabea9af 100644 (file)
--- a/karmaworld/assets/css/global.css
+++ b/karmaworld/assets/css/global.css
@@ -2,6 +2,7 @@ body {
   font-family: 'adelle-sans';
   font-weight: lighter;
   word-wrap: break-word;
+  background: #333333;
 }
 
 .museo300 {
@@ -30,6 +31,11 @@ p {
   font-size: 1em;
 }
 
+#content-container {
+  background: #ffffff;
+  padding-bottom: 10px;
+}
+
 #main-header {
   background: #333333;
   color: #d4d4d4;
@@ -56,11 +62,13 @@ p {
 
 #global_footer {
   line-height: 1.5em;
-  padding: 20px 0 20px 0;
-  margin-top: 20px;
-  background: #333333;
   color: #d4d4d4;
   font-size: 0.8em;
+  padding: 20px 0 20px 0;
+}
+
+.footer-row {
+  margin-bottom: 10px;
 }
 
 label.inline-label
@@ -176,6 +184,10 @@ table.dataTable a {
   color: inherit;
 }
 
+.dataTables_paginate {
+  float: left;
+}
+
 .even {
   background-color: #fafafa !important;
   border-top: 1px solid #f0f0f0;
@@ -234,10 +246,6 @@ div.tabs-content {
   border-top: 1px solid #dfdfdf;
 }
 
-div.message-container {
-  margin: 20px 0 0 0;
-}
-
 ul.socialaccount_providers {
   list-style-type: none;
 }

diff --git a/karmaworld/assets/css/home.css b/karmaworld/assets/css/home.css
index 2e1afe59cc0d8f27a2f78099477fca2c93394e2c..df069705e3728a2754bfccf6515375ac17796c24 100644 (file)
--- a/karmaworld/assets/css/home.css
+++ b/karmaworld/assets/css/home.css
@@ -2,9 +2,10 @@
   padding: 8% 5% 8% 5%;
   color: #ffffff;
   text-align: center;
-  font-size: 3em;
+  font-size: 3.3em;
   background-size: cover;
   background-position: center center;
+  line-height: 1.5;
 }
 
 @media only screen and (max-width: 500px) {

diff --git a/karmaworld/assets/css/note_course_pages.css b/karmaworld/assets/css/note_course_pages.css
index 1d2f98e22d0d106a72bb6a405b1047b93f83cf41..999bad6ed3c169b56f08cc0c39bfc77d37e08770 100644 (file)
--- a/karmaworld/assets/css/note_course_pages.css
+++ b/karmaworld/assets/css/note_course_pages.css
@@ -15,7 +15,7 @@ div.header-byline {
 
 #course-header
 {
-  margin: 20px 0 0 0;
+  padding: 20px 0 0 0;
 }
 
 #end-header

diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py
index 0ab4d2fdc79c4461ea01b4515998eac82034aaaf..173ab0c46ad1bce259e624279c4160b2b6f7a532 100644 (file)
--- a/karmaworld/settings/common.py
+++ b/karmaworld/settings/common.py
@@ -292,6 +292,7 @@ SOCIALACCOUNT_AUTO_SIGNUP = False
 ACCOUNT_USER_DISPLAY = 'karmaworld.apps.users.models.user_display_name'
 ACCOUNT_SIGNUP_FORM_CLASS = 'karmaworld.apps.users.forms.SignupForm'
 ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https'
+LOGIN_REDIRECT_URL = '/'
 
 AUTH_PROFILE_MODULE = 'users.UserProfile'
 

diff --git a/karmaworld/templates/base.html b/karmaworld/templates/base.html
index 18aef97825234463945d057b66d16319161c62a5..57a0899a70ff7092bfe77adaf59343c2036ff202 100644 (file)
--- a/karmaworld/templates/base.html
+++ b/karmaworld/templates/base.html
@@ -33,10 +33,12 @@
   {% include 'header.html' %}
   <!-- end include header -->
 
-  <!-- block content -->
-  {% block raw_content %}
-  {% endblock %}
-  <!-- end block content -->
+  <div id="content-container">
+    <!-- block content -->
+    {% block raw_content %}
+    {% endblock %}
+    <!-- end block content -->
+  </div>
 
   <!-- include footer-->
   {% include 'footer.html' %}
@@ -70,7 +72,7 @@
   {% block pagescripts %}
   {% endblock %}
   <!-- end block pagescripts -->
-  
+
   {% include 'partial/trackers.html' %}
 
 </body>

diff --git a/karmaworld/templates/footer.html b/karmaworld/templates/footer.html
index f07d114e77061beb2acb99e5b7f63af37eba9a39..480093a234a7f15cbf0a9151f74fc1014a5f8965 100644 (file)
--- a/karmaworld/templates/footer.html
+++ b/karmaworld/templates/footer.html
@@ -2,20 +2,31 @@
 
 <footer id="global_footer" class="underline inherit-color">
   <div class="row">
-    <div id="footer-links-container" class="small-12 columns">
-      <a href="{% url 'about' %}">About</a>&nbsp;|&nbsp;<a href="{% url 'terms' %}">Terms</a>&nbsp;|&nbsp;<a href="https://github.com/FinalsClub/karmaworld">Code</a>&nbsp;|&nbsp;<a href="http://www.reddit.com/r/KarmaNotes/">Discussion</a>&nbsp;<!--|&nbsp;<a href="#">Donate</a>-->
-    </div><!--/footer_links_container-->
+    <div class="small-12 columns text-center footer-row">
+      <img src="{{ STATIC_URL }}img/global_header_logo.png" alt="KarmaNotes" />
+    </div>
   </div>
-  
+
+  <div class="row">
+    <div class="small-12 columns text-center footer-row museo700">
+      <a href="{% url 'about' %}">About</a>&nbsp;&nbsp;&bull;&nbsp;&nbsp;
+      <a href="{% url 'terms' %}">Terms</a>&nbsp;&nbsp;&bull;&nbsp;&nbsp;
+      <a href="https://github.com/FinalsClub/karmaworld">Code</a>&nbsp;&nbsp;&bull;&nbsp;&nbsp;
+      <a href="http://www.reddit.com/r/KarmaNotes/">Discussion</a>
+    </div>
+  </div>
+
   <div class="row">
-    <div id="colophon">
-      <div class="small-2 columns large-1">
-        <img src="{{ STATIC_URL }}img/global_footer_cc_logo.png" id="cc_logo" alt="global_footer_cc_logo" width="30" height="30" align="left"/>
-      </div>
-      <div class="small-10 columns end">
-        Unless otherwise noted, all content on this site is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons</a> Attribution-ShareAlike 3.0 Unported License.<br>
+    <div class="small-12 columns text-center footer-row">
+      Unless otherwise noted, all content on this site is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons</a> Attribution-ShareAlike 3.0 Unported License.<br>
         <a href="/">KarmaNotes.org</a> is a non-profit project brought to you by the <a href="http://finalsclub.org">Finals Club Foundation</a>.
-      </div>
-    </div><!--/colophon-->
+    </div>
   </div>
+
+  <div class="row">
+    <div class="small-12 columns text-center footer-row">
+      <img src="{{ STATIC_URL }}img/global_footer_cc_logo.png" alt="Creative Commons"/>
+    </div>
+  </div>
+
 </footer><!--/global footer-->

diff --git a/karmaworld/templates/notes/note_detail.html b/karmaworld/templates/notes/note_detail.html
index 5a951dac7fd5dd528570f6d18fd1fdd34e907c21..e2e11b7d64b8918c1cc4421894a6e16a3c8091d8 100644 (file)
--- a/karmaworld/templates/notes/note_detail.html
+++ b/karmaworld/templates/notes/note_detail.html
@@ -101,19 +101,19 @@
                   <button id="flag-button-disabled" class="modify-button disabled opentip"
                           data-ot="You've already reported this note"
                            {% include 'partial/opentip_settings.html' %}>
-                    <i class="fa fa-thumbs-up"></i> Report Note</button>
+                    <i class="fa fa-flag"></i> Report Note</button>
                 {% else %}
-                  <button id="flag-button" class="modify-button"><i class="fa fa-thumbs-up"></i> Report Note</button>
+                  <button id="flag-button" class="modify-button"><i class="fa fa-flag"></i> Report Note</button>
                   <button id="flag-button-disabled" class="modify-button disabled opentip hide"
                           data-ot="You've already reported this note"
                            {% include 'partial/opentip_settings.html' %}>
-                    <i class="fa fa-thumbs-up"></i> Report Note</button>
+                    <i class="fa fa-flag"></i> Report Note</button>
                 {% endif %}
               {% else %}
                 <button id="flag-button-disabled" class="modify-button disabled opentip"
                           data-ot="Log in to report this note"
                            {% include 'partial/opentip_settings.html' %}>
-                    <i class="fa fa-thumbs-up"></i> Report Note</button>
+                    <i class="fa fa-flag"></i> Report Note</button>
               {% endif %}
 
               {% if user.is_authenticated %}