From 7f3b37560e925f3d10bda67433bbcc8d36de628c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 14 Nov 2024 21:01:48 +0100 Subject: [PATCH 1/8] [ticket/17501] Move navbar above header and breadcrumbs below PHPBB-17501 --- .../prosilver/template/navbar_header.html | 63 ------------------- .../prosilver/template/overall_header.html | 8 ++- 2 files changed, 6 insertions(+), 65 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 702a018765..7d6ee666ec 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -203,68 +203,5 @@ {% endif %} - - - diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 949d3fb1af..c35f0ab378 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -79,7 +79,11 @@
+ + - -
+ {% include 'breadcrumbs.html' %} + From 6fd9a78872e9e4f5c8345c629f4a0a3d08ee3d2a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 14 Nov 2024 21:03:01 +0100 Subject: [PATCH 2/8] [ticket/17501] Adjust CSS for moved navbar & breadcrumbs PHPBB-17501 --- .../prosilver/template/breadcrumbs.html | 53 +++++++++++++++++++ phpBB/styles/prosilver/theme/colours.css | 25 +++++++-- phpBB/styles/prosilver/theme/common.css | 22 ++++++-- 3 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 phpBB/styles/prosilver/template/breadcrumbs.html diff --git a/phpBB/styles/prosilver/template/breadcrumbs.html b/phpBB/styles/prosilver/template/breadcrumbs.html new file mode 100644 index 0000000000..f71f6e73ff --- /dev/null +++ b/phpBB/styles/prosilver/template/breadcrumbs.html @@ -0,0 +1,53 @@ + diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index c642adb22c..e14a133f5d 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -99,18 +99,19 @@ th a:hover { } /* round cornered boxes and backgrounds */ -.headerbar { - color: #ffffff; +.headerbar, +.headerbar h1 { + color: #eaf8ff; } .headerbar, .forumbg { - background-color: #13a4ec; + background-color: #4688ce; background-repeat: repeat-x; } .forabg { - background-color: #13a4ec; + background-color: #4688ce; background-repeat: repeat-x; } @@ -118,6 +119,18 @@ th a:hover { background-color: #c9dee8; } +.headerbar .navbar a { + color: #eaf8ff; +} + +.headerbar .navbar .dropdown a { + color: #0f4d8a; +} + +.header-profile { + text-shadow: 0 0 var(--ps-font-tiny) #eaf8ff; +} + .panel { background-color: #f0f3f5; color: #29303d; @@ -814,6 +827,10 @@ dd.profile-warnings { /* icon images */ .site_logo { background-image: url("./images/site_logo.svg"); } +.c-hero-logo-img g { + fill: #eaf8ff; +} + /* colours and backgrounds for cp.css */ /* main cp box */ diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e8f32465e2..46edea7c04 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -17,7 +17,7 @@ body { line-height: normal; word-wrap: break-word; margin: 0; - padding: 12px 0; + padding: 0 0 12px; -webkit-print-color-adjust: exact; } @@ -151,12 +151,13 @@ a:hover { /* Main blocks ---------------------------------------- */ .wrap { - border: 1px solid transparent; - border-radius: 8px; + border: solid transparent; + border-width: 0 1px 1px; + border-radius: 0 0 8px 8px; min-width: 625px; max-width: 1152px; margin: 0 auto; - padding: 15px; + padding: 0 15px 15px; } .page-body { @@ -200,7 +201,9 @@ a:hover { /* Round cornered boxes and backgrounds ---------------------------------------- */ .headerbar { - border-radius: 7px; + background-image: url('images/lighter2.png'); + border-radius: 0 0 7px 7px; + background-size: cover; display: flex; flex-direction: column; margin-bottom: 0.5rem; @@ -212,6 +215,11 @@ a:hover { padding: 3px 10px; } +.headerbar .navbar { + background: none; + padding: calc(var(--ps-line-height) * 0.25) 5px calc(var(--ps-line-height) * 0.5); +} + .forabg { border-radius: 7px; clear: both; @@ -340,6 +348,10 @@ ul.linklist .dropdown-up .dropdown { bottom: 18px; } +ul.nav-breadcrumbs { + margin: var(--ps-line-height) 0; +} + /* Bulletin icons for list items ---------------------------------------- */ ul.linklist.bulletin > li:before { From 81c49aa6a526844f074b46d2b42cea453796e5c3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 20:18:40 +0200 Subject: [PATCH 3/8] [ticket/17501] Remove max width from subforums PHPBB-17501 --- phpBB/styles/prosilver/theme/responsive.css | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 80e605df62..ce5462455e 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -328,7 +328,6 @@ vertical-align: bottom; text-overflow: ellipsis; overflow: hidden; - max-width: 100px; } /* Pagination From b666bc9e0a3b6848d3d8b7bf156b6495bd9efedf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 20:33:36 +0200 Subject: [PATCH 4/8] [ticket/17501] Add to top button to viewtopic and add missing title in FAQ PHPBB-17501 --- phpBB/styles/prosilver/template/faq_body.html | 2 +- phpBB/styles/prosilver/template/viewtopic_body.html | 9 ++++++--- phpBB/styles/prosilver/theme/content.css | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html index 542e894c61..2a1c2dfd92 100644 --- a/phpBB/styles/prosilver/template/faq_body.html +++ b/phpBB/styles/prosilver/template/faq_body.html @@ -44,7 +44,7 @@
- + {{ Icon('font', 'chevron-up', '', false) }}
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 2031fa64dd..70bc764e06 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -423,9 +423,6 @@
- - {{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false, 'fas c-top-icon') }} -
@@ -496,6 +493,12 @@
+
+ + {{ Icon('font', 'chevron-up', '', false) }} + +
+ diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 7101aeee46..07a4ddb325 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -465,7 +465,7 @@ p.author { clear: left; overflow: hidden; width: 100%; - margin-top: calc(var(--ps-font-small) * 1.4); + margin: calc(var(--ps-font-small) * 1.4) 0; padding-top: 2px; } From 3a553f07bccc1805cadab30aed628bb65a91b739 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 20:36:04 +0200 Subject: [PATCH 5/8] [ticket/17501] Remove unused CSS properties PHPBB-17501 --- phpBB/styles/prosilver/theme/common.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 46edea7c04..909727132e 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -201,9 +201,7 @@ a:hover { /* Round cornered boxes and backgrounds ---------------------------------------- */ .headerbar { - background-image: url('images/lighter2.png'); border-radius: 0 0 7px 7px; - background-size: cover; display: flex; flex-direction: column; margin-bottom: 0.5rem; From 3801eb094633f20a0b546765a47d3f65b081d270 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 20:38:59 +0200 Subject: [PATCH 6/8] [ticket/17501] Remove not needed parentheses PHPBB-17501 --- phpBB/styles/prosilver/template/overall_header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index c35f0ab378..e12a1294bd 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -68,7 +68,7 @@ {% if NOTIFICATIONS_WEBPUSH_ENABLE %} - {% include('ucp_notifications_webpush.html') %} + {% include 'ucp_notifications_webpush.html' %} {% endif %} @@ -83,7 +83,7 @@