Minor UI tweaks.

master
Pacman Ghost 2 years ago committed by Pacman Ghost
parent 77b1bc9548
commit 2628105ea9
  1. 2
      vasl_templates/about.py
  2. 2
      vasl_templates/main_window.py
  3. 23
      vasl_templates/ui/about.ui
  4. 2
      vasl_templates/webapp/data/default-template-pack/ssr.j2
  5. 2
      vasl_templates/webapp/static/css/html-editor.css
  6. 1
      vasl_templates/webapp/static/css/main.css
  7. 1
      vasl_templates/webapp/static/css/program-info.css
  8. 2
      vasl_templates/webapp/static/css/scenario-card.css
  9. 2
      vasl_templates/webapp/static/css/sortable.css
  10. 1
      vasl_templates/webapp/static/css/tabs-ob.css
  11. 2
      vasl_templates/webapp/static/css/tabs-scenario.css
  12. BIN
      vasl_templates/webapp/static/images/menu/template-pack.png
  13. 7
      vasl_templates/webapp/static/main.js
  14. 4
      vasl_templates/webapp/static/snippets.js
  15. 4
      vasl_templates/webapp/templates/scenario-upload-dialog.html
  16. 4
      vasl_templates/webapp/templates/tabs-scenario.html

@ -51,7 +51,7 @@ class AboutDialog( QDialog ):
time.strftime( "%d %B %Y %H:%M", time.localtime( build_info["timestamp"] ) )
) )
if "git_info" in build_info:
buf.write( " <small><em>({})</em></small>".format( build_info["git_info"] ) )
buf.write( " <small><tt>({})</tt></small>".format( build_info["git_info"] ) )
buf.write( "." )
self.build_info.setText( buf.getvalue() )
else:

@ -97,7 +97,7 @@ class MainWindow( QWidget ):
# NOTE: This should be wide enough for the sortable hints to not wrap (so that
# we don't see a scrollbar when their panels are reduced to their minimum height).
# We also want the Trumbowyg button pane for the VC to wrap somewhere sensible.
self.setMinimumSize( 1030, 630 )
self.setMinimumSize( 1030, 650 )
# initialize the layout
layout = QVBoxLayout( self )

@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>460</width>
<height>182</height>
<height>195</height>
</rect>
</property>
<property name="windowTitle">
@ -39,9 +39,9 @@
<property name="geometry">
<rect>
<x>80</x>
<y>20</y>
<y>19</y>
<width>361</width>
<height>61</height>
<height>58</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -75,7 +75,6 @@
<property name="font">
<font>
<family>DejaVu Sans</family>
<italic>true</italic>
</font>
</property>
<property name="text">
@ -88,9 +87,9 @@
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>15</x>
<y>140</y>
<width>430</width>
<x>19</x>
<y>152</y>
<width>425</width>
<height>31</height>
</rect>
</property>
@ -129,9 +128,9 @@
<widget class="QLabel" name="home_url">
<property name="geometry">
<rect>
<x>15</x>
<y>120</y>
<width>411</width>
<x>80</x>
<y>122</y>
<width>361</width>
<height>21</height>
</rect>
</property>
@ -151,9 +150,9 @@
<widget class="QLabel" name="license">
<property name="geometry">
<rect>
<x>15</x>
<x>80</x>
<y>100</y>
<width>411</width>
<width>361</width>
<height>17</height>
</rect>
</property>

@ -4,7 +4,7 @@
<meta charset="utf-8">
<style>
{{CSS:common}}
ul#ssr { padding: 0 5px 0 13px ; }
ul#ssr { padding: 0 5px 0 15px ; }
ul#ssr li { margin-top: 2px ; }
</style>
</head>

