mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-18 06:21:19 +02:00
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_queue.php phpBB/includes/search/fulltext_mysql.php phpBB/includes/search/fulltext_native.php phpBB/includes/search/fulltext_postgres.php phpBB/includes/search/fulltext_sphinx.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ajax.js
This commit is contained in:
Joas Schilling
@@ -14,40 +14,57 @@
|
||||
.buttons div {
|
||||
float: left;
|
||||
margin: 0 5px 0 0;
|
||||
background-position: 0 100%;
|
||||
}
|
||||
|
||||
/* Rolloff state */
|
||||
.buttons div a {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-position: 0 0;
|
||||
display: inline-block;
|
||||
line-height: 17.5px;
|
||||
height: 18px;
|
||||
font-size: 13px;
|
||||
white-space: nowrap;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 4px;
|
||||
background: transparent none 0 0 repeat-x;
|
||||
padding: 2px 22px 2px 8px;
|
||||
font-family: Verdana, Arial, Helvetica;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
text-decoration: none !important;
|
||||
outline-style: none !important;
|
||||
vertical-align: bottom;
|
||||
*padding-right: 8px;
|
||||
}
|
||||
|
||||
/* Hide <a> text and hide off-state image when rolling over (prevents flicker in IE) */
|
||||
/*.buttons div span { display: none; }*/
|
||||
/*.buttons div a:hover { background-image: none; }*/
|
||||
.buttons div span { position: absolute; width: 100%; height: 100%; cursor: pointer;}
|
||||
.buttons div a:hover span { background-position: 0 100%; }
|
||||
.buttons div span { display: none; }
|
||||
|
||||
.buttons div a:after {
|
||||
content: '';
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
right: 6px;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
margin-top: -6px;
|
||||
background: transparent 0 0 no-repeat;
|
||||
}
|
||||
|
||||
.buttons div a:hover:after {
|
||||
background-position: 0 -20px;
|
||||
}
|
||||
|
||||
/* Big button images */
|
||||
.reply-icon span { background: transparent none 0 0 no-repeat; }
|
||||
.post-icon span { background: transparent none 0 0 no-repeat; }
|
||||
.locked-icon span { background: transparent none 0 0 no-repeat; }
|
||||
.pmreply-icon span { background: none 0 0 no-repeat; }
|
||||
.newpm-icon span { background: none 0 0 no-repeat; }
|
||||
.forwardpm-icon span { background: none 0 0 no-repeat; }
|
||||
.buttons div.reply-icon a:after, .buttons div.pmreply-icon a:after { background-position: -20px 0; }
|
||||
.buttons div.reply-icon a:hover:after, .buttons div.pmreply-icon a:hover:after { background-position: -20px -20px; }
|
||||
|
||||
/* Set big button dimensions */
|
||||
.buttons div.reply-icon { width: 96px; height: 25px; }
|
||||
.buttons div.post-icon { width: 96px; height: 25px; }
|
||||
.buttons div.locked-icon { width: 88px; height: 25px; }
|
||||
.buttons div.pmreply-icon { width: 96px; height: 25px; }
|
||||
.buttons div.newpm-icon { width: 84px; height: 25px; }
|
||||
.buttons div.forwardpm-icon { width: 96px; height: 25px; }
|
||||
.buttons div.post-icon a:after, .buttons div.newpm-icon a:after { background-position: 0 0; }
|
||||
.buttons div.post-icon a:hover:after, .buttons div.newpm-icon a:hover:after { background-position: 0 -20px; }
|
||||
|
||||
.buttons div.locked-icon a:after { background-position: -60px 0; }
|
||||
.buttons div.locked-icon a:hover:after { background-position: -60px -20px; }
|
||||
|
||||
.buttons div.forwardpm-icon a:after { background-position: -40px 0; }
|
||||
.buttons div.forwardpm-icon a:hover:after { background-position: -40px -20px; }
|
||||
|
||||
/* Sub-header (navigation bar)
|
||||
--------------------------------------------- */
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/*
|
||||
/*
|
||||
--------------------------------------------------------------
|
||||
Colours and backgrounds for common.css
|
||||
-------------------------------------------------------------- */
|
||||
@@ -65,7 +65,7 @@ hr {
|
||||
|
||||
.panel {
|
||||
background-color: #ECF1F3;
|
||||
color: #28313F;
|
||||
color: #28313F;
|
||||
}
|
||||
|
||||
.post:target .content {
|
||||
@@ -219,7 +219,7 @@ p.rules {
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
--------------------------------------------------------------
|
||||
Colours and backgrounds for links.css
|
||||
-------------------------------------------------------------- */
|
||||
@@ -312,7 +312,7 @@ a.topictitle:active {
|
||||
color: #105289;
|
||||
}
|
||||
|
||||
/* Profile searchresults */
|
||||
/* Profile searchresults */
|
||||
.search .postprofile a {
|
||||
color: #105289;
|
||||
}
|
||||
@@ -349,7 +349,7 @@ a.arrow-right:hover {
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
/*
|
||||
--------------------------------------------------------------
|
||||
Colours and backgrounds for content.css
|
||||
-------------------------------------------------------------- */
|
||||
@@ -644,19 +644,11 @@ fieldset.polls dd div {
|
||||
background-image: url("./en/icon_user_online.gif");
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
--------------------------------------------------------------
|
||||
Colours and backgrounds for buttons.css
|
||||
-------------------------------------------------------------- */
|
||||
|
||||
/* Big button images */
|
||||
.reply-icon span { background-image: url("./en/button_topic_reply.gif"); }
|
||||
.post-icon span { background-image: url("./en/button_topic_new.gif"); }
|
||||
.locked-icon span { background-image: url("./en/button_topic_locked.gif"); }
|
||||
.pmreply-icon span { background-image: url("./en/button_pm_reply.gif") ;}
|
||||
.newpm-icon span { background-image: url("./en/button_pm_new.gif") ;}
|
||||
.forwardpm-icon span { background-image: url("./en/button_pm_forward.gif") ;}
|
||||
|
||||
a.print {
|
||||
background-image: url("./images/icon_print.gif");
|
||||
}
|
||||
@@ -665,6 +657,33 @@ a.sendemail {
|
||||
background-image: url("./images/icon_sendemail.gif");
|
||||
}
|
||||
|
||||
.buttons div a {
|
||||
border-color: #C7C3BF;
|
||||
background-color: #FFFFFF;
|
||||
background-image: -moz-linear-gradient(top, #FFFFFF, #E9E9E9);
|
||||
background-image: -webkit-linear-gradient(top, #FFFFFF, #E9E9E9);
|
||||
background-image: -o-linear-gradient(top, #FFFFFF, #E9E9E9);
|
||||
background-image: linear-gradient(to bottom, #FFFFFF, #E9E9E9);
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#FFFFFF', EndColorStr='#E9E9E9')";
|
||||
box-shadow: 0 0 0 1px #FFFFFF inset;
|
||||
-webkit-box-shadow: 0 0 0 1px #FFFFFF inset;
|
||||
color: #BC2A4D !important;
|
||||
}
|
||||
|
||||
.buttons div a:hover {
|
||||
border-color: #0a8ed0;
|
||||
background-image: -moz-linear-gradient(top, #E9E9E9, #FFFFFF);
|
||||
background-image: -webkit-linear-gradient(top, #E9E9E9, #FFFFFF);
|
||||
background-image: -o-linear-gradient(top, #E9E9E9, #FFFFFF);
|
||||
background-image: linear-gradient(to bottom, #E9E9E9, #FFFFFF);
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#E9E9E9', EndColorStr='#FFFFFF')";
|
||||
text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 77, 0.2);
|
||||
}
|
||||
|
||||
.buttons div a:after {
|
||||
background-image: url("images/buttons.png");
|
||||
}
|
||||
|
||||
/* Icon images
|
||||
---------------------------------------- */
|
||||
.sitehome { background-image: url("./images/icon_home.gif"); }
|
||||
@@ -752,7 +771,7 @@ a.sendemail {
|
||||
.pm_read { background-image: url("./images/topic_read.gif"); }
|
||||
.pm_unread { background-image: url("./images/topic_unread.gif"); }
|
||||
|
||||
/*
|
||||
/*
|
||||
--------------------------------------------------------------
|
||||
Colours and backgrounds for cp.css
|
||||
-------------------------------------------------------------- */
|
||||
@@ -921,7 +940,7 @@ dl.mini dt {
|
||||
background-color: #EEE;
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
--------------------------------------------------------------
|
||||
Colours and backgrounds for forms.css
|
||||
-------------------------------------------------------------- */
|
||||
@@ -976,7 +995,7 @@ fieldset.quick-login input.inputbox {
|
||||
/* Input field styles
|
||||
---------------------------------------- */
|
||||
.inputbox {
|
||||
background-color: #FFFFFF;
|
||||
background-color: #FFFFFF;
|
||||
border-color: #B4BAC0;
|
||||
color: #333333;
|
||||
}
|
||||
@@ -1044,3 +1063,40 @@ input.disabled {
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
#notification_list {
|
||||
background-color: #FFFFFF;
|
||||
border-color: #B9B9B9;
|
||||
}
|
||||
|
||||
#notification_list ul li {
|
||||
border-bottom-color: #B9B9B9;
|
||||
}
|
||||
|
||||
#notification_list ul li:hover {
|
||||
background-color: #CFE1F6;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#notification_list > .header, .notification_list > .footer {
|
||||
border-color: #B9B9B9;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#notification_list > .header {
|
||||
background: #F1F8FF;
|
||||
background: -moz-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F1F8FF), color-stop(100%, #CADCEB));
|
||||
background: -webkit-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
|
||||
background: -o-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
|
||||
background: -ms-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
|
||||
background: linear-gradient(to bottom, #F1F8FF 0%, #CADCEB 100%);
|
||||
}
|
||||
|
||||
.notification_list .pointer {
|
||||
border-bottom-color: #B9B9B9;
|
||||
}
|
||||
|
||||
.notification_list .pointer_inner {
|
||||
border-bottom-color: #F1F8FF;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ b, u, i, center,
|
||||
dl, dt, dd, ol, ul, li,
|
||||
fieldset, form, label, legend,
|
||||
table, caption, tbody, tfoot, thead, tr, th, td,
|
||||
article, aside, canvas, details, embed,
|
||||
figure, figcaption, footer, header, hgroup,
|
||||
article, aside, canvas, details, embed,
|
||||
figure, figcaption, footer, header, hgroup,
|
||||
menu, nav, output, ruby, section, summary,
|
||||
time, mark, audio, video {
|
||||
margin: 0;
|
||||
@@ -21,7 +21,7 @@ time, mark, audio, video {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
/* HTML5 display-role reset for older browsers */
|
||||
article, aside, details, figcaption, figure,
|
||||
article, aside, details, figcaption, figure,
|
||||
footer, header, hgroup, menu, nav, section {
|
||||
display: block;
|
||||
}
|
||||
@@ -164,7 +164,7 @@ ul ul, ol ul {
|
||||
|
||||
ol ol ul, ol ul ul, ul ol ul, ul ul ul {
|
||||
list-style-type: square;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Main blocks
|
||||
@@ -672,3 +672,111 @@ p.rules a {
|
||||
.smilies {
|
||||
vertical-align: text-bottom;
|
||||
}
|
||||
|
||||
#notification_list {
|
||||
display: none;
|
||||
position: absolute;
|
||||
width: 330px;
|
||||
z-index: 1;
|
||||
border: 1px solid;
|
||||
box-shadow: 3px 3px 5px darkgray;
|
||||
border-radius: 5px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
#notification_list ul {
|
||||
max-height: 350px;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
|
||||
#notification_list ul li {
|
||||
width: 310px;
|
||||
padding: 10px;
|
||||
margin: 0;
|
||||
float: left;
|
||||
border-bottom: 1px solid;
|
||||
list-style-type: none;
|
||||
font-size: 0.95em;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#notification_list > .header {
|
||||
padding: 0 10px;
|
||||
font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
text-shadow: 1px 1px 1px white;
|
||||
text-transform: uppercase;
|
||||
line-height: 30px;
|
||||
border-bottom: 1px solid;
|
||||
border-radius: 5px 5px 0 0;
|
||||
}
|
||||
|
||||
#notification_list > .header > .header_settings {
|
||||
float: right;
|
||||
font-weight: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
#notification_list > .footer {
|
||||
text-align: center;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
#notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.notification_list ul li img {
|
||||
float: left;
|
||||
max-width: 50px;
|
||||
max-height: 50px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.notification_list ul li p {
|
||||
margin: 0;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.notification_list ul.topiclist dt {
|
||||
width: 88%;
|
||||
}
|
||||
|
||||
.notification_list .pointer, .notification_list .pointer_inner {
|
||||
position: absolute;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-top-width: 0;
|
||||
border-bottom: 10px solid;
|
||||
border-left: 10px dashed transparent;
|
||||
border-right: 10px dashed transparent;
|
||||
-webkit-transform: rotate(360deg); /* better anti-aliasing in webkit */
|
||||
display: block;
|
||||
}
|
||||
|
||||
.notification_list .pointer {
|
||||
right: auto;
|
||||
left: 10px;
|
||||
top: -11px;
|
||||
}
|
||||
|
||||
.notification_list .pointer_inner {
|
||||
top: auto;
|
||||
bottom: -11px;
|
||||
left: -10px;
|
||||
}
|
||||
|
||||
.notification_list div.notifications {
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.notification_list p.notifications_title {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.notification_list p.notifications_time {
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
|
||||
@@ -287,20 +287,6 @@ dl.mini dd {
|
||||
line-height: 2.5em;
|
||||
}
|
||||
|
||||
/* PM panel adjustments */
|
||||
.reply-all a.left {
|
||||
background-position: 3px 60%;
|
||||
}
|
||||
|
||||
.reply-all a.left:hover {
|
||||
background-position: 0px 60%;
|
||||
}
|
||||
|
||||
.reply-all {
|
||||
font-size: 11px;
|
||||
padding-top: 5px;
|
||||
}
|
||||
|
||||
/* Defined rules list for PM options */
|
||||
ol.def-rules {
|
||||
padding-left: 0;
|
||||
|
||||
@@ -1,11 +1,3 @@
|
||||
/* Set big button dimensions */
|
||||
.buttons div.reply-icon { width: 96px; height: 25px; }
|
||||
.buttons div.post-icon { width: 96px; height: 25px; }
|
||||
.buttons div.locked-icon { width: 88px; height: 25px; }
|
||||
.buttons div.pmreply-icon { width: 96px; height: 25px; }
|
||||
.buttons div.newpm-icon { width: 84px; height: 25px; }
|
||||
.buttons div.forwardpm-icon { width: 96px; height: 25px; }
|
||||
|
||||
/* Set profile icon dimensions */
|
||||
ul.profile-icons li.pm-icon { width: 28px; height: 20px; }
|
||||
ul.profile-icons li.quote-icon { width: 54px; height: 20px; }
|
||||
@@ -14,14 +6,6 @@ ul.profile-icons li.edit-icon { width: 42px; height: 20px; }
|
||||
/* Online image */
|
||||
.online { background-image: url("./icon_user_online.gif"); }
|
||||
|
||||
/* Big button images */
|
||||
.reply-icon span { background-image: url("./button_topic_reply.gif"); }
|
||||
.post-icon span { background-image: url("./button_topic_new.gif"); }
|
||||
.locked-icon span { background-image: url("./button_topic_locked.gif"); }
|
||||
.pmreply-icon span { background-image: url("./button_pm_reply.gif") ;}
|
||||
.newpm-icon span { background-image: url("./button_pm_new.gif") ;}
|
||||
.forwardpm-icon span { background-image: url("./button_pm_forward.gif") ;}
|
||||
|
||||
/* Icon images */
|
||||
.pm-icon, .pm-icon a { background-image: url("./icon_contact_pm.gif"); }
|
||||
.quote-icon, .quote-icon a { background-image: url("./icon_post_quote.gif"); }
|
||||
|
||||
BIN
phpBB/styles/prosilver/theme/images/buttons.png
Normal file
BIN
phpBB/styles/prosilver/theme/images/buttons.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
Reference in New Issue
Block a user