From ed9d5dc66420dff5068da64ff72955d94034cc97 Mon Sep 17 00:00:00 2001 From: Taka Date: Sun, 30 Dec 2018 03:24:48 +0000 Subject: [PATCH] Tightened up the CSS for sortable's. --- vasl_templates/webapp/static/css/sortable.css | 2 +- vasl_templates/webapp/static/css/tabs-ob.css | 1 - vasl_templates/webapp/static/css/tabs-scenario.css | 2 -- vasl_templates/webapp/tests/test_counters.py | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/vasl_templates/webapp/static/css/sortable.css b/vasl_templates/webapp/static/css/sortable.css index fd6f886..9232f34 100644 --- a/vasl_templates/webapp/static/css/sortable.css +++ b/vasl_templates/webapp/static/css/sortable.css @@ -5,7 +5,7 @@ img.sortable-reset { vertical-align: middle ; height: 15px ; margin-right: 0.25e .sortable { list-style-type: none ; margin: 0 ; padding: 0 ; } -.sortable li { margin-bottom: 2px ; padding: 5px ; } +.sortable li { margin-bottom: 2px ; padding: 5px ; font-size: 90% ; } .sortable li:hover { cursor: pointer ; } .sortable li.ui-sortable-helper { opacity: 0.8 ; } diff --git a/vasl_templates/webapp/static/css/tabs-ob.css b/vasl_templates/webapp/static/css/tabs-ob.css index e6e3f9f..4eb5de8 100644 --- a/vasl_templates/webapp/static/css/tabs-ob.css +++ b/vasl_templates/webapp/static/css/tabs-ob.css @@ -25,7 +25,6 @@ .panel-ob_vo .sortable .vo-entry img.vasl-image { display: inline-block ; vertical-align: middle ; height: 3.25em ; margin-right: 0.5em ; } .panel-ob_vo .sortable .vo-entry.small-piece img.vasl-image { height: 2.25em ; margin-left: 0.5em ; margin-right: 0.75em ; } .panel-ob_vo .sortable .vo-entry .detail { flex-grow: 1 ; display: flex ; flex-direction: column ; justify-content: center ; } -.panel-ob_vo .sortable .vo-entry .detail .vo-name { font-size: 90% ; } .panel-ob_vo .sortable .vo-entry .detail .vo-capabilities { max-height: 2.5em ; overflow: hidden ; font-size: 80% ; font-style: italic ; } .panel-ob_vo .sortable .vo-entry .detail .vo-capability { margin-right: 0.5em ; color: #444 ; } .panel-ob_vo label.header { font-weight: bold ; display: inline-block ; width: 3.25em ; } diff --git a/vasl_templates/webapp/static/css/tabs-scenario.css b/vasl_templates/webapp/static/css/tabs-scenario.css index 0c50634..c24c340 100644 --- a/vasl_templates/webapp/static/css/tabs-scenario.css +++ b/vasl_templates/webapp/static/css/tabs-scenario.css @@ -32,12 +32,10 @@ #panel-scenario_notes { height: 100% ; display: flex ; flex-direction: column ; } #panel-scenario_notes .content { flex-grow: 1 ; } -#panel-scenario_notes .sortable { font-size: 90% ; } #panel-scenario_notes .footer { margin-top: 0.5em ; display: flex ; } /* -------------------------------------------------------------------- */ #panel-ssr { height: 100% ; display: flex ; flex-direction: column ; } #panel-ssr .content { flex-grow: 1 ; } -#panel-ssr .sortable { font-size: 90% ; } #panel-ssr .footer { margin-top: 0.5em ; display: flex ; align-items: center ; } diff --git a/vasl_templates/webapp/tests/test_counters.py b/vasl_templates/webapp/tests/test_counters.py index ac60f7f..6e3e370 100644 --- a/vasl_templates/webapp/tests/test_counters.py +++ b/vasl_templates/webapp/tests/test_counters.py @@ -130,7 +130,7 @@ def test_gpid_remapping( webapp, webdriver ): gpid = mo.group(1) if valid_image: assert check_gpid_image( gpid ) == 200 - assert img.get_attribute( "width" ) == "52" # nb: this value depends on the CSS settings! + assert img.get_attribute( "width" ) == "47" # nb: this value depends on the CSS settings! else: assert check_gpid_image( gpid ) == 404