Merge pull request #136 from edx/fix/btalbot/xmodule-showanswer

Problem Show Answer/Check Button Line Height Syncing
2013-06-12 08:56:08 -07:00
parent b11e748341 14100ba14c
commit e641d2c6b5
2 changed files with 10 additions and 5 deletions
--- 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;
 }

--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -551,14 +551,19 @@ section.problem {
  section.action {
    margin-top: 20px;

-    input.save {
+    .save, .check, .show {
+      height: ($baseline*2);
+      font-weight: 600;
+      vertical-align: middle;
+    }
+
+    .save {
      @extend .blue-button;
    }

-    button.show {
-      height: ($baseline*2);
+    .show {

-      span {
+      .show-label {
        font-size: 1.0em;
        font-weight: 600;
      }