Commit df0973e7 by Frances Botsford

addressing review feedback

parent 2bf64d76
...@@ -145,7 +145,7 @@ function($, _, AbstractEditor, FileUpload, UploadDialog) { ...@@ -145,7 +145,7 @@ function($, _, AbstractEditor, FileUpload, UploadDialog) {
target = $(event.currentTarget), target = $(event.currentTarget),
lang = target.data('lang'), lang = target.data('lang'),
model = new FileUpload({ model = new FileUpload({
title: gettext('Upload translation.'), title: gettext('Upload translation'),
fileFormats: ['srt'] fileFormats: ['srt']
}), }),
view = new VideoUploadDialog({ view = new VideoUploadDialog({
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
text-align: left; text-align: left;
.modal-content { .modal-content {
position: relative;
box-shadow: 0 0 3px $shadow-d1; box-shadow: 0 0 3px $shadow-d1;
background-color: $white; background-color: $white;
padding: 5%; padding: 5%;
...@@ -106,6 +107,7 @@ ...@@ -106,6 +107,7 @@
// large modals - component editors and interactives // large modals - component editors and interactives
.modal-lg { .modal-lg {
width: 75%; width: 75%;
min-width: ($baseline*27.5);
height: auto; height: auto;
&.modal-editor { &.modal-editor {
...@@ -114,12 +116,12 @@ ...@@ -114,12 +116,12 @@
margin: ($baseline/4) ($baseline/2); margin: ($baseline/4) ($baseline/2);
.title { .title {
width: 48%; width: 47%;
display: inline-block; display: inline-block;
} }
.editor-modes { .editor-modes {
width: 49%; width: 48%;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
...@@ -173,7 +175,7 @@ ...@@ -173,7 +175,7 @@
.modal-window { .modal-window {
.CodeMirror { .CodeMirror {
height: 100%; height: 365px;
} }
.wrapper-comp-settings { .wrapper-comp-settings {
...@@ -205,29 +207,34 @@ ...@@ -205,29 +207,34 @@
left: 10% !important; left: 10% !important;
} }
.modal-content { .modal-header {
padding: 2%; margin: ($baseline/2) 2%;
.title { .title {
width: auto; width: auto;
margin: 0 0 ($baseline/4) 0;
} }
.editor-modes { .editor-modes {
display: none; display: none;
} }
}
input[type="file"] { .modal-content {
margin: $baseline 0; padding: 2%;
}
.message { .message {
margin: 0 0 $baseline 0; margin: 0 ($baseline/4) ($baseline/4) ($baseline/4);
} }
.modal-actions { input[type="file"] {
padding: ($baseline/2) 0; margin: 0;
} }
} }
.modal-actions {
padding: ($baseline/2) 0;
}
} }
} }
......
...@@ -61,6 +61,10 @@ ...@@ -61,6 +61,10 @@
margin: 0 ($baseline/4); margin: 0 ($baseline/4);
height: ($baseline*1.25); height: ($baseline*1.25);
width: $baseline; width: $baseline;
&:focus {
outline: 0;
}
} }
.action-view { .action-view {
......
...@@ -30,6 +30,8 @@ body.view-container { ...@@ -30,6 +30,8 @@ body.view-container {
.content-primary { .content-primary {
margin-right: flex-gutter(); margin-right: flex-gutter();
width: flex-grid(9,12); width: flex-grid(9,12);
box-shadow: none;
border: 0;
.no-container-content { .no-container-content {
@extend %ui-well; @extend %ui-well;
......
...@@ -1313,17 +1313,18 @@ body.unit { ...@@ -1313,17 +1313,18 @@ body.unit {
// ==================== // ====================
// Latex Compiler // Latex Compiler
.wrapper-comp-editor.latex-problem {
margin-top: ($baseline*2.5);
}
.launch-latex-compiler { .launch-latex-compiler {
position: absolute;
width: 100%;
top: 0;
background-color: $white; background-color: $white;
padding: $baseline/2 0 $baseline/2 $baseline; padding: $baseline/2 0 $baseline/2 $baseline;
border-bottom: 1px solid $gray-l2; 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 // hides latex compiler button if settings mode is-active
......
...@@ -293,7 +293,7 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v ...@@ -293,7 +293,7 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v
<input class="start-date date" type="text" name="start_date" value="" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/> <input class="start-date date" type="text" name="start_date" value="" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
</li> </li>
<li class="field field-start-time"> <li class="field field-start-time">
<label for="start_time">${_("Release Time")} (<abbr title="${_("Coordinated Universal Time")}">UTC</abbr>)</label> <label for="start_time">${_("Release Time")} in <abbr title="${_("Coordinated Universal Time")}">UTC</abbr></label>
<input class="start-time time" type="text" name="start_time" value="" placeholder="HH:MM" class="time" size='10' autocomplete="off"/> <input class="start-time time" type="text" name="start_time" value="" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
</li> </li>
</ul> </ul>
......
...@@ -48,7 +48,7 @@ require(["jquery", "jquery.leanModal", "codemirror/stex"], function($) { ...@@ -48,7 +48,7 @@ require(["jquery", "jquery.leanModal", "codemirror/stex"], function($) {
## cannot do this with css or it gets overwritten ## cannot do this with css or it gets overwritten
var editorH = $( window ).height() - 100; var editorH = $( window ).height() - 100;
var editorW = $( window ).innerWidth() - 70; 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 ## setup file input
## need to insert this only after hls triggered, because otherwise it ## need to insert this only after hls triggered, because otherwise it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment