Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui

2013-05-17 10:56:08 -04:00
parent a6c5e699ea 1f43fa163a
commit a32a740c39
2 changed files with 6 additions and 1 deletions
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -971,4 +971,9 @@ body.unit {
    @include transition(opacity 0.25s ease-in-out);
    opacity: 1;
  }
+}
+
+//hides latex compiler button if settings mode is-active
+div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{
+ display: none;
 }
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -138,7 +138,7 @@
          <h4 class="header">Unit Settings</h4>
          <div class="window-contents">
            <div class="row visibility">
-              <label class="inline-label">Visibility:</label>
+              <label class="inline-label">Visibility</label>
              <select class='visibility-select'>
                <option value="public">Public</option>
                <option value="private">Private</option>