From: Roland Häder Date: Fri, 29 Sep 2017 21:38:56 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e992cce0b2cc5ccd48c3cb73351720de3719942f;p=jfinancials-war.git 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 Signed-off-by: Roland Häder --- 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/custom.css b/web/resources/css/custom.css new file mode 100644 index 00000000..a9674742 --- /dev/null +++ b/web/resources/css/custom.css @@ -0,0 +1,315 @@ +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; + color: white; + padding: 5px; +} + +.page-content-gap { + height: 0.35em; + background-image: linear-gradient(steelblue, white); +} + +.page-footer { + background-color: lightblue; + padding: 5px; + margin: 10px 0px 0px 0px; + overflow: auto; +} + +#left-menu-container { + float: left; + background-color: khaki; + padding: 5px; + width: 170px; +} + +.center_content { + position: relative; + background-color: #dddddd; + padding: 5px; +} + +.content-container { + padding-right: 5px; + padding-bottom: 5px; + margin-left: 190px; +} + +.table-footer { + margin: 2px; +} + +.page-header a:link, .page-header a:visited { + color: white; + font-weight : bold; + text-decoration: none; +} + +.page-header a:link:hover, .page-header a:visited:hover { + color: black; + font-weight : bold; + text-decoration : underline; +} + +table, .table { + margin: 0px; + padding: 0px; +} + +.table { + width: 500px; +} + +.table-footer { + margin: 2px; +} + +.table-full { + margin: 0 auto; + width: 100%; +} + +.table-row { + width: 100%; + min-height: 20px; + margin: 2px; + overflow: auto; +} + +.para { + padding: 5px; +} + +ul.navbar-horizontal, ul.navbar-mini { + display: block; + text-align: center; + list-style: none; + margin: 0px; + padding: 0px; +} + +ul.navbar-horizontal li.navlink-horizontal, ul.navbar-mini li.navlink-mini { + display: block; + float: left; +} + +ul.navbar-horizontal li.navlink-horizontal { + width: 100px; +} + +ul.navbar-mini li.navlink-mini { + padding: 1px; +} + +ul.navbar-horizontal li.footer-copyright { + float: right; + width: 300px; + margin-right: 10px; +} + +.table-header { + text-align: center; + font-weight: bold; +} + +.table-data-label, .table-data-field { + display: block; + border: 1px solid #aaaaaa; + border-top-right-radius: 8px; + border-bottom-left-radius: 8px; +} + +.table-data-label { + font-weight: bold; + background-image: linear-gradient(#eeeeee, #aaaaaa); + height: 16px; + padding-left: 4px; +} + +.table-data-field { + background-color: #f5f5f5; + vertical-align: top; + padding-top: 1px; + padding-bottom: 1px; + padding-left: 2px; + padding-right: 1px; + margin-top: 2px; + min-height: 15px; +} + +#content-header { + border-color: grey; + background-image: linear-gradient(#eeeeee, #aaaaaa); + font-weight: bold; + font-size: 18px; + margin-bottom: 20px; + padding-left: 5px; + line-height: 20px; +} + +.table-header-column { + width: 100px; +} + +.table-header-column25 { + width: 25%; +} + +.table-data-column { + width: 100px; +} + +.item_price, .item_total_price { + text-align: right; +} + +.alert-danger { + color: red; +} + +.alert-danger:hover { + cursor: not-allowed; +} + +.alert-warning { + color: orange; +} + +.alert-info { + color: cornflowerblue; +} + +.message-container { + border: 1px solid grey; + border-top-right-radius: 8px; + border-bottom-left-radius: 8px; + background-color: ghostwhite; +} + +.message-medium { + width: 400px; +} + +.message-auto { + margin: auto 0px; +} + +.message-mini { + width: 160px; +} + +.message-header { + border-bottom: 1px solid grey; + background-image: linear-gradient(#eeeeee, #aaaaaa); + border-top-right-radius: 8px; + line-height: 18px; + text-align: center; + font-weight: bold; +} + +.user-status-confirmed, .customer-status-confirmed { + color: #00aa00; +} + +.user-status-unconfirmed, .customer-status-unconfirmed { + color: #00aaaa; +} + +.user-status-locked, .customer-status-locked { + color: #aa0000; +} + +.link-warning { + color: #aaaa00; +} + +.link-danger { + color: #aa0000; +} + +.divider-right { + margin-right: 2px; +} + +#content-header { + border: 1px solid grey; +} + +#content-header, .input, .submit, .reset, .button-danger, .button-warning, .fieldset { + border-top-right-radius: 8px; + border-bottom-left-radius: 8px; +} + +.fieldset { + padding: 5px; +} + +#menu-content-wrapper { + overflow: auto; +} + +.button-danger { + border-color: #ee0000; + background-color: #880000; + color: white; +} + +.button-warning { + border-color: #eeee00; + background-color: #aaaa00; + color: white; +} + +.button-danger:hover { + border-color: #dd0000; + background-color: #aa0000; + color: #eeeeee; +} + +.button-warning:hover { + border-color: #dddd00; + background-color: #cccc00; + color: #eeeeee; +} + +#menu-content-wrapper::after { + clear: both; +} + +.table-row::after { + clear: both; +} + +#footer::after { + clear: both; +} + +.column-selector { + float: right; +} + +.ui-noborder { + border: initial; +} 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; -} diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css deleted file mode 100644 index feb0149b..00000000 --- a/web/resources/css/layout.css +++ /dev/null @@ -1,303 +0,0 @@ -/** -div, table { - border: 1px solid #ff0000; -} -/**/ - -.page-header { - background-color: steelblue; - color: white; - padding: 5px; -} - -.page-content-gap { - height: 0.35em; - background-image: linear-gradient(steelblue, white); -} - -.page-footer { - background-color: lightblue; - padding: 5px; - margin: 10px 0px 0px 0px; - overflow: auto; -} - -#left-menu-container { - float: left; - background-color: khaki; - padding: 5px; - width: 170px; -} - -.center_content { - position: relative; - background-color: #dddddd; - padding: 5px; -} - -.content-container { - padding-right: 5px; - padding-bottom: 5px; - margin-left: 190px; -} - -.table-footer { - margin: 2px; -} - -.page-header a:link, .page-header a:visited { - color: white; - font-weight : bold; - text-decoration: none; -} - -.page-header a:link:hover, .page-header a:visited:hover { - color: black; - font-weight : bold; - text-decoration : underline; -} - -table, .table, .table-medium { - margin: 0px; - padding: 0px; -} - -.table { - width: 500px; -} - -.table-footer { - margin: 2px; -} - -.table-medium { - width: 650px; -} - -.table-full { - margin: 0 auto; - width: 100%; -} - -.table-row { - width: 100%; - min-height: 20px; - margin: 2px; - overflow: auto; -} - -.para { - padding: 5px; -} - -ul.navbar-horizontal, ul.navbar-mini { - display: block; - text-align: center; - list-style: none; - margin: 0px; - padding: 0px; -} - -ul.navbar-horizontal li.navlink-horizontal, ul.navbar-mini li.navlink-mini { - display: block; - float: left; -} - -ul.navbar-horizontal li.navlink-horizontal { - width: 100px; -} - -ul.navbar-mini li.navlink-mini { - padding: 1px; -} - -ul.navbar-horizontal li.footer-copyright { - float: right; - width: 300px; - margin-right: 10px; -} - -.table-header { - text-align: center; - font-weight: bold; -} - -.table-data-label, .table-data-field { - display: block; - border: 1px solid #aaaaaa; - border-top-right-radius: 8px; - border-bottom-left-radius: 8px; -} - -.table-data-label { - font-weight: bold; - background-image: linear-gradient(#eeeeee, #aaaaaa); - height: 16px; - padding-left: 4px; -} - -.table-data-field { - background-color: #f5f5f5; - vertical-align: top; - padding-top: 1px; - padding-bottom: 1px; - padding-left: 2px; - padding-right: 1px; - margin-top: 2px; - min-height: 15px; -} - -#content-header { - border-color: grey; - background-image: linear-gradient(#eeeeee, #aaaaaa); - font-weight: bold; - font-size: 18px; - margin-bottom: 20px; - padding-left: 5px; - line-height: 20px; -} - -.table-header-column { - width: 100px; -} - -.table-header-column25 { - width: 25%; -} - -.table-data-column { - width: 100px; -} - -.item_price, .item_total_price { - text-align: right; -} - -.alert-danger { - color: red; -} - -.alert-danger:hover { - cursor: not-allowed; -} - -.alert-warning { - color: orange; -} - -.alert-info { - color: cornflowerblue; -} - -.message-container { - border: 1px solid grey; - border-top-right-radius: 8px; - border-bottom-left-radius: 8px; - background-color: ghostwhite; -} - -.message-medium { - width: 400px; -} - -.message-auto { - margin: auto 0px; -} - -.message-mini { - width: 160px; -} - -.message-header { - border-bottom: 1px solid grey; - background-image: linear-gradient(#eeeeee, #aaaaaa); - border-top-right-radius: 8px; - line-height: 18px; - text-align: center; - font-weight: bold; -} - -.user-status-confirmed, .customer-status-confirmed { - color: #00aa00; -} - -.user-status-unconfirmed, .customer-status-unconfirmed { - color: #00aaaa; -} - -.user-status-locked, .customer-status-locked { - color: #aa0000; -} - -.link-warning { - color: #aaaa00; -} - -.link-danger { - color: #aa0000; -} - -.divider-right { - margin-right: 2px; -} - -#content-header { - border: 1px solid grey; -} - -#content-header, .input, .submit, .reset, .button-danger, .button-warning, .fieldset { - border-top-right-radius: 8px; - border-bottom-left-radius: 8px; -} - -.fieldset { - padding: 5px; -} - -#menu-content-wrapper { - overflow: auto; -} - -.button-danger { - border-color: #ee0000; - background-color: #880000; - color: white; -} - -.button-warning { - border-color: #eeee00; - background-color: #aaaa00; - color: white; -} - -.button-danger:hover { - border-color: #dd0000; - background-color: #aa0000; - color: #eeeeee; -} - -.button-warning:hover { - border-color: #dddd00; - background-color: #cccc00; - color: #eeeeee; -} - -#menu-content-wrapper::after { - clear: both; -} - -.table-row::after { - clear: both; -} - -#footer::after { - clear: both; -} - -.column-selector { - float: right; -} - -.ui-noborder { - border: initial; -}