From e3c646492c1147f74fec0e9df45f58f1c9fe892e Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 27 Mar 2013 01:39:24 -0400
Subject: [PATCH 1/4] studio - made provide feedback conditional for logged in
 users

---
 cms/templates/widgets/footer.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html
index a3674cfe20..c0cf8f73a6 100644
--- a/cms/templates/widgets/footer.html
+++ b/cms/templates/widgets/footer.html
@@ -18,9 +18,11 @@
         <li class="nav-item nav-peripheral-help">
           <a href="http://help.edge.edx.org/" rel="external">edX Studio Help</a>
         </li>
+        % if user.is_authenticated():
         <li class="nav-item nav-peripheral-feedback">
           <a class="show-tender" href="http://help.edge.edx.org/discussion/new" title="Use our feedback tool, Tender, to share your feedback">Provide Feedback</a>
-        </li>        
+        </li>
+        % endif        
         <li class="nav-item nav-peripheral-contact">
           <a href="https://www.edx.org/contact" rel="external">Contact edX</a>
         </li>

From 754e30240d7c62c7efd80c38d552c4d168d23262 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 27 Mar 2013 11:01:25 -0400
Subject: [PATCH 2/4] studio - adjusting tender widget window height based on
 field removal

---
 cms/static/sass/elements/_tender-widget.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cms/static/sass/elements/_tender-widget.scss b/cms/static/sass/elements/_tender-widget.scss
index 146d5b4111..478489d0e8 100644
--- a/cms/static/sass/elements/_tender-widget.scss
+++ b/cms/static/sass/elements/_tender-widget.scss
@@ -9,6 +9,7 @@
 #tender_window {
   @include border-radius(3px);
   @include box-shadow(0 2px 3px $shadow);
+  height: 650px !important;
   background: $white !important;
   border: 1px solid $gray;
 }
@@ -72,7 +73,7 @@
 
 .widget-layout .flash {
   margin: -10px 0 15px 0;
-  padding: 5px 10px !important;
+  padding: 10px 20px !important;
   background-image: none !important;
 }
 

From 3a4bdf19fb6733dae57b557223481601dbbe8efb Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 27 Mar 2013 12:26:49 -0400
Subject: [PATCH 3/4] studio - tweaking footer navigation for tender widget
 label

---
 cms/templates/widgets/footer.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html
index c0cf8f73a6..c5fc81957f 100644
--- a/cms/templates/widgets/footer.html
+++ b/cms/templates/widgets/footer.html
@@ -20,12 +20,9 @@
         </li>
         % if user.is_authenticated():
         <li class="nav-item nav-peripheral-feedback">
-          <a class="show-tender" href="http://help.edge.edx.org/discussion/new" title="Use our feedback tool, Tender, to share your feedback">Provide Feedback</a>
-        </li>
-        % endif        
-        <li class="nav-item nav-peripheral-contact">
-          <a href="https://www.edx.org/contact" rel="external">Contact edX</a>
+          <a class="show-tender" href="http://help.edge.edx.org/discussion/new" title="Use our feedback tool, Tender, to share your feedback">Contact Us</a>
         </li>
+        % endif
       </ol>
     </nav>
   </footer>

From bc248a1d4a0ff63d504c09df4adb5c6de2aeee90 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 28 Mar 2013 12:47:08 -0400
Subject: [PATCH 4/4] studio - tender widget: revised styling with spam
 protection back in place

---
 cms/static/sass/elements/_tender-widget.scss | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/cms/static/sass/elements/_tender-widget.scss b/cms/static/sass/elements/_tender-widget.scss
index 478489d0e8..b4113732f0 100644
--- a/cms/static/sass/elements/_tender-widget.scss
+++ b/cms/static/sass/elements/_tender-widget.scss
@@ -9,7 +9,7 @@
 #tender_window {
   @include border-radius(3px);
   @include box-shadow(0 2px 3px $shadow);
-  height: 650px !important;
+  height: ($baseline*35) !important;
   background: $white !important;
   border: 1px solid $gray;
 }
@@ -24,8 +24,6 @@
 
 #tender_closer {
   color: $blue-l2 !important;
-  margin-top: 10px;
-  margin-right: 5px;
   text-transform: uppercase;
 
   &:hover {
@@ -53,7 +51,7 @@
 
 .widget-layout .header {
   background: rgb(85, 151, 221);
-  padding: 20px;
+  padding: 10px 20px;
 }
 
 .widget-layout h1, .widget-layout h2, .widget-layout h3, .widget-layout h4, .widget-layout h5, .widget-layout h6, .widget-layout label {
@@ -61,8 +59,7 @@
 }
 
 .widget-layout .header h1 {
-  font-weight: 500;
-  font-size: 24px;
+  font-size: 22px;
 }
 
 .widget-layout .content {
@@ -195,9 +192,14 @@
   display: block !important;
 }
 
+.widget-layout dl#brain_buster_captcha #captcha_answer {
+  border-color: #333;
+}
+
 .widget-layout dl#brain_buster_captcha dd label {
   display: block;
-  margin: 0 15px 0 0 !important;
+  font-weight: 700;
+  margin: 0 15px 5px 0 !important;
 }
 
 .widget-layout dl#brain_buster_captcha dd #captcha_answer {