From a17bf5e2ceafdc96fe85ad90a6a39bfc6655329e Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 11 Jun 2013 17:07:59 -0400
Subject: [PATCH 1/5] resolves height issue when display the check and show
 answer actions alongside problems

---
 common/lib/xmodule/xmodule/css/capa/display.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index bd131a9ff6..5dc0bdb171 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -555,10 +555,14 @@ section.problem {
       @extend .blue-button;
     }
 
+    input.check {
+      height: ($baseline*2);
+    }
+
     button.show {
       height: ($baseline*2);
 
-      span {
+      .show-label {
         font-size: 1.0em;
         font-weight: 600;
       }

From 664efb988756aa2c1a6080f5f29c246c4e7b891b Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 11 Jun 2013 17:10:38 -0400
Subject: [PATCH 2/5] removes HTML elemements from problem action Sass
 selectors

---
 common/lib/xmodule/xmodule/css/capa/display.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 5dc0bdb171..c9f300c966 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -555,11 +555,11 @@ section.problem {
       @extend .blue-button;
     }
 
-    input.check {
+    .check {
       height: ($baseline*2);
     }
 
-    button.show {
+    .show {
       height: ($baseline*2);
 
       .show-label {

From 050846af711ca3c86c7a309322c1db0f31973f84 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 12 Jun 2013 10:12:20 -0400
Subject: [PATCH 3/5] abstracts height rule to apply to the capa check, show,
 save actions

---
 common/lib/xmodule/xmodule/css/capa/display.scss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index c9f300c966..6c61d6dd77 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -551,16 +551,16 @@ section.problem {
   section.action {
     margin-top: 20px;
 
-    input.save {
+    .save, .check, .show {
+      height: ($baseline*2);
+      font-weight: 600;
+    }
+
+    .save {
       @extend .blue-button;
     }
 
-    .check {
-      height: ($baseline*2);
-    }
-
     .show {
-      height: ($baseline*2);
 
       .show-label {
         font-size: 1.0em;

From 832da3ad48b4e869e369be014c30f71732000679 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 12 Jun 2013 11:00:15 -0400
Subject: [PATCH 4/5] syncs styling rules for buttons/inputs to ensure
 consistency

---
 cms/static/sass/_base.scss                       | 2 +-
 common/lib/xmodule/xmodule/css/capa/display.scss | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index e0e7543b8e..3713f83ae3 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -14,7 +14,7 @@ body {
   color: $gray-d2;
 }
 
-body, input {
+body, input, button {
   font-family: 'Open Sans', sans-serif;
 }
 
diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 6c61d6dd77..a46dec8d2f 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -553,7 +553,8 @@ section.problem {
 
     .save, .check, .show {
       height: ($baseline*2);
-      font-weight: 600;
+      font-weight: 500;
+      vertical-align: middle;
     }
 
     .save {
@@ -564,7 +565,7 @@ section.problem {
 
       .show-label {
         font-size: 1.0em;
-        font-weight: 600;
+        font-weight: 500;
       }
     }
 

From 14100ba14c8323e61f60775cee7b7d64dc186a45 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 12 Jun 2013 11:04:12 -0400
Subject: [PATCH 5/5] syncs up font-weight across problem button/input actions

---
 common/lib/xmodule/xmodule/css/capa/display.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index a46dec8d2f..819499cbe5 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -553,7 +553,7 @@ section.problem {
 
     .save, .check, .show {
       height: ($baseline*2);
-      font-weight: 500;
+      font-weight: 600;
       vertical-align: middle;
     }
 
@@ -565,7 +565,7 @@ section.problem {
 
       .show-label {
         font-size: 1.0em;
-        font-weight: 500;
+        font-weight: 600;
       }
     }