From c363acb73e6f8cdf805e9fdf7a77c69016bc007a Mon Sep 17 00:00:00 2001 From: Taka Date: Thu, 23 Jun 2022 07:20:03 +1000 Subject: [PATCH] Added more padding to dialogs. --- vasl_templates/main_window.py | 2 +- .../webapp/static/css/edit-vo-dialog.css | 2 +- .../webapp/static/css/lfa-upload.css | 3 +- vasl_templates/webapp/static/css/main.css | 4 +-- .../static/css/scenario-downloads-dialog.css | 2 +- .../static/css/scenario-search-dialog.css | 8 ++--- .../css/select-roar-scenario-dialog.css | 4 +-- .../webapp/static/css/select-vo-dialog.css | 2 +- .../static/css/user-settings-dialog.css | 4 +-- .../webapp/static/css/vassal-shim.css | 7 ++++- vasl_templates/webapp/static/scenarios.js | 8 ++--- vasl_templates/webapp/static/turn_track.js | 8 ++--- vasl_templates/webapp/static/user_settings.js | 1 - vasl_templates/webapp/static/vassal.js | 2 +- .../webapp/templates/tabs-scenario.html | 8 ++--- .../templates/user-settings-dialog.html | 31 ++++++++++++------- 16 files changed, 55 insertions(+), 41 deletions(-) diff --git a/vasl_templates/main_window.py b/vasl_templates/main_window.py index d3fba29..65a3a8b 100644 --- a/vasl_templates/main_window.py +++ b/vasl_templates/main_window.py @@ -94,7 +94,7 @@ class MainWindow( QWidget ): self.restoreGeometry( val ) else : self.resize( 1000, 650 ) - self.setMinimumSize( 1000, 620 ) + self.setMinimumSize( 1000, 630 ) # initialize the layout layout = QVBoxLayout( self ) diff --git a/vasl_templates/webapp/static/css/edit-vo-dialog.css b/vasl_templates/webapp/static/css/edit-vo-dialog.css index c669147..62cb714 100644 --- a/vasl_templates/webapp/static/css/edit-vo-dialog.css +++ b/vasl_templates/webapp/static/css/edit-vo-dialog.css @@ -1,4 +1,4 @@ -.ui-dialog.edit-vo .ui-dialog-content { overflow: hidden ; display: flex ; flex-direction: column ; } +.ui-dialog.edit-vo .ui-dialog-content { overflow: hidden ; display: flex ; flex-direction: column ; padding-bottom: 0.5em !important ; } .ui-dialog.edit-vo .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } .ui-dialog.edit-vo .header { display: flex ; align-items: center ; margin-bottom: 0.5em ; } diff --git a/vasl_templates/webapp/static/css/lfa-upload.css b/vasl_templates/webapp/static/css/lfa-upload.css index 93ce38b..c62be36 100644 --- a/vasl_templates/webapp/static/css/lfa-upload.css +++ b/vasl_templates/webapp/static/css/lfa-upload.css @@ -1,4 +1,5 @@ .ui-dialog.lfa-upload .ui-dialog-titlebar { background: #e0c090 ; } +.ui-dialog.lfa-upload .ui-dialog-content { padding-bottom: 0.75em !important ; } .ui-dialog.lfa-upload .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } .ui-dialog.lfa-upload .ui-dialog-buttonpane button.add { display: inline-flex ; align-items: center ; margin-left: 0 !important ; height: 25px ; padding: 2px 8px 2px 6px ; } .ui-dialog.lfa-upload .ui-dialog-buttonpane button.add img { height: 15px ; margin-right: 0.5em ; } @@ -8,7 +9,7 @@ } #lfa-upload .files { - width: 100% ; height: 99% ; + width: calc(100% - 2px) ; height: 99% ; margin: 0 ; border: 1px solid #ccc ; border-radius: 2px ; overflow-x: hidden ; diff --git a/vasl_templates/webapp/static/css/main.css b/vasl_templates/webapp/static/css/main.css index 22b7a83..7b41066 100644 --- a/vasl_templates/webapp/static/css/main.css +++ b/vasl_templates/webapp/static/css/main.css @@ -43,9 +43,9 @@ button.edit-template img { height: 18px ; vertical-align: middle ; margin-right: .ui-dialog-titlebar { padding: 0.2em 0.5em 0.2em 0.5em !important ; } .ui-dialog-titlebar img.flag { height: 0.9em ; margin: -2px 0.25em 0 0 ; } .ui-dialog-titlebar-close { margin-top: -10px !important ; } -.ui-dialog-content { padding: 0.5em !important ; } +.ui-dialog-content { padding: 1em !important ; } .ui-dialog-content p { margin-bottom: 0.5em ; } -.ui-dialog-buttonpane { margin: 0.25em 0 !important ; padding: 0.5em 0.5em 0.25em 0.5em !important ; } +.ui-dialog-buttonpane { margin: 0.5em !important ; padding: 0.75em 0.5em 0.4em 0.5em !important ; } .ui-dialog-buttonpane button { margin: 0 0 0 5px !important ; padding: 0.1em 0.5em ; } .ui-dialog-buttonpane button.ok { background: #ddd ; } .ui-dialog-buttonpane button.ok:hover { background: #ccc ; } diff --git a/vasl_templates/webapp/static/css/scenario-downloads-dialog.css b/vasl_templates/webapp/static/css/scenario-downloads-dialog.css index 21c917c..a2196ef 100644 --- a/vasl_templates/webapp/static/css/scenario-downloads-dialog.css +++ b/vasl_templates/webapp/static/css/scenario-downloads-dialog.css @@ -1,5 +1,5 @@ .ui-dialog.scenario-downloads { border-radius: 5px ; } -.ui-dialog.scenario-downloads .ui-dialog-titlebar { background: none ; border: none ; cursor: auto ; } +.ui-dialog.scenario-downloads .ui-dialog-titlebar { background: none ; border: none ; padding: 0.5em 1em 0.2em 1em !important ; cursor: auto ; } .ui-dialog.scenario-downloads .ui-dialog-titlebar-close { display: none; } #scenario-downloads-dialog { padding-top: 0 !important ; } diff --git a/vasl_templates/webapp/static/css/scenario-search-dialog.css b/vasl_templates/webapp/static/css/scenario-search-dialog.css index a0e2696..f56c637 100644 --- a/vasl_templates/webapp/static/css/scenario-search-dialog.css +++ b/vasl_templates/webapp/static/css/scenario-search-dialog.css @@ -1,9 +1,9 @@ /* jQuery dialog */ .ui-dialog.scenario-search .ui-dialog-titlebar { background: #e0e0a0 ; } #scenario-search { display: flex ; } -#scenario-search .left { min-width: 300px ; display: flex ; flex-direction: column ; } +#scenario-search .left { min-width: 300px ; display: flex ; flex-direction: column ; padding-right: 5px ; } #scenario-search .left .scenarios { flex: 1 ; } -#scenario-search .right { min-width: 400px ; flex: 1 ; display: flex ; flex-direction: column ; } +#scenario-search .right { min-width: 400px ; flex: 1 ; display: flex ; flex-direction: column ; padding-left: 5px ; } #scenario-search .scenario-card { flex: 1 ; overflow-y: hidden ; } /* splitter */ @@ -11,7 +11,7 @@ #scenario-search .gutter img { position: absolute ; top: 45% ; left: -2px ; } /* search control */ -#scenario-search .select2-container { top: 10px !important ; } +#scenario-search .select2-container { top: 1em !important ; left: 1em !important ; } #scenario-search .select2-selection { display: none ; } #scenario-search .select2-dropdown { border: none ; } #scenario-search .select2-search--dropdown { padding: 0 0 0.5em 0 ; } @@ -51,7 +51,7 @@ #scenario-search .footer a:focus { outline: 0 ; } /* import control */ -#scenario-search .import-control { margin-top: 0.5em ; padding-top: 0.25em ; border-top: 1px dotted #666 ; } +#scenario-search .import-control { margin-top: 0.5em ; padding-top: 0.5em ; border-top: 1px dotted #666 ; } #scenario-search .import-control .buttons button { float: right ; margin-left: 0.5em ; padding: 0.1em 0.5em ; } #scenario-search .import-control .buttons button.import { height: 2em ; display: flex ; align-items: center ; } #scenario-search .import-control .buttons button.import img { height: 1em ; margin-right: 0.5em ; } diff --git a/vasl_templates/webapp/static/css/select-roar-scenario-dialog.css b/vasl_templates/webapp/static/css/select-roar-scenario-dialog.css index b42ee13..88149b1 100644 --- a/vasl_templates/webapp/static/css/select-roar-scenario-dialog.css +++ b/vasl_templates/webapp/static/css/select-roar-scenario-dialog.css @@ -1,6 +1,6 @@ .ui-dialog.select-roar-scenario .ui-dialog-titlebar { background: #f0f0c0 ; border: 1px solid #c0c0a0 ; } -.ui-dialog.select-roar-scenario .ui-dialog-content { padding-top: 0 !important ; } -.ui-dialog.select-roar-scenario .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } +.ui-dialog.select-roar-scenario .ui-dialog-content { padding-top: 0.5em !important ; padding-bottom: 0 !important ; } +.ui-dialog.select-roar-scenario .ui-dialog-buttonpane { border: none ; padding-top: 0 !important ; } #select-roar-scenario { overflow: hidden ; } #select-roar-scenario .header { height: 1.75em ; margin-top: 0.25em ; font-size: 80% ; } diff --git a/vasl_templates/webapp/static/css/select-vo-dialog.css b/vasl_templates/webapp/static/css/select-vo-dialog.css index b88a6f2..5a724ed 100644 --- a/vasl_templates/webapp/static/css/select-vo-dialog.css +++ b/vasl_templates/webapp/static/css/select-vo-dialog.css @@ -1,5 +1,5 @@ #select-vo { overflow: hidden ; } -.ui-dialog.select-vo .ui-dialog-content { padding-top: 0 !important ; } +.ui-dialog.select-vo .ui-dialog-content { padding: 0.5em 1em !important ; } .ui-dialog.select-vo .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } #select-vo .header { height: 1.75em ; margin-top: 0.25em ; font-size: 80% ; } diff --git a/vasl_templates/webapp/static/css/user-settings-dialog.css b/vasl_templates/webapp/static/css/user-settings-dialog.css index 0694f82..709eaaf 100644 --- a/vasl_templates/webapp/static/css/user-settings-dialog.css +++ b/vasl_templates/webapp/static/css/user-settings-dialog.css @@ -1,7 +1,7 @@ .ui-dialog.user-settings .ui-dialog-titlebar { background: #80d0ff ; } .ui-dialog.user-settings .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } -.ui-dialog.user-settings .row { height: 1.5em ; } +.ui-dialog.user-settings .row { height: 1.4em ; } .ui-dialog.user-settings .row label { height: 20px ; margin-top: 2px ; } .ui-dialog.user-settings fieldset { margin: 0.5em 0 0 0 ; padding-top: 0.5em ; border-radius: 0 ; } .ui-dialog.user-settings .select2 { margin-top: -4px ; } @@ -10,5 +10,5 @@ .ui-dialog.user-settings .inactive .select2-selection__rendered { color: #888 !important ; } .ui-dialog.user-settings img.need-localhost { display: inline-block ; height: 0.75em ; } -.ui-dialog.user-settings div.need-localhost { float: left ; width: 290px ; font-size: 80% ; font-style: italic ; color: #c02020 ; } +.ui-dialog.user-settings div.need-localhost { float: left ; margin-top: -5px ; width: 290px ; font-size: 80% ; font-style: italic ; color: #c02020 ; } .ui-dialog.user-settings div.need-localhost img { float: left ; height: 1.5em ; margin-right: 0.25em ; } diff --git a/vasl_templates/webapp/static/css/vassal-shim.css b/vasl_templates/webapp/static/css/vassal-shim.css index d6e2d0d..5494df2 100644 --- a/vasl_templates/webapp/static/css/vassal-shim.css +++ b/vasl_templates/webapp/static/css/vassal-shim.css @@ -1,4 +1,9 @@ -#vassal-shim-error textarea { width: 100% ; height: 15em ; min-height: 5em ; resize: none ; padding: 2px ; font-family: monospace ; font-size: 80% ; } +#vassal-shim-error textarea { + height: 15em ; min-height: 5em ; + resize: none ; + margin-top: 0.5em ; padding: 2px ; + font-family: monospace ; font-size: 80% ; +} .ui-dialog.vassal-shim-error .ui-dialog-titlebar { background: #f5af41 ; } .ui-dialog.vassal-shim-error .ui-dialog-content { display: flex ; flex-direction: column ; } .ui-dialog.vassal-shim-error .ui-dialog-content textarea { flex-grow: 1 ; } diff --git a/vasl_templates/webapp/static/scenarios.js b/vasl_templates/webapp/static/scenarios.js index b9695d2..edd5b9f 100644 --- a/vasl_templates/webapp/static/scenarios.js +++ b/vasl_templates/webapp/static/scenarios.js @@ -37,7 +37,7 @@ window.searchForScenario = function() modal: true, closeOnEscape: false, // nb: handled in handle_escape() width: $(window).width() * 0.8, - minWidth: 750, + minWidth: 760, height: $(window).height() * 0.8, minHeight: 400, position: { my: "center center", at: "center center", of: window }, @@ -1030,7 +1030,7 @@ function onDownloads() { title: "Downloads for this scenario:", modal: true, width: 450, minWidth: 300, - height: 200, minHeight: 150, + height: 200, minHeight: 132, draggable: false, closeOnEscape: false, // nb: handled in handle_escape() open: function() { @@ -1245,7 +1245,7 @@ window.showScenarioInfo = function() modal: true, closeOnEscape: false, // nb: handled in handle_escape() width: $(window).width() * 0.8, - minWidth: 500, + minWidth: 550, height: $(window).height() * 0.8, minHeight: 300, create: function() { @@ -1428,7 +1428,7 @@ window.addAsaCreditPanel = function( $dlg, scenarioId ) "" ] ; var $credit = $( buf.join("") ) ; - $credit.css( { float: "left", "margin-right": "0.5em", display: "flex", "align-items": "center" } ) ; + $credit.css( { position: "absolute", left: "1em", bottom: "13px", display: "flex", "align-items": "center" } ) ; $credit.find( "img" ).css( { height: "1.4em", "margin-right": "0.5em", opacity: 0.7 } ) ; $credit.find( ".caption" ).css( { "font-size": "70%", "line-height": "1em", "margin-top": "-4px" } ) ; $credit.find( "a" ).css( { "text-decoration": "none", "font-style": "italic", color: "#666" } ) ; diff --git a/vasl_templates/webapp/static/turn_track.js b/vasl_templates/webapp/static/turn_track.js index 2e00a6e..59e97a7 100644 --- a/vasl_templates/webapp/static/turn_track.js +++ b/vasl_templates/webapp/static/turn_track.js @@ -159,7 +159,7 @@ function editTurnTrackSettings() if ( $dlg.find( "input[name='vertical']" ).prop( "checked" ) ) { // vertical layout $iframe.css( { position: "absolute", - top: "10px", height: "calc(100% - 20px)", left: "150px", width: "calc(100% - 160px)" + top: "18px", height: "calc(100% - 25px)", left: "170px", width: "calc(100% - 160px)" } ) ; $dlg.addClass( "vert" ).removeClass( "horz" ) ; $dlg.find( ".controls" ).addClass( "vert" ).removeClass( "horz" ) ; @@ -168,7 +168,7 @@ function editTurnTrackSettings() } else { // horizontal layout $iframe.css( { position: "absolute", - top: "95px", height: "calc(100% - 105px)", left: "10px", width: "calc(100% - 20px)" + top: "110px", height: "calc(100% - 120px)", left: "18px", width: "calc(100% - 33px)" } ) ; $dlg.addClass( "horz" ).removeClass( "vert" ) ; $dlg.find( ".controls" ).addClass( "horz" ).removeClass( "vert" ) ; @@ -200,7 +200,7 @@ function editTurnTrackSettings() "title": "Turn track", dialogClass: "turn-track", modal: true, - minWidth: 500, minHeight: 250, + minWidth: 500, minHeight: 280, resizable: true, create: function() { // initialize the dialog @@ -235,7 +235,7 @@ function editTurnTrackSettings() $btn.prepend( $( "" ) ) ; - $btn.css( { position: "absolute", left: 5 } ) ; + $btn.css( { position: "absolute", left: 15 } ) ; // load the dialog $dlg = $(this) ; $iframe = $dlg.find( "iframe#turn-track-preview" ) ; diff --git a/vasl_templates/webapp/static/user_settings.js b/vasl_templates/webapp/static/user_settings.js index 2881844..65c528e 100644 --- a/vasl_templates/webapp/static/user_settings.js +++ b/vasl_templates/webapp/static/user_settings.js @@ -102,7 +102,6 @@ function user_settings( on_ok, caption ) dialogClass: "user-settings", modal: true, width: 460, - height: 400, resizable: false, create: function() { init_dialog( $(this), "OK", true ) ; diff --git a/vasl_templates/webapp/static/vassal.js b/vasl_templates/webapp/static/vassal.js index bf19028..975d4a5 100644 --- a/vasl_templates/webapp/static/vassal.js +++ b/vasl_templates/webapp/static/vassal.js @@ -535,7 +535,7 @@ function show_vassal_shim_error_dlg( resp, caption ) dialogClass: "vassal-shim-error", title: caption, modal: true, - width: 600, height: "auto", + minWidth: 600, minHeight: 250, open: function() { $( "#vassal-shim-error .message" ).html( resp.error ) ; var log = "" ; diff --git a/vasl_templates/webapp/templates/tabs-scenario.html b/vasl_templates/webapp/templates/tabs-scenario.html index 9aa7f45..e0c276d 100644 --- a/vasl_templates/webapp/templates/tabs-scenario.html +++ b/vasl_templates/webapp/templates/tabs-scenario.html @@ -24,7 +24,7 @@ -
+
-
+
- + - +
diff --git a/vasl_templates/webapp/templates/user-settings-dialog.html b/vasl_templates/webapp/templates/user-settings-dialog.html index c046f05..c9c25b8 100644 --- a/vasl_templates/webapp/templates/user-settings-dialog.html +++ b/vasl_templates/webapp/templates/user-settings-dialog.html @@ -1,6 +1,6 @@