From 42d4b4d69b1d968d4019006412d8c9075285dc84 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Mon, 21 Jan 2013 21:13:12 -0500
Subject: [PATCH] drupal integration - revised padding between content and
 footer globally, removed secondary form actions for time being

---
 lms/static/sass/base/_base.scss             | 5 +++--
 lms/static/sass/multicourse/_account.scss   | 2 +-
 lms/static/sass/multicourse/_dashboard.scss | 2 +-
 lms/templates/login.html                    | 4 ++--
 lms/templates/register.html                 | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index ca56f542d6..9663bc0589 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -81,9 +81,10 @@ a:link, a:visited {
 }
 
 .content-wrapper {
-  background: rgb(255,255,255);
-  margin: 0 auto 0;
   width: flex-grid(12);
+  margin: 0 auto;
+  padding-bottom: ($baseline*2);
+  background: rgb(255,255,255);  
 }
 
 .container {
diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss
index 15bda027e7..74e3b6fccb 100644
--- a/lms/static/sass/multicourse/_account.scss
+++ b/lms/static/sass/multicourse/_account.scss
@@ -77,7 +77,7 @@
   }
 
   aside {
-    margin: ($baseline*1.5) 0 0 0;
+    margin: 0;
     width: flex-grid(4);
     float: left;
   }
diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 4555a426d3..5e7f59138c 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -1,6 +1,6 @@
 .dashboard {
   @include clearfix;
-  padding: 60px 0px 120px;
+  padding: 60px 0 0 0;
 
   .dashboard-banner {
     background: $yellow;
diff --git a/lms/templates/login.html b/lms/templates/login.html
index 4e42bff83c..991e6e9b9b 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -94,9 +94,9 @@
       <div class="form-actions">
         <button name="submit" type="submit" id="submit" class="action action-primary action-update">Access My Courses</button>
         % if has_extauth_info is UNDEFINED:
-        <span class="wrapper wrapper-action action-secondary">
+        <!-- <span class="wrapper wrapper-action action-secondary">
           <a href="#" class="action action-register">Not enrolled? Register</a>
-        </span>
+        </span> -->
         % endif
       </div>
     </form>
diff --git a/lms/templates/register.html b/lms/templates/register.html
index dede7a8173..47caad404d 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -202,9 +202,9 @@
       <div class="form-actions">
         <button name="submit" type="submit" id="submit" class="action action-primary action-update">Register &amp; Create My Account</button>
         % if has_extauth_info is UNDEFINED:
-        <span class="wrapper wrapper-action action-secondary">
+        <!-- <span class="wrapper wrapper-action action-secondary">
           <a href="${reverse('login')}" class="action action-login">Already have an account? Login</a>
-        </span>
+        </span> -->
         % endif
       </div>
     </form>