From f724017953c717d4dc6d6aa34fed73d92671db8e Mon Sep 17 00:00:00 2001 From: hanakin Date: Sun, 5 Feb 2017 18:13:47 -0500 Subject: [PATCH 1/3] [ticket/15071] Consolidate all media queries PHPBB3-15071 --- phpBB/styles/prosilver/theme/bidi.css | 161 ------------------------ phpBB/styles/prosilver/theme/common.css | 12 -- 2 files changed, 173 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 3bae936adb..83c048ece8 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -761,17 +761,6 @@ li.breadcrumbs span:first-child > a { text-align: right; } -/* Responsive *CP navigation ----------------------------------------- */ - -@media only screen and (max-width: 900px), only screen and (max-device-width: 900px) { - .rtl .cp-menu, - .rtl .navigation, - .rtl .cp-main { - float: none; - } -} - /* UCP navigation menu ---------------------------------------- */ @@ -822,17 +811,6 @@ li.breadcrumbs span:first-child > a { float: right; } -/* Responsive *CP navigation ----------------------------------------- */ - -@media only screen and (max-width: 900px), only screen and (max-device-width: 900px) { - .rtl .cp-menu, - .rtl .navigation, - .rtl .cp-main { - float: none; - } -} - /** * forms.css */ @@ -1006,144 +984,5 @@ li.breadcrumbs span:first-child > a { float: left; } -/** -* responsive.css -*/ - -@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) { - /* .topiclist lists - ---------------------------------------- */ - .rtl ul.topiclist li.header dt, - .rtl ul.topiclist li.header dt .list-inner { - margin-left: 0 !important; - padding-left: 0; - } - - .rtl ul.topiclist dt, - .rtl ul.topiclist dt .list-inner, - .rtl ul.topiclist.missing-column dt, - .rtl ul.topiclist.missing-column dt .list-inner, - .rtl ul.topiclist.two-long-columns dt, - .rtl ul.topiclist.two-long-columns dt .list-inner, - .rtl ul.topiclist.two-columns dt, - .rtl ul.topiclist.two-columns dt .list-inner { - margin-left: 0; - } - - .rtl ul.topiclist dt .list-inner.with-mark { - padding-left: 34px; - } - - /* Forums and topics lists - ---------------------------------------- */ - .rtl ul.topiclist.forums dt { - margin-left: -250px; - } - - .rtl ul.topiclist.forums dt .list-inner { - margin-left: 250px; - } - - .rtl ul.topiclist dd.mark { - text-align: right; - right: auto; - left: 5px; - } - - .rtl table.responsive.show-header thead, - .rtl table.responsive.show-header th:first-child { - text-align: right !important; - } - - .rtl table.responsive td { - text-align: right !important; - } - - /* User profile - ---------------------------------------- */ - .rtl .column1, - .rtl .column2, - .rtl .left-box.profile-details { - float: none; - } - - /* Post - ---------------------------------------- */ - .rtl .postprofile, - .rtl .postbody, - .rtl .search .postbody { - float: none; - } - - .rtl .post .postprofile { - border-width: 0 0 1px; - } - - .rtl .postprofile dt, - .rtl .postprofile dd.profile-rank, - .rtl .search .postprofile dd { - margin: 0; - } - - .rtl .postprofile .avatar { - margin-right: 0; - margin-left: 5px; - } - - .rtl .has-profile .post-buttons { - left: 20px; - } - - /* Forms - ---------------------------------------- */ - .rtl fieldset dt, - .rtl fieldset.fields1 dt, - .rtl fieldset.fields2 dt { - float: none; - } - - .rtl fieldset dd, - .rtl fieldset.fields1 dd, - .rtl fieldset.fields2 dd { - margin-right: 20px; - } -} - -@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) { - /* .topiclist lists - ---------------------------------------- */ - .rtl ul.topiclist.forums dt { - margin-left: 0; - } - - .rtl ul.topiclist.forums dt .list-inner { - margin-left: 0; - } -} - -@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) { - .rtl dl.details dt, - .rtl dl.details dd { - text-align: right; - float: none; - } - - .rtl dl.details dd { - margin-right: 20px; - margin-left: 0; - } - - .captcha-panel dd.captcha { - margin-right: 0; - } - - .rtl p.responsive-center { - text-align: center; - float: none; - margin-bottom: 5px; - } -} - -/* stylelint-enable selector-max-compound-selectors */ /* stylelint-enable selector-no-qualifying-type */ /* stylelint-enable declaration-property-unit-whitelist */ diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 37811d92bf..b23ba358d2 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -161,12 +161,6 @@ a:hover { padding: 15px; } -@media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) { - .wrap { - margin: 0 12px; - } -} - .page-body { clear: both; margin: 4px 0; @@ -991,12 +985,6 @@ fieldset.fields1 dl.pmlist dd.recipients { padding: 0 25px 20px; } -@media only screen and (max-height: 500px), only screen and (max-device-width: 500px) { - .phpbb_alert { - top: 25px; - } -} - .phpbb_alert .alert_close { float: right; margin-top: -8px; From 98479f235bec6043e4c25bce1ba8be74234ca8ef Mon Sep 17 00:00:00 2001 From: hanakin Date: Sun, 30 Apr 2017 10:25:51 -0400 Subject: [PATCH 2/3] [ticket/15071] Fix cahnges PHPBB3-15071 --- phpBB/styles/prosilver/theme/bidi.css | 4 +- phpBB/styles/prosilver/theme/colours.css | 12 +- phpBB/styles/prosilver/theme/cp.css | 41 ---- phpBB/styles/prosilver/theme/icons.css | 1 - phpBB/styles/prosilver/theme/responsive.css | 196 ++++++++++++++++++++ 5 files changed, 203 insertions(+), 51 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 83c048ece8..41520f0164 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -538,13 +538,13 @@ li.breadcrumbs span:first-child > a { margin: 0.5em 25px 0 1px; } +/* Nested quotes */ .rtl blockquote blockquote { - /* Nested quotes */ margin: 0.5em 15px 0 1px; } +/* Username/source of quoter */ .rtl blockquote cite { - /* Username/source of quoter */ margin-left: 0; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 28ce9f89fc..11090c0e77 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -73,6 +73,11 @@ th a:hover { color: #164069; } +.signature a, +.signature a:hover { + background-color: transparent; +} + /* back to top of page */ .top i { color: #9e9e9e; @@ -865,13 +870,6 @@ ul.cplist { color: #d41142; } -@media only screen and (max-width: 900px), only screen and (max-device-width: 900px) { - .navigation a, - .rtl .navigation a { - background: #aab9c0; - } -} - /* preferences pane layout */ .panel-container h2 { color: #212121; diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index a36ef877d4..6d197df9c0 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -353,47 +353,6 @@ ol.def-rules li { padding: 5px; } -/* Responsive *CP navigation ----------------------------------------- */ - -@media only screen and (max-width: 900px), only screen and (max-device-width: 900px) { - .nojs .tabs a span, - .nojs .minitabs a span { - letter-spacing: -0.5px; - text-overflow: ellipsis; - overflow: hidden; - max-width: 40px; - } - - .cp-menu, - .navigation, - .cp-main { - float: none; - width: auto; - margin: 0; - } - - .navigation { - max-width: 320px; - margin: 0 auto; - padding: 0; - } - - .navigation a { - background-image: none; - } - - .navigation li:first-child a { - border-top-left-radius: 5px; - border-top-right-radius: 5px; - } - - .navigation li:last-child a { - border-bottom-right-radius: 5px; - border-bottom-left-radius: 5px; - } -} - /* stylelint-enable selector-max-compound-selectors */ /* stylelint-enable selector-no-qualifying-type */ /* stylelint-enable declaration-property-unit-whitelist */ diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index f52637c3ee..18447171f0 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -103,4 +103,3 @@ blockquote cite:before, .rtl .uncited:before { content: "\f10e"; /* Font Awesome quote-right */ } - diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 5d0aa250b4..6355fed984 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -79,6 +79,10 @@ margin-bottom: 5px; } + .phpbb_alert { + top: 25px; + } + .action-bar > div { margin-bottom: 5px; } @@ -111,6 +115,21 @@ .quick-links .dropdown-trigger span { display: none; } + + .rtl dl.details dt, + .rtl dl.details dd { + text-align: right; + float: none; + } + + .rtl dl.details dd { + margin-right: 20px; + margin-left: 0; + } + + .rtl .captcha-panel dd.captcha { + margin-right: 0; + } } @media (max-width: 550px) { @@ -125,6 +144,18 @@ ul.topiclist.forums dd.lastpost { display: none; } + + /* RTL */ + + /* .topiclist lists + ---------------------------------------- */ + .rtl ul.topiclist.forums dt { + margin-left: 0; + } + + .rtl ul.topiclist.forums dt .list-inner { + margin-left: 0; + } } @media (max-width: 700px) { @@ -600,6 +631,105 @@ .attach-comment dfn { width: 100%; } + + /* RTL */ + + /* .topiclist lists + ---------------------------------------- */ + .rtl ul.topiclist li.header dt, + .rtl ul.topiclist li.header dt .list-inner { + margin-left: 0 !important; + padding-left: 0; + } + + .rtl ul.topiclist dt, + .rtl ul.topiclist dt .list-inner, + .rtl ul.topiclist.missing-column dt, + .rtl ul.topiclist.missing-column dt .list-inner, + .rtl ul.topiclist.two-long-columns dt, + .rtl ul.topiclist.two-long-columns dt .list-inner, + .rtl ul.topiclist.two-columns dt, + .rtl ul.topiclist.two-columns dt .list-inner { + margin-left: 0; + } + + .rtl ul.topiclist dt .list-inner.with-mark { + padding-left: 34px; + } + + /* Forums and topics lists + ---------------------------------------- */ + .rtl ul.topiclist.forums dt { + margin-left: -250px; + } + + .rtl ul.topiclist.forums dt .list-inner { + margin-left: 250px; + } + + .rtl ul.topiclist dd.mark { + text-align: right; + right: auto; + left: 5px; + } + + .rtl table.responsive.show-header thead, + .rtl table.responsive.show-header th:first-child { + text-align: right !important; + } + + .rtl table.responsive td { + text-align: right !important; + } + + /* User profile + ---------------------------------------- */ + .rtl .column1, + .rtl .column2, + .rtl .left-box.profile-details { + float: none; + } + + /* Post + ---------------------------------------- */ + .rtl .postprofile, + .rtl .postbody, + .rtl .search .postbody { + float: none; + } + + .rtl .post .postprofile { + border-width: 0 0 1px; + } + + .rtl .postprofile dt, + .rtl .postprofile dd.profile-rank, + .rtl .search .postprofile dd { + margin: 0; + } + + .rtl .postprofile .avatar { + margin-right: 0; + margin-left: 5px; + } + + .rtl .has-profile .post-buttons { + left: 20px; + } + + /* Forms + ---------------------------------------- */ + .rtl fieldset dt, + .rtl fieldset.fields1 dt, + .rtl fieldset.fields2 dt { + float: none; + } + + .rtl fieldset dd, + .rtl fieldset.fields1 dd, + .rtl fieldset.fields2 dd { + margin-right: 20px; + } } @media (min-width: 700px) { @@ -636,6 +766,72 @@ } } +@media (max-width: 992px) { + .row .pagination { + text-align: left; + float: left; + margin-top: 4px; + margin-bottom: 4px; + } +} + +/* Responsive *CP navigation +---------------------------------------- */ +@media (max-width: 900px) { + .nojs .tabs a span, + .nojs .minitabs a span { + letter-spacing: -0.5px; + text-overflow: ellipsis; + overflow: hidden; + max-width: 40px; + } + + .cp-menu, + .navigation, + .cp-main { + float: none; + width: auto; + margin: 0; + } + + .navigation { + max-width: 320px; + margin: 0 auto; + padding: 0; + } + + .navigation a { + background-image: none; + } + + .navigation li:first-child a { + border-top-left-radius: 5px; + border-top-right-radius: 5px; + } + + .navigation li:last-child a { + border-bottom-right-radius: 5px; + border-bottom-left-radius: 5px; + } + + .rtl .cp-menu, + .rtl .navigation, + .rtl .cp-main { + float: none; + } + + .navigation a, + .rtl .navigation a { + background: #b2c2cf; + } +} + +@media (max-width: 1220px) { + .wrap { + margin: 0 12px; + } +} + /* stylelint-enable selector-max-compound-selectors */ /* stylelint-enable selector-no-qualifying-type */ /* stylelint-enable declaration-property-unit-whitelist */ From ad67efecfa6afc20d9c411a945968048b3b17575 Mon Sep 17 00:00:00 2001 From: Michael Miday Date: Sat, 23 Sep 2017 11:32:02 -0400 Subject: [PATCH 3/3] [ticket/15071] Tweak order PHPBB3-15071 --- phpBB/styles/prosilver/theme/responsive.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 6355fed984..d1a78cea25 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -766,15 +766,6 @@ } } -@media (max-width: 992px) { - .row .pagination { - text-align: left; - float: left; - margin-top: 4px; - margin-bottom: 4px; - } -} - /* Responsive *CP navigation ---------------------------------------- */ @media (max-width: 900px) { @@ -826,6 +817,15 @@ } } +@media (max-width: 992px) { + .row .pagination { + text-align: left; + float: left; + margin-top: 4px; + margin-bottom: 4px; + } +} + @media (max-width: 1220px) { .wrap { margin: 0 12px;