From 5495afbfeace54265438e929054bc89d2b183484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 29 Dec 2016 12:00:39 +0100 Subject: [PATCH] misc: remove usage of jquery ui css (except for old themes) (#14466) --- data/themes/alto/wcs.css | 3 ++- wcs/qommon/http_response.py | 2 -- wcs/qommon/static/css/dc2/admin.css | 37 +------------------------------------ wcs/qommon/static/css/sofresh.css | 1 + 4 files changed, 4 insertions(+), 39 deletions(-) diff --git a/data/themes/alto/wcs.css b/data/themes/alto/wcs.css index d84dd0be..00188ae0 100644 --- a/data/themes/alto/wcs.css +++ b/data/themes/alto/wcs.css @@ -1,7 +1,8 @@ /* adapted from alto dotclear theme */ +@import url(/static/xstatic/themes/smoothness/jquery-ui.min.css); @import url(/static/css/qommon.css); - + html, body { background: #CCCCCC; font-family: sans-serif; diff --git a/wcs/qommon/http_response.py b/wcs/qommon/http_response.py index af4caac2..5dd94a81 100644 --- a/wcs/qommon/http_response.py +++ b/wcs/qommon/http_response.py @@ -76,8 +76,6 @@ class HTTPResponse(quixote.http_response.HTTPResponse): self.add_javascript(['../leaflet/leaflet.js']) self.add_css_include('../leaflet/leaflet.css') self.add_javascript(['../../i18n.js']) - if script_name == 'jquery-ui.js': - self.add_css_include('../xstatic/themes/smoothness/jquery-ui.min.css') self.javascript_scripts.append(str(mapped_script_name)) if script_name == 'afterjob.js': self.add_javascript_code('var QOMMON_ROOT_URL = "%s";\n' % \ diff --git a/wcs/qommon/static/css/dc2/admin.css b/wcs/qommon/static/css/dc2/admin.css index 507c430d..70047724 100644 --- a/wcs/qommon/static/css/dc2/admin.css +++ b/wcs/qommon/static/css/dc2/admin.css @@ -931,8 +931,7 @@ svg #current_status polygon { content: "▶"; } -ul.biglist li p.commands span, -button, div.SubmitWidget input, input[type=submit] { +ul.biglist li p.commands span { border: 1px solid #b7b7b7; border-radius: 1px; color: #424258; @@ -1534,40 +1533,6 @@ div#sidebar div.MapWidget { width: auto; } -.ui-dialog .ui-widget-content .ui-state-default.ui-button { - border-radius: 1px; - background: #e6e6e6; - box-shadow: 0px 0px 2px 0px #DDD; -} - -.ui-dialog .ui-widget-content .ui-state-default:hover { - border-color: #ccc; - box-shadow: 0px 0px 2px 0px #bbb; -} - -.ui-dialog .ui-widget-content .ui-state-default.delete-button { - background: #bc4c38; - background-image: linear-gradient(to bottom, #dc2c18, #a43c28); - color: white; - font-weight: bold; -} - -.ui-dialog .ui-widget-content .ui-state-default.delete-button:hover { - border-color: #a43c28; -} - -.ui-dialog .ui-widget-content .ui-state-default.submit-button { - border-color: #267dae; - background: #283c54; - background-image: linear-gradient(to bottom, #1cabe7, #1999cd); - color: white; - font-weight: bold; -} - -.ui-dialog .ui-widget-content .ui-state-default.submit-button:hover { - border-color: #283c94; -} - div#backoffice-map { height: 70vh; margin-bottom: 1em; diff --git a/wcs/qommon/static/css/sofresh.css b/wcs/qommon/static/css/sofresh.css index e573047d..e01f0ff8 100644 --- a/wcs/qommon/static/css/sofresh.css +++ b/wcs/qommon/static/css/sofresh.css @@ -1,3 +1,4 @@ +@import url(/static/xstatic/themes/smoothness/jquery-ui.min.css); @import url(qommon.css); /* derived from soFresh, a DotClear theme by Maurice Svay (GPL) * http://www.svay.com/files/soFresh/theme-sofresh-1.2.zip */ -- 2.11.0