From c4c7e725eb7ddb89965d66f12839dd85d2c682fd Mon Sep 17 00:00:00 2001 From: Taka Date: Sun, 28 Oct 2018 11:55:46 +0000 Subject: [PATCH] Tightened up the CSS for dialogs. --- .../webapp/static/css/edit-simple-note-dialog.css | 8 ++++---- .../webapp/static/css/edit-template-dialog.css | 8 +++----- vasl_templates/webapp/static/css/edit-vo-dialog.css | 6 ++---- vasl_templates/webapp/static/css/main.css | 3 +++ vasl_templates/webapp/static/css/select-vo-dialog.css | 11 +++++------ .../webapp/static/css/user-settings-dialog.css | 4 ++-- vasl_templates/webapp/static/user_settings.js | 4 ++-- .../webapp/templates/user-settings-dialog.html | 2 -- 8 files changed, 21 insertions(+), 25 deletions(-) diff --git a/vasl_templates/webapp/static/css/edit-simple-note-dialog.css b/vasl_templates/webapp/static/css/edit-simple-note-dialog.css index 8ca8a11..a696682 100644 --- a/vasl_templates/webapp/static/css/edit-simple-note-dialog.css +++ b/vasl_templates/webapp/static/css/edit-simple-note-dialog.css @@ -1,6 +1,6 @@ -#edit-simple_note { overflow: hidden ; padding: 2px ; } - -.ui-dialog.edit-simple_note .ui-dialog-buttonpane { border: none ; padding: 0 ; font-size: 75% ; } +#edit-simple_note { overflow: hidden ; } +.ui-dialog.edit-simple_note .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } .ui-dialog.edit-simple_note textarea { resize: none ; width: calc(100% - 4px) ; height: 100% ; } -.ui-dialog.edit-simple_note button { margin: 0 0 0 5px ; padding: 0.1em 0.2em ; } +.ui-dialog.edit-simple_note label[for="width"] { color: #444 ; } +.ui-dialog.edit-simple_note input[name="width"] { color: #444 ; } diff --git a/vasl_templates/webapp/static/css/edit-template-dialog.css b/vasl_templates/webapp/static/css/edit-template-dialog.css index 808a8d4..8986d53 100644 --- a/vasl_templates/webapp/static/css/edit-template-dialog.css +++ b/vasl_templates/webapp/static/css/edit-template-dialog.css @@ -1,8 +1,6 @@ -#edit-template { overflow: hidden ; padding: 2px ; } - +#edit-template { overflow: hidden ; } .ui-dialog.edit-template .ui-dialog-titlebar { background: #f8d868 ; } -.ui-dialog.edit-template .ui-dialog-buttonpane { border: none ; padding: 0 ; font-size: 75% ; } +.ui-dialog.edit-template .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } .ui-dialog.edit-template textarea { resize: none ; width: calc(100% - 4px) ; height: 100% ; } -.ui-dialog.edit-template textarea { font-family: monospace ; font-size: 90% ; } -.ui-dialog.edit-template button { margin: 0 0 0 5px ; padding: 0.1em 0.2em ; } +.ui-dialog.edit-template textarea { font-family: monospace ; font-size: 80% ; } diff --git a/vasl_templates/webapp/static/css/edit-vo-dialog.css b/vasl_templates/webapp/static/css/edit-vo-dialog.css index 6bd0a5f..1300d86 100644 --- a/vasl_templates/webapp/static/css/edit-vo-dialog.css +++ b/vasl_templates/webapp/static/css/edit-vo-dialog.css @@ -1,4 +1,5 @@ -.ui-dialog.edit-vo .ui-dialog-content { padding: 5px ; overflow: hidden ; display: flex ; } +.ui-dialog.edit-vo .ui-dialog-content { overflow: hidden ; display: flex ; } +.ui-dialog.edit-vo .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } .ui-dialog.edit-vo .capabilities { flex-grow: 1 ; display: flex ; flex-direction: column ; } @@ -20,6 +21,3 @@ .ui-dialog.edit-vo .capabilities div.fieldset .footer { display: flex ; align-items: center ; } .ui-dialog.edit-vo .capabilities div.fieldset .footer img.trash { margin: 3px 5px ; height: 24px ; } - -.ui-dialog.edit-vo .ui-dialog-buttonpane { border: none ; padding: 0 ; } -.ui-dialog.edit-vo .ui-dialog-buttonpane button { margin: 0 0 0 5px ; padding: 0.1em 0.2em ; } diff --git a/vasl_templates/webapp/static/css/main.css b/vasl_templates/webapp/static/css/main.css index cb9ef4d..bf2c7f5 100644 --- a/vasl_templates/webapp/static/css/main.css +++ b/vasl_templates/webapp/static/css/main.css @@ -39,7 +39,10 @@ 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-right: 0.25em ; } .ui-dialog-titlebar-close { margin-top: -10px !important ; } +.ui-dialog-content { padding: 0.5em !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 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/select-vo-dialog.css b/vasl_templates/webapp/static/css/select-vo-dialog.css index c5ff016..89dfadd 100644 --- a/vasl_templates/webapp/static/css/select-vo-dialog.css +++ b/vasl_templates/webapp/static/css/select-vo-dialog.css @@ -1,9 +1,12 @@ -#select-vo { overflow: hidden ; padding: 2px ; } +#select-vo { overflow: hidden ; } +.ui-dialog.select-vo .ui-dialog-content { padding-top: 0 !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% ; } #select-vo .select2-selection { display: none ; } #select-vo .select2-search { padding: 0 0 5px 0 ; } +#select-vo .select2-results { border: 1px solid #ccc ; } #select-vo .select2-results__options { max-height: none ; } #select-vo .select2-dropdown { border: none ; } #select-vo .select2-dropdown .vo-entry { display: flex ; color: #444 ; } @@ -14,13 +17,9 @@ #select-vo .select2-results__option--highlighted[aria-selected] .vo-type { color: #eee ; } #select-vo .select2-dropdown .vo-entry input.select-vo-image { width: 15px ; position: relative ; top: 10px ; } -.ui-dialog.select-vo .ui-dialog-buttonpane { border: none ; padding: 0 ; } -.ui-dialog.select-vo .ui-dialog-buttonpane button { margin: 0 0 0 5px ; padding: 0.1em 0.2em ; } - /* -------------------------------------------------------------------- */ -.ui-dialog.select-vo-image { padding: 5px ; } .ui-dialog.select-vo-image .ui-dialog-titlebar { display: none ; } -.ui-dialog.select-vo-image .ui-dialog-content { padding: 0 ; height: 100% !important ; overflow: hidden ; } +.ui-dialog.select-vo-image .ui-dialog-content { padding: 0 !important ; height: 100% !important ; overflow: hidden ; } .ui-dialog.select-vo-image .vo-images img { margin: 5px ; padding: 10px ; border: 1px dotted #ddd ; } diff --git a/vasl_templates/webapp/static/css/user-settings-dialog.css b/vasl_templates/webapp/static/css/user-settings-dialog.css index 335685e..57a2323 100644 --- a/vasl_templates/webapp/static/css/user-settings-dialog.css +++ b/vasl_templates/webapp/static/css/user-settings-dialog.css @@ -1,6 +1,6 @@ .ui-dialog.user-settings .ui-dialog-titlebar { background: #80d0ff ; } -.ui-dialog.user-settings .ui-dialog-buttonpane { border: none ; padding: 0 ; font-size: 75% ; } +.ui-dialog.user-settings .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; } -.ui-dialog.user-settings fieldset { border-radius: 0 ; } +.ui-dialog.user-settings fieldset { margin: 1em 0 0 0 ; padding-top: 0.25em ; border-radius: 0 ; } .ui-dialog.user-settings .run-as-server-note { margin-bottom: 0.5em ; font-size: 80% ; font-style: italic ; color: #666 ; } .ui-dialog.user-settings .run-as-server-note img { float: left ; margin-right: 0.25em ; } diff --git a/vasl_templates/webapp/static/user_settings.js b/vasl_templates/webapp/static/user_settings.js index e3dc8ec..fcbdcf7 100644 --- a/vasl_templates/webapp/static/user_settings.js +++ b/vasl_templates/webapp/static/user_settings.js @@ -42,8 +42,8 @@ function user_settings() title: "User settings", dialogClass: "user-settings", modal: true, - width: 400, - height: 270, + width: 440, + height: 250, resizable: false, create: function() { init_dialog( $(this), "OK", false ) ; diff --git a/vasl_templates/webapp/templates/user-settings-dialog.html b/vasl_templates/webapp/templates/user-settings-dialog.html index df38bcb..3cf20d3 100644 --- a/vasl_templates/webapp/templates/user-settings-dialog.html +++ b/vasl_templates/webapp/templates/user-settings-dialog.html @@ -7,8 +7,6 @@ -

-
Provide services to VASL