From e992cce0b2cc5ccd48c3cb73351720de3719942f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Sep 2017 23:38:56 +0200 Subject: [PATCH] Please cherry-pick: - merged default.css + layout.css into custom.css as this is really what it is - however, these CSS classes/ids may fade step-by-step away in favour of jQuery UI theme - table-medium CSS class was to much static and so not responsive, replaced all by table-full MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../admin/fax/admin_form_add_contact_fax.tpl | 2 +- .../admin_form_add_contact_landline.tpl | 2 +- web/WEB-INF/templates/base.tpl | 3 +- .../register/guest_form_register_page2.tpl | 2 +- web/resources/css/{layout.css => custom.css} | 30 +++++++++++++------ web/resources/css/default.css | 21 ------------- 6 files changed, 25 insertions(+), 35 deletions(-) rename web/resources/css/{layout.css => custom.css} (93%) delete mode 100644 web/resources/css/default.css diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl index e8bfe048..c5f81e08 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl @@ -10,7 +10,7 @@ - +
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl index d2357275..fbf14e51 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl @@ -10,7 +10,7 @@ - +
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index 0dfccbb5..0cafd0a4 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -23,8 +23,7 @@ - - + <h:outputText value="#{initParam['project_title']} - " /> diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl index 547442b8..0286393a 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl @@ -7,7 +7,7 @@ xmlns:p="http://primefaces.org/ui"> <h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}"> - <h:panelGroup styleClass="table table-medium" layout="block"> + <h:panelGroup styleClass="table table-full" layout="block"> <div class="table-header"> <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" /> </div> diff --git a/web/resources/css/layout.css b/web/resources/css/custom.css similarity index 93% rename from web/resources/css/layout.css rename to web/resources/css/custom.css index feb0149b..a9674742 100644 --- a/web/resources/css/layout.css +++ b/web/resources/css/custom.css @@ -1,8 +1,24 @@ -/** -div, table { - border: 1px solid #ff0000; +body { + background-color: white; + font-size: 12px; + font-family: sans-serif; + color: black; + margin: 0px; +} + +.page-header > h1 { + margin: 2px; +} + +a:link, a:visited { + color: #045491; + text-decoration: none; +} + +a:link:hover, a:visited:hover { + color: #045491; + text-decoration : underline; } -/**/ .page-header { background-color: steelblue; @@ -57,7 +73,7 @@ div, table { text-decoration : underline; } -table, .table, .table-medium { +table, .table { margin: 0px; padding: 0px; } @@ -70,10 +86,6 @@ table, .table, .table-medium { margin: 2px; } -.table-medium { - width: 650px; -} - .table-full { margin: 0 auto; width: 100%; diff --git a/web/resources/css/default.css b/web/resources/css/default.css deleted file mode 100644 index 95568b94..00000000 --- a/web/resources/css/default.css +++ /dev/null @@ -1,21 +0,0 @@ -body { - background-color: white; - font-size: 12px; - font-family: sans-serif; - color: black; - margin: 0px; -} - -.page-header > h1 { - margin: 2px; -} - -a:link, a:visited { - color: #045491; - text-decoration: none; -} - -a:link:hover, a:visited:hover { - color: #045491; - text-decoration : underline; -} -- 2.39.5