[ticket/16237] squash all commits

PHPBB3-16237

phpBB/styles/prosilver/theme/buttons.css

@@ -12,7 +12,11 @@
 	white-space: nowrap;
 	border: 1px solid transparent;
 	border-radius: 4px;
-	display: inline-block;
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+	box-sizing: border-box;
+	height: 24px;
 	padding: 2px 8px;
 	cursor: pointer;
 	touch-action: manipulation;
@@ -87,13 +91,6 @@
 	padding: 0;
 }
 
-.contact-icon {
-	background-repeat: no-repeat;
-	display: block;
-	width: 16px;
-	height: 16px;
-}
-
 .contact-icons a {
 	border-right: 1px dotted;
 	border-bottom: 1px dotted;
@@ -144,8 +141,9 @@
 	margin-right: 10px;
 }
 
-.post-buttons .button span {
-	font-size: 0;
+.post-buttons-label,
+.post-buttons-responsive-menu {
+	display: none;
 }
 
 /* Responsive buttons in post body */

phpBB/styles/prosilver/theme/colours.css

@@ -197,54 +197,108 @@ dl.details dd {
 }
 
 /* icon styles */
-.icon.icon-blue,
-a:hover .icon.icon-blue {
+.icon.icon-blue, /* DEPRECATED 4.0 */
+a:hover .icon.icon-blue, /* DEPRECATED 4.0 */
+.read {
 	color: #0059b3;
 }
 
-.icon.online {
+.icon.online, /* DEPRECATED 4.0 */
+.c-online-icon {
 	color: #85de39;
 }
 
-.icon.icon-green,
-a:hover .icon.icon-green {
+.icon.icon-green, /* DEPRECATED 4.0 */
+a:hover .icon.icon-green, /* DEPRECATED 4.0 */
+.c-topic-deleted-icon,
+.c-approved-icon {
 	color: #4db355;
 }
 
-.icon.icon-red,
-a:hover .icon.icon-red {
+.icon.icon-red, /* DEPRECATED 4.0 */
+a:hover .icon.icon-red, /* DEPRECATED 4.0 */
+.c-topic-reported-icon,
+.c-topic-unread-icon,
+.c-warning-icon,
+.c-unapproved-icon,
+.unread {
 	color: #d41142;
 }
 
-.icon.icon-orange,
-a:hover .icon.icon-orange {
+.icon.icon-orange, /* DEPRECATED 4.0 */
+a:hover .icon.icon-orange, /* DEPRECATED 4.0 */
+.c-forum-feed-icon {
 	color: #ff9500;
 }
 
-.icon.icon-bluegray,
+.icon.icon-bluegray, /* DEPRECATED 4.0 */
 a:hover .icon.icon-bluegray {
 	color: #47536b;
 }
 
-.icon.icon-gray,
-a:hover .icon.icon-gray {
+.icon.icon-gray, /* DEPRECATED 4.0 */
+a:hover .icon.icon-gray, /* DEPRECATED 4.0 */
+.c-top-icon {
 	color: #757575;
 }
 
-.icon.icon-lightgray,
-a:hover .icon.icon-lightgray {
+.icon.icon-lightgray, /* DEPRECATED 4.0 */
+a:hover .icon.icon-lightgray, /* DEPRECATED 4.0 */
+.c-last-post-icon,
+.c-topic-icon,
+.c-pagination-icon {
 	color: #9e9e9e;
 }
 
-.icon.icon-black,
-a:hover .icon.icon-black {
+.icon.icon-black, /* DEPRECATED 4.0 */
+a:hover .icon.icon-black, /* DEPRECATED 4.0 */
+.c-return-arrow-icon {
 	color: #212121;
 }
 
-.alert_close .icon:before {
+.button:hover .c-pagination-icon {
+	color: #ffffff;
+}
+
+.alert_close .icon:before, /* DEPRECATED 4.0 */
+.alert_close .o-icon:before {
 	background-color: #ffffff;
 }
 
+.row-item-link {
+	background-color: #0059b3;
+}
+
+.row-item-link.unread {
+	background-color: #d41142;
+}
+
+.c-forum-row-icon,
+.c-forum-row-icon:hover {
+	color: #ffffff;
+}
+
+/* brand icon colors */
+.c-facebook-icon {
+	color: #3b5998;
+}
+
+.c-twitter-icon {
+	color: #1da1f2;
+}
+
+.c-skype-icon {
+	color: #00aff0;
+}
+
+.c-youtube-icon {
+	color: #ff0000;
+}
+
+.c-colorless-icon {
+	color: inherit;
+}
+
 /* jumpbox */
 .jumpbox .dropdown li {
 	border-top-color: #dedede;
@@ -610,7 +664,8 @@ dd.profile-warnings {
 }
 
 .button .icon,
-.button-secondary {
+.button-secondary,
+.c-button-icon {
 	color: #9e9e9e;
 }
 
@@ -639,7 +694,8 @@ dd.profile-warnings {
 .button-secondary:focus,
 .button-secondary:hover,
 .button:focus .icon,
-.button:hover .icon {
+.button:hover .icon,
+.button:hover .c-button-icon {
 	color: #0077b3;
 }
 
@@ -684,6 +740,7 @@ dd.profile-warnings {
 
 .pagination li a:hover,
 .pagination li a:hover .icon,
+.pagination li a:hover .o-icon,
 .pagination .dropdown-visible a.dropdown-trigger,
 .nojs .pagination .dropdown-container:hover a.dropdown-trigger {
 	background: #2d80d2;
@@ -711,74 +768,6 @@ dd.profile-warnings {
 
 /*  icon images */
 .site_logo { background-image: url("./images/site_logo.svg"); }
-.contact-icon { background-image: url("./images/icons_contact.png"); }
-
-/* profile icons */
-.pm-icon { background-position: 0 0; }
-.email-icon { background-position: -21px 0; }
-.jabber-icon { background-position: -80px 0; }
-.phpbb_icq-icon { background-position: -61px 0; }
-.phpbb_wlm-icon { background-position: -182px 0; }
-.phpbb_aol-icon { background-position: -244px 0; }
-.phpbb_website-icon { background-position: -40px 0; }
-.phpbb_youtube-icon { background-position: -98px 0; }
-.phpbb_facebook-icon { background-position: -119px 0; }
-.phpbb_skype-icon { background-position: -161px 0; }
-.phpbb_twitter-icon { background-position: -203px 0; }
-.phpbb_yahoo-icon { background-position: -224px 0; }
-
-/* forum icons & topic icons */
-.global_read { background-image: url("./images/announce_read.gif"); }
-.global_read_mine { background-image: url("./images/announce_read_mine.gif"); }
-.global_read_locked { background-image: url("./images/announce_read_locked.gif"); }
-.global_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); }
-.global_unread { background-image: url("./images/announce_unread.gif"); }
-.global_unread_mine { background-image: url("./images/announce_unread_mine.gif"); }
-.global_unread_locked { background-image: url("./images/announce_unread_locked.gif"); }
-.global_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); }
-
-.announce_read { background-image: url("./images/announce_read.gif"); }
-.announce_read_mine { background-image: url("./images/announce_read_mine.gif"); }
-.announce_read_locked { background-image: url("./images/announce_read_locked.gif"); }
-.announce_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); }
-.announce_unread { background-image: url("./images/announce_unread.gif"); }
-.announce_unread_mine { background-image: url("./images/announce_unread_mine.gif"); }
-.announce_unread_locked { background-image: url("./images/announce_unread_locked.gif"); }
-.announce_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); }
-
-.forum_link { background-image: url("./images/forum_link.gif"); }
-.forum_read { background-image: url("./images/forum_read.gif"); }
-.forum_read_locked { background-image: url("./images/forum_read_locked.gif"); }
-.forum_read_subforum { background-image: url("./images/forum_read_subforum.gif"); }
-.forum_unread { background-image: url("./images/forum_unread.gif"); }
-.forum_unread_locked { background-image: url("./images/forum_unread_locked.gif"); }
-.forum_unread_subforum { background-image: url("./images/forum_unread_subforum.gif"); }
-
-.sticky_read { background-image: url("./images/sticky_read.gif"); }
-.sticky_read_mine { background-image: url("./images/sticky_read_mine.gif"); }
-.sticky_read_locked { background-image: url("./images/sticky_read_locked.gif"); }
-.sticky_read_locked_mine { background-image: url("./images/sticky_read_locked_mine.gif"); }
-.sticky_unread { background-image: url("./images/sticky_unread.gif"); }
-.sticky_unread_mine { background-image: url("./images/sticky_unread_mine.gif"); }
-.sticky_unread_locked { background-image: url("./images/sticky_unread_locked.gif"); }
-.sticky_unread_locked_mine { background-image: url("./images/sticky_unread_locked_mine.gif"); }
-
-.pm_read,
-.topic_read { background-image: url("./images/topic_read.gif"); }
-.topic_moved { background-image: url("./images/topic_moved.gif"); }
-.topic_read_mine { background-image: url("./images/topic_read_mine.gif"); }
-.topic_read_hot { background-image: url("./images/topic_read_hot.gif"); }
-.topic_read_hot_mine { background-image: url("./images/topic_read_hot_mine.gif"); }
-.topic_read_locked { background-image: url("./images/topic_read_locked.gif"); }
-.topic_read_locked_mine { background-image: url("./images/topic_read_locked_mine.gif"); }
-
-.pm_unread,
-.topic_unread { background-image: url("./images/topic_unread.gif"); }
-.topic_unread_mine { background-image: url("./images/topic_unread_mine.gif"); }
-.topic_unread_hot { background-image: url("./images/topic_unread_hot.gif"); }
-.topic_unread_hot_mine { background-image: url("./images/topic_unread_hot_mine.gif"); }
-.topic_unread_locked { background-image: url("./images/topic_unread_locked.gif"); }
-.topic_unread_locked_mine { background-image: url("./images/topic_unread_locked_mine.gif"); }
 
 /*	colours and backgrounds for cp.css */
 

phpBB/styles/prosilver/theme/common.css

@@ -172,37 +172,37 @@ a:hover {
 	margin-top: 20px;
 }
 
-.logo {
-	float: left;
-	width: auto;
-	padding: 10px 13px 0 10px;
+.c-hero {
+	display: inline-flex;
+	flex: 1;
+	flex-direction: row;
+	align-self: auto;
+	padding: 12px;
 }
 
-.logo:hover {
-	text-decoration: none;
+.c-hero-logo {
+	width: 150px;
+	padding-right: 16px;
 }
 
-.site_logo {
-	background-repeat: no-repeat;
-	display: inline-block;
+.c-hero-logo-img {
 	width: 149px;
 	height: 52px;
+	margin-top: 0;
 }
 
-/* Site description and logo */
-.site-description {
-	float: left;
-	width: 65%;
-}
-
-.site-description h1 {
-	margin-right: 0;
+.c-hero-heading {
+	flex: 1;
+	align-self: auto;
+	margin: 0;
 }
 
 /* Round cornered boxes and backgrounds
 ---------------------------------------- */
 .headerbar {
 	border-radius: 7px;
+	display: flex;
+	flex-direction: column;
 	margin-bottom: 4px;
 	padding: 5px;
 }
@@ -370,15 +370,6 @@ a.header-avatar img {
 	margin-bottom: 2px;
 }
 
-a.header-avatar span:after {
-	font: normal normal normal 14px/1 FontAwesome;
-	vertical-align: top;
-	display: inline-block;
-	padding-top: 2px;
-	padding-left: 6px;
-	content: "\f0dd";
-}
-
 /* Dropdown menu
 ---------------------------------------- */
 .dropdown-container {
@@ -401,7 +392,7 @@ a.header-avatar span:after {
 	border: 1px solid transparent;
 	border-radius: 5px;
 	position: absolute;
-	z-index: 2;
+	z-index: 201;
 	top: 1.2em;
 	left: 0;
 	display: none;
@@ -461,7 +452,7 @@ a.header-avatar span:after {
 }
 
 .dropdown .pointer {
-	z-index: 3;
+	z-index: 301;
 	top: -1px;
 	right: auto;
 	left: 10px;
@@ -493,7 +484,7 @@ a.header-avatar span:after {
 	border: 1px solid transparent;
 	border-radius: 5px;
 	position: relative;
-	z-index: 2;
+	z-index: 201;
 	overflow: hidden;
 	overflow-y: auto;
 	max-height: 300px;
@@ -947,7 +938,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
 }
 
 .pagination li.page-jump a {
-	padding: 0 8px;
+	padding: 2px;
 }
 
 .pagination li.page-jump a i {
@@ -974,6 +965,8 @@ fieldset.fields1 dl.pmlist dd.recipients {
 .row .pagination li span {
 	font-size: 9px;
 	border-radius: 2px;
+	width: 14px;
+	height: 17px;
 	padding: 1px 3px;
 }
 
@@ -982,7 +975,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
 .phpbb_alert {
 	border: 1px solid transparent;
 	position: fixed;
-	z-index: 50;
+	z-index: 601;
 	top: 150px;
 	right: 0;
 	left: 0;
@@ -994,8 +987,8 @@ fieldset.fields1 dl.pmlist dd.recipients {
 
 .phpbb_alert .alert_close {
 	float: right;
-	margin-top: -8px;
-	margin-right: -36px;
+	margin-top: 0;
+	margin-right: -22px;
 }
 
 .phpbb_alert p {
@@ -1019,14 +1012,14 @@ fieldset.fields1 dl.pmlist dd.recipients {
 
 .darkenwrapper {
 	position: relative;
-	z-index: 44;
+	z-index: 401;
 	display: none;
 }
 
 .darken {
 	opacity: 0.5;
 	position: fixed;
-	z-index: 45;
+	z-index: 501;
 	top: 0;
 	left: 0;
 	width: 100%;
@@ -1035,7 +1028,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
 
 .loading_indicator {
 	position: fixed;
-	z-index: 51;
+	z-index: 701;
 	top: 50%;
 	left: 50%;
 	display: none;
@@ -1240,7 +1233,7 @@ ul.linklist:after,
 }
 
 .dropdown-extended {
-	z-index: 1;
+	z-index: 201;
 	display: none;
 }
 

phpBB/styles/prosilver/theme/content.css

@@ -55,6 +55,7 @@ ul.topiclist.two-columns dt {
 }
 
 ul.topiclist dt .list-inner {
+	line-height: 16px;
 	margin-right: 440px;
 	padding-right: 5px;
 	padding-left: 5px;
@@ -196,23 +197,7 @@ dl.row-item dd {
 	min-height: 35px;
 }
 
-dl.row-item dt a {
-	display: inline;
-}
-
-/* topic row icon links */
-dl a.row-item-link {
-	position: absolute;
-	top: 50%;
-	left: 0;
-	display: block;
-	width: 30px;
-	height: 30px;
-	margin-top: -15px;
-	margin-left: 9px;
-	padding: 0;
-}
-
+/* topic row links */
 dd.posts,
 dd.topics,
 dd.views,
@@ -268,6 +253,10 @@ dd.moderation > span {
 	padding-left: 5px;
 }
 
+dd.lastpost > span {
+	line-height: 16px;
+}
+
 dd.extra,
 dd.mark {
 	line-height: 24px;
@@ -754,6 +743,7 @@ fieldset.polls dd div {
 /* Poster profile block
 ---------------------------------------- */
 .postprofile {
+	line-height: 16px;
 	border: 1px solid transparent;
 	border-width: 0 0 0 1px;
 	float: right;
@@ -765,7 +755,7 @@ fieldset.polls dd div {
 .postprofile dd,
 .postprofile dt {
 	font-size: 10px;
-	line-height: 12px;
+	line-height: 16px;
 	margin-left: 8px;
 }
 

phpBB/styles/prosilver/theme/cp.css

@@ -357,10 +357,6 @@ ol.def-rules li {
 	padding: 5px;
 }
 
-.cplist .topictitle {
-	line-height: 30px;
-}
-
 p.notification-title,
 p.notification-forum,
 p.notification-reason,

phpBB/styles/prosilver/theme/forms.css

@@ -374,10 +374,8 @@ input.disabled {
 --------------------------------------------- */
 .search-header {
 	border-radius: 4px;
-	display: block;
 	float: right;
-	margin-top: 30px;
-	margin-right: 5px;
+	margin: 16px;
 }
 
 .search-header .inputbox {

phpBB/styles/prosilver/theme/icons.css

@@ -5,92 +5,47 @@
 /* Global module setup
 ---------------------------------------- */
 
-/* Renamed version of .fa class for agnostic usage of icon fonts.
- * Just change the name of the font after the 14/1 to the name of
- * the font you wish to use.
- */
-.icon,
-.button .icon,
-blockquote cite:before,
-.uncited:before {
-	font-family: FontAwesome;
+/* Globaly fix svg colors */
+svg {
+	fill: currentColor;
+}
+
+.o-icon {
+	vertical-align: middle !important;
+	width: 14px;
+	height: 14px;
+	margin-top: -4px;
+}
+
+.o-icon-src-mdi,
+.o-icon-src-ic {
+	width: 18px;
+	height: 18px;
+}
+
+.o-icon-font {
+	font-family: "Font Awesome 5 Free", "Font Awesome 5 Brands";
 	font-size: 14px;
 	font-weight: normal;
 	font-style: normal;
 	font-variant: normal;
+	-webkit-font-smoothing: antialiased;
 	line-height: 1;
+	vertical-align: baseline;
 	display: inline-block;
 	/* stylelint-disable order/properties-order */
 	-moz-osx-font-smoothing: grayscale;
-	-webkit-font-smoothing: antialiased;
 	/* stylelint-enable order/properties-order */
 	text-rendering: auto; /* optimizelegibility throws things off #1094 */
 }
 
-.icon:before {
-	padding-right: 2px;
+.o-icon + span,
+span + .o-icon {
+	padding-left: 4px;
 }
 
-.button .icon:before {
-	padding-right: 0;
-}
-
-/* Icon size classes - Default size is 14px, use these for small variations */
-
-.icon.icon-xl {
-	font-size: 20px;
-}
-
-.icon.icon-lg {
-	font-size: 16px;
-}
-
-.icon.icon-md {
-	font-size: 10px;
-}
-
-.icon.icon-sm {
-	font-size: 8px;
-}
-
-/* icon modifiers */
-.icon-tiny {
-	font-size: 16px;
-	vertical-align: text-bottom;
-	width: 12px;
-	-webkit-transform: scale(0.65, 0.75);
-	transform: scale(0.65, 0.75);
-}
-
-.arrow-right .icon {
-	float: right;
-}
-
-.arrow-left:hover .icon {
-	margin-right: 5px;
-	margin-left: -5px;
-}
-
-.arrow-left .icon {
-	float: left;
-}
-
-.arrow-right:hover .icon {
-	margin-right: -5px;
-	margin-left: 5px;
-}
-
-.post-buttons .dropdown-contents .icon {
-	float: right;
-	margin-left: 5px;
-}
-
-.alert_close .icon:before {
-	border-radius: 50%;
-	display: block;
-	width: 11px;
-	height: 12px;
-	padding: 0;
+.o-icon.o-icon-src-mdi + span {
+	padding-left: 2px;
 }
 
 blockquote cite:before,
@@ -102,3 +57,66 @@ blockquote cite:before,
 .rtl .uncited:before {
 	content: "\f10e"; /* Font Awesome quote-right */
 }
+
+.c-forum-row-icon,
+.c-notification-check-icon {
+	width: 20px;
+	height: 20px;
+	margin-top: 0;
+}
+
+.row-item-link {
+	border-radius: 50%;
+	position: absolute;
+	top: 50%;
+	left: 0;
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+	width: 32px;
+	height: 32px;
+	margin-top: -17px;
+	margin-left: 9px;
+}
+
+.row-item-link-mine {
+	background-color: #b353c6;
+	border: 2px solid #ffffff;
+	border-radius: 50%;
+	position: absolute;
+	z-index: 101;
+	left: 32px;
+	display: block;
+	float: left;
+	width: 8px;
+	height: 8px;
+}
+
+.row-item-sub {
+	position: absolute;
+	z-index: 101;
+	bottom: 3px;
+	left: 4px;
+	display: block;
+	float: left;
+	width: 16px;
+	height: 16px;
+}
+
+.alert_close .o-icon {
+	width: 18px;
+	height: 18px;
+}
+
+/* Contact icons
+---------------------------------------- */
+.contact-icon {
+	background-repeat: no-repeat;
+	display: block;
+	width: 24px;
+	height: 24px;
+}
+
+.c-button-icon {
+	margin-top: 0;
+}

phpBB/styles/prosilver/theme/links.css

@@ -41,7 +41,7 @@ th a:hover {
 	background-position: center center;
 	border-radius: 3px 0 0 3px;
 	position: absolute;
-	z-index: 2;
+	z-index: 301;
 	top: 50%;
 	right: 0;
 	display: none;
@@ -158,7 +158,6 @@ a.lastsubject:hover {
 .back2top .top {
 	float: right;
 	margin-top: 0;
-	margin-right: -10px;
 }
 
 /* Arrow links  */
@@ -205,3 +204,11 @@ a.feed-icon-forum {
 a.anchor {
 	display: block;
 }
+
+.c-subscribe-action {
+	display: none !important;
+}
+
+.c-subscribe-action.is-active {
+	display: inline-block !important;
+}

phpBB/styles/prosilver/theme/responsive.css

@@ -581,10 +581,42 @@
 		margin-left: 0 !important;
 	}
 
+	/* post-buttons */
+
 	.has-profile .post-buttons {
 		margin: 5px;
 	}
 
+	.post-buttons > li > a {
+		display: none;
+	}
+
+	.post-buttons-responsive-menu,
+	.post-button-responsive,
+	.post-buttons-responsive-menu .post-buttons-label {
+		display: block !important;
+	}
+
+	.post-buttons-responsive-menu .dropdown-contents .button {
+		font-weight: normal;
+		line-height: inherit;
+		background: none;
+		border: none;
+		box-shadow: none;
+		color: #0f4d8a;
+		display: flex;
+	}
+
+	.post-buttons-responsive-menu .dropdown-contents .button:hover {
+		text-decoration: underline;
+		color: #d41142;
+	}
+
+	.post-buttons-responsive-menu .dropdown-contents .c-button-icon {
+		color: inherit;
+		padding-right: 5px;
+	}
+
 	/* Misc stuff
 	---------------------------------------------------------------- */
 	h2 {

phpBB/styles/prosilver/theme/stylesheet.css

@@ -10,7 +10,9 @@
 @import url("normalize.css?hash=e6c08715");
 @import url("base.css?hash=9b6738c8");
 @import url("utilities.css?hash=b95e1ad4");
+@import url("icons.css?hash=2fcf49a1");
 @import url("common.css?hash=fe09f059");
+@import url("buttons.css?hash=f4e39187");
 @import url("links.css?hash=5fc8ca41");
 @import url("content.css?hash=0daf1369");
 @import url("buttons.css?hash=f4e39187");