@ -26,7 +26,7 @@
.trumbowyg-modal-box .trumbowyg-input-infos label { color: #444 ; font-weight: bold ; }
/* configure button */
.trumbowyg-foreColor-button {
.trumbowyg-foreColor-button, .trumbowyg-backColor-button {
width: 40px !important ;
background: no-repeat 12px 12px url("../images/trumbowyg/fore-color.png") !important ;
background-size: 12px 12px !important ;

@ -60,6 +60,7 @@ input.snippet-width { width: 3.75em ; }
.sp-palette-row-selection { margin-top: 6px ; border-top: 1px solid #ccc ; padding-top: 6px ; }
/* growl notification balloons */
#growls-br { bottom: 2px ; right: 3px ; }
.growl-title { display: none ; }
.growl-close { position: absolute ; top: 0 ; right: 5px ; }
.growl .pre { font-family: monospace ; }

@ -8,6 +8,7 @@
#program-info .downloads td { padding-top: 0 ; padding-bottom: 0 ; }
#program-info .downloads td.key { width: 12.5em ; }
#program-info .downloads td.key li { margin-top: -1px ; }
#program-info .na { font-style: italic ; color: #444 ; }
#program-info .path { font-family: monospace ; font-size: 80% ; }

@ -82,7 +82,7 @@
#scenario-info-dialog .scenario-card { height: 100% ; overflow-y: hidden ; }
#scenario-info-dialog .connect-roar { display: inline-block ; margin-top: 0.25em ; font-size: 80% ; color: #444 ; cursor: pointer ; }
#scenario-info-dialog .connect-roar img { height: 0.75em ; Xmargin-right: 0.25em ; opacity: 0.7 ; }
#scenario-info-dialog .disconnect-roar img { height: 0.5em ; margin-left: 0.5em ; cursor: pointer ; }
#scenario-info-dialog .disconnect-roar img { height: 0.5em ; margin-left: 0.5em ; margin-bottom: 1px ; cursor: pointer ; }
/* lightgallery */
.lg-backdrop.in { opacity: 0.85 ; }

@ -5,7 +5,7 @@ img.sortable-reset { height: 16px ; margin: -2px 0.4em 0 -2px ; }
.sortable { list-style-type: none ; margin: 0 ; padding: 0 ; }
.sortable > li { margin-bottom: 2px ; padding: 5px ; font-size: 90% ; }
.sortable > li { margin-bottom: 2px ; padding: 5px 8px ; font-size: 90% ; }
.sortable > li:hover { cursor: pointer ; }
.sortable > li.ui-sortable-helper { opacity: 0.8 ; }
.sortable > li img.snippet { height: 1.25em ; margin: -2px -2px 0 15px ; float: right ; }

@ -14,6 +14,7 @@
.panel-ob_vehicles { height: 100% ; display: flex ; flex-direction: column ; }
.panel-ob_vehicles .content { flex-grow: 1 ; }
.panel-ob_vehicles .sortable > li { padding: 4px 6px ; }
.panel-ob_vehicles .footer { margin-top: 0.5em ; display: flex ; align-items: center ; }
.panel-ob_ordnance { height: 100% ; display: flex ; flex-direction: column ; }

@ -5,7 +5,7 @@ fieldset[name='scenario'] { min-height: 91px ; max-height: 265px ; overflow: hid
#panel-scenario .row { display: flex ; align-items: center ; margin-bottom: 2px ; }
#panel-scenario input { flex-grow: 1 ; }
#panel-scenario input[name='SCENARIO_ID'] { margin-left: 0.25em ; width: 80px ; flex-grow: 0 ; text-align: right ; }
#panel-scenario input[name='SCENARIO_ID'] { margin-left: 0.25em ; width: 70px ; flex-grow: 0 ; text-align: right ; }
#panel-scenario .scenario-search { width: 25px ; height: 22px ; margin: 0 0 0 0.25em ; padding: 0 ; }
#panel-scenario .scenario-search img { margin-top: 2px ; width: 16px ; }
#panel-scenario input[name='SCENARIO_DATE'] { width: 6em ; flex-grow: 0 ; }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 974 B

@ -774,11 +774,14 @@ function update_page_load_status( id )
) ;
$("#tabs").tabs({ disabled: [] }) ;
$("#loader").fadeOut( 500 ) ;
adjust_footer_vspacers() ;
// initialize the HTML WYSIWYG editors (nb: we do it here, since we need the app config
// and template pack (for the player flags))
initVictoryConditionsTrumbowyg() ;
$( "#panel-vc .footer" ).fadeIn( 2*1000 ) ;
// FUDGE! There are problems with the layout jumping around during startup in the desktop app,
// so we hide the footers on the scenario tab (which is the one visible during startup),
// and only show them them when we're ready.
$( "#tabs-scenario .footer" ).fadeIn( 2*1000 ) ;
adjust_footer_vspacers() ;
// FUDGE! This works around a timing problem during startup, where we unload the current parameters
// before the Victory Conditions Trumbowyg control has initialized (and so doesn't get included).
gLastSavedScenario = unload_params_for_save( false ) ;

@ -1626,7 +1626,9 @@ function edit_template( template_id )
open: function() {
on_dialog_open( $(this) ) ;
$(this).height( $(this).height() ) ; // fudge: force everything to resize
$("#edit-template textarea").change( on_template_change ) ;
var $elem = $( "#edit-template textarea" ) ;
$elem.change( on_template_change ) ;
$elem.scrollTop( 0 )[0].setSelectionRange( 0, 0 ) ;
},
beforeClose: function() {
gEditTemplateDlgState = getDialogState( $(this) ) ;

@ -24,7 +24,7 @@
<div class="vsav-container">
<div class="hint">
<img src="{{url_for('static',filename='images/lfa/file.png')}}">
Click here to select your VASL save file, or drag it in.
Click here to select your VASL save file, or drag it in (optional).
</div>
<div class="file-info" style="display:none;">
<img src="{{url_for('static',filename='images/lfa/file.png')}}">
@ -50,7 +50,7 @@ Your <em>vasl-templates</em> setup will also be uploaded.
<div class="screenshot-container">
<div class="hint">
<img src="{{url_for('static',filename='images/screenshot.png')}}">
Click here to select a screenshot file, <br> or drag one in.
Click here to select a screenshot file, <br> or drag one in (optional).
</div>
<div class="preview" style="display:none;">
<img src="">

@ -90,7 +90,7 @@
<div id="scenario_notes-hint" class="sortable-hint"></div>
<ul id="scenario_notes-sortable" class="sortable" style="display:none;"></ul>
</div>
<div class="footer">
<div class="footer" style="display:none;">
<button id="scenario_notes-add" class="sortable-add"></button>
<img id="scenario_notes-trash" class="sortable-trash">
<span class="spacer"></span>
@ -122,7 +122,7 @@
<div id="ssr-hint" class="sortable-hint"></div>
<ul id="ssr-sortable" class="sortable" style="display:none;"></ul>
</div>
<div class="footer">
<div class="footer" style="display:none;">
<button id="ssr-add" class="sortable-add"></button>
<img id="ssr-trash" class="sortable-trash">
<span class="spacer"></span>

Loading…
Cancel
Save