diff --git a/cms/static/js/views/video/translations_editor.js b/cms/static/js/views/video/translations_editor.js index d2fc79c6e7..75e2a01c39 100644 --- a/cms/static/js/views/video/translations_editor.js +++ b/cms/static/js/views/video/translations_editor.js @@ -145,7 +145,7 @@ function($, _, AbstractEditor, FileUpload, UploadDialog) { target = $(event.currentTarget), lang = target.data('lang'), model = new FileUpload({ - title: gettext('Upload translation.'), + title: gettext('Upload translation'), fileFormats: ['srt'] }), view = new VideoUploadDialog({ diff --git a/cms/static/sass/elements/_modal-window.scss b/cms/static/sass/elements/_modal-window.scss index 7efff97f7a..9c0645fa95 100644 --- a/cms/static/sass/elements/_modal-window.scss +++ b/cms/static/sass/elements/_modal-window.scss @@ -17,6 +17,7 @@ text-align: left; .modal-content { + position: relative; box-shadow: 0 0 3px $shadow-d1; background-color: $white; padding: 5%; @@ -106,6 +107,7 @@ // large modals - component editors and interactives .modal-lg { width: 75%; + min-width: ($baseline*27.5); height: auto; &.modal-editor { @@ -114,12 +116,12 @@ margin: ($baseline/4) ($baseline/2); .title { - width: 48%; + width: 47%; display: inline-block; } .editor-modes { - width: 49%; + width: 48%; display: inline-block; text-align: right; @@ -173,7 +175,7 @@ .modal-window { .CodeMirror { - height: 100%; + height: 365px; } .wrapper-comp-settings { @@ -205,29 +207,34 @@ left: 10% !important; } - .modal-content { - padding: 2%; + .modal-header { + margin: ($baseline/2) 2%; .title { width: auto; + margin: 0 0 ($baseline/4) 0; } .editor-modes { display: none; } + } - input[type="file"] { - margin: $baseline 0; - } + .modal-content { + padding: 2%; .message { - margin: 0 0 $baseline 0; + margin: 0 ($baseline/4) ($baseline/4) ($baseline/4); } - .modal-actions { - padding: ($baseline/2) 0; + input[type="file"] { + margin: 0; } } + + .modal-actions { + padding: ($baseline/2) 0; + } } } diff --git a/cms/static/sass/elements/_xblocks.scss b/cms/static/sass/elements/_xblocks.scss index 5306e3e928..38157c8aa0 100644 --- a/cms/static/sass/elements/_xblocks.scss +++ b/cms/static/sass/elements/_xblocks.scss @@ -61,6 +61,10 @@ margin: 0 ($baseline/4); height: ($baseline*1.25); width: $baseline; + + &:focus { + outline: 0; + } } .action-view { diff --git a/cms/static/sass/views/_container.scss b/cms/static/sass/views/_container.scss index 1275bcac0e..a6a9147b87 100644 --- a/cms/static/sass/views/_container.scss +++ b/cms/static/sass/views/_container.scss @@ -30,6 +30,8 @@ body.view-container { .content-primary { margin-right: flex-gutter(); width: flex-grid(9,12); + box-shadow: none; + border: 0; .no-container-content { @extend %ui-well; diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 6a3a7582ef..e2ff0a5b62 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -1313,17 +1313,18 @@ body.unit { // ==================== // Latex Compiler + +.wrapper-comp-editor.latex-problem { + margin-top: ($baseline*2.5); +} + .launch-latex-compiler { + position: absolute; + width: 100%; + top: 0; background-color: $white; padding: $baseline/2 0 $baseline/2 $baseline; border-bottom: 1px solid $gray-l2; - opacity: 0.8; - - - &:hover { - @include transition(opacity $tmg-f2 ease-in-out 0s); - opacity: 1.0s; - } } // hides latex compiler button if settings mode is-active diff --git a/cms/templates/overview.html b/cms/templates/overview.html index 68dd966a14..7e9fa5f8c5 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -293,7 +293,7 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v
  • - +
  • diff --git a/cms/templates/widgets/source-edit.html b/cms/templates/widgets/source-edit.html index fda097063b..30d0aaee2f 100644 --- a/cms/templates/widgets/source-edit.html +++ b/cms/templates/widgets/source-edit.html @@ -48,7 +48,7 @@ require(["jquery", "jquery.leanModal", "codemirror/stex"], function($) { ## cannot do this with css or it gets overwritten var editorH = $( window ).height() - 100; var editorW = $( window ).innerWidth() - 70; - hlsmodal.attr('style', function(i,s) { return s + 'margin: 2% 0 0 10% !important; left:0; height:' + editorH + 'px;'}); + hlsmodal.attr('style', function(i,s) { return s + 'margin: 2% 0 0 10% !important; left:10%; height:' + editorH + 'px;'}); ## setup file input ## need to insert this only after hls triggered, because otherwise it