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

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

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;
 }
\ No newline at end of file

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>