From 64dfb3fba91623eebfbf41a2164f7521f9ca2ee3 Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 16 Jul 2014 16:54:02 +0200 Subject: [PATCH 1/4] [ticket/12506] Reposition post-buttons for compact layout PHPBB3-12506 --- .../styles/prosilver/template/search_results.html | 2 +- .../prosilver/template/ucp_pm_viewmessage.html | 2 +- .../styles/prosilver/template/viewtopic_body.html | 2 +- phpBB/styles/prosilver/theme/bidi.css | 14 ++++++++++++++ phpBB/styles/prosilver/theme/buttons.css | 8 ++++++++ phpBB/styles/prosilver/theme/common.css | 1 + phpBB/styles/prosilver/theme/content.css | 10 +++++++++- phpBB/styles/prosilver/theme/responsive.css | 14 ++++++++++++++ 8 files changed, 49 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 47aa8d85de..86197af062 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -116,7 +116,7 @@ -
+
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 489c1c901a..fdedeb49b6 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -14,7 +14,7 @@ -
+
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index b764979f97..eafdcdb4de 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -120,7 +120,7 @@ data-url="{postrow.U_MINI_POST}"> -
+
style="display: none;"> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index d3594cc5bd..489ddee82c 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -459,6 +459,11 @@ li.breadcrumbs span:first-child > a { float: right; } +.rtl .has-profile .postbody h3 { + margin-right: 0; + margin-left: 180px; +} + .rtl p.post-notice { padding-left: 5px; padding-right: 26px; @@ -641,6 +646,11 @@ li.breadcrumbs span:first-child > a { float: left; } +.rtl .has-profile .post-buttons { + left: 0; + right: auto; +} + .rtl .post-buttons li { float: right; } @@ -1083,4 +1093,8 @@ li.breadcrumbs span:first-child > a { margin-left: 5px; margin-right: 0; } + + .rtl .has-profile .post-buttons { + left: 10px; + } } diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index b45aae5672..a08b49a81c 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -177,6 +177,14 @@ ul.linklist.bulletin > li.small-icon:before { margin-top: 2px; } +.has-profile .post-buttons { + float: none; + position: absolute; + margin: 0; + right: 0; + top: 5px; +} + .post-buttons > li { float: left; margin-right: 3px; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 54d81406e8..d68ac12ce0 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -303,6 +303,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { background-repeat: no-repeat; background-position: 100% 0; border-radius: 7px; + position: relative; } .inner:after { diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index a014f57d47..d025003ada 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -233,6 +233,7 @@ dd.option { line-height: 1.48em; width: 76%; float: left; + position: relative; } .postbody .ignore { @@ -249,7 +250,8 @@ dd.option { float: left; font-size: 1.5em; padding: 2px 0 0 0; - margin: 0 0 0.3em 0 !important; + margin-top: 0 !important; + margin-bottom: 0.3em !important; text-transform: none; border: none; font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; @@ -261,6 +263,12 @@ dd.option { vertical-align: bottom; } +.has-profile .postbody h3 { + /* If there is a post-profile, we position the post-buttons differently */ + float: none !important; + margin-right: 180px; +} + .postbody .content { font-size: 1.3em; overflow-x: auto; diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 241b4d132e..45514488f2 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -398,6 +398,10 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent { /* Post ----------------------------------------*/ +.postbody { + position: inherit; +} + .postprofile, .postbody, .search .postbody { display: block; width: auto; @@ -437,6 +441,16 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent { max-height: 32px; } +.has-profile .postbody h3 { + margin-left: 0 !important; + margin-right: 0 !important; +} + +.has-profile .post-buttons { + right: 10px; + top: 15px; +} + @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi), (min-resolution: 1.5dppx) { /* Scale online image for HD displays */ From 09e45fee8922ee23f4c7713fbda5a7932949b585 Mon Sep 17 00:00:00 2001 From: PayBas Date: Tue, 22 Jul 2014 10:27:24 +0200 Subject: [PATCH 2/4] [ticket/12506] Reposition buttons to make room for "online" banner PHPBB3-12506 --- phpBB/styles/prosilver/theme/bidi.css | 2 +- phpBB/styles/prosilver/theme/responsive.css | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 489ddee82c..aff9f02680 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -1095,6 +1095,6 @@ li.breadcrumbs span:first-child > a { } .rtl .has-profile .post-buttons { - left: 10px; + left: 20px; } } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 45514488f2..51b67dd398 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -447,16 +447,12 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent { } .has-profile .post-buttons { - right: 10px; + right: 20px; top: 15px; } -@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi), (min-resolution: 1.5dppx) -{ - /* Scale online image for HD displays */ - .online { - background-size: 40px; - } +.online { + background-size: 40px; } /* Misc stuff From 3522808528c86c1779915ecb5f973b4230700ec5 Mon Sep 17 00:00:00 2001 From: PayBas Date: Thu, 7 Aug 2014 17:11:13 +0200 Subject: [PATCH 3/4] [ticket/12506] Fix responsive profile min-height (no avatar) PHPBB3-12506 --- phpBB/styles/prosilver/theme/responsive.css | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 51b67dd398..c0193f9b1f 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -416,6 +416,7 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent { padding-bottom: 5px; margin: 0; margin-bottom: 5px; + min-height: 40px; overflow: hidden; } From 802232c90700db56be62c1dbac21eba1f4de0e10 Mon Sep 17 00:00:00 2001 From: PayBas Date: Thu, 7 Aug 2014 17:12:00 +0200 Subject: [PATCH 4/4] [ticket/12506] Fix search result h3 margin There are no buttons present, so don't need to do all this stuff. PHPBB3-12506 --- phpBB/styles/prosilver/template/search_results.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 86197af062..47aa8d85de 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -116,7 +116,7 @@ -
+