mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-16 13:44:12 +02:00
Merge branch 'develop' into ticket/10380
* develop: (325 commits) [ticket/10641] Update MCP template with new plurality forms [ticket/10637] Leftovers from implementation of extensions in convertor [ticket/10637] Leftovers from implementation of extensions in develop tools [ticket/10637] Leftovers from implementation of extensions in mcp_post [ticket/10637] Leftovers from implementation of extensions in mcp_main [ticket/10637] Leftovers from implementation of extensions [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header(). [ticket/10633] Stop leaking filename of attachments when thumbnail is requested [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators(). [ticket/10634] Specify module type when viewing profile [ticket/10634] Changing p_master::is_full_class [ticket/10569] Invalid string comparison in prosilver [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop [ticket/10512] Call startup.php from tests/bootstrap.php [ticket/10535] Delete no longer needed email confirm language entries. [ticket/9914] Add backup warning to updater. [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles ...
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* proSilver RTL definitions
|
||||
/* RTL definitions
|
||||
---------------------------------------- */
|
||||
|
||||
/**
|
||||
@@ -519,7 +519,7 @@
|
||||
/**
|
||||
* cp.css
|
||||
*/
|
||||
/* proSilver Control Panel Styles
|
||||
/* Control Panel Styles
|
||||
---------------------------------------- */
|
||||
|
||||
|
||||
@@ -784,4 +784,4 @@
|
||||
.rtl .imageset.icon_topic_reported, .rtl .imageset.icon_topic_unapproved {
|
||||
padding-right: 16px;
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* proSilver Button Styles
|
||||
/* Button Styles
|
||||
---------------------------------------- */
|
||||
|
||||
/* Rollover buttons
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* General proSilver Markup Styles
|
||||
/* General Markup Styles
|
||||
---------------------------------------- */
|
||||
|
||||
* {
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* proSilver Content Styles
|
||||
/* Content Styles
|
||||
---------------------------------------- */
|
||||
|
||||
ul.topiclist {
|
||||
@@ -35,16 +35,6 @@ ul.topiclist dt {
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
||||
ul.topiclist .widescreen-optimised dt {
|
||||
width: 100%;
|
||||
margin-right: -465px;
|
||||
}
|
||||
|
||||
ul.topiclist .widescreen-optimised dt .wrap-content {
|
||||
display: block;
|
||||
padding-right: 465px;
|
||||
}
|
||||
|
||||
ul.topiclist dd {
|
||||
display: block;
|
||||
float: left;
|
||||
@@ -108,10 +98,6 @@ li.header dt {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
li.header .widescreen-optimised dt {
|
||||
margin-right: -465px;
|
||||
}
|
||||
|
||||
li.header dd {
|
||||
margin-left: 1px;
|
||||
}
|
||||
@@ -140,7 +126,7 @@ dl.icon dt {
|
||||
}
|
||||
|
||||
dd.posts, dd.topics, dd.views {
|
||||
width: 90px;
|
||||
width: 8%;
|
||||
text-align: center;
|
||||
line-height: 2.2em;
|
||||
font-size: 1.2em;
|
||||
@@ -159,7 +145,7 @@ dl.icon dt li {
|
||||
}
|
||||
|
||||
dd.lastpost {
|
||||
width: 230px;
|
||||
width: 25%;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* proSilver Control Panel Styles
|
||||
/* Control Panel Styles
|
||||
---------------------------------------- */
|
||||
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* proSilver Form Styles
|
||||
/* Form Styles
|
||||
---------------------------------------- */
|
||||
|
||||
/* General form styles
|
||||
@@ -26,6 +26,7 @@ select {
|
||||
border: 1px solid #666666;
|
||||
padding: 1px;
|
||||
background-color: #FAFAFA;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
option {
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* proSilver Link Styles
|
||||
/* Link Styles
|
||||
---------------------------------------- */
|
||||
|
||||
/* Links adjustment to correctly display an order of rtl/ltr mixed content */
|
||||
|
@@ -1,10 +1,5 @@
|
||||
/* proSilver Print Style Sheet
|
||||
-------------------------------------------------
|
||||
Author: subBlue ( http://www.subBlue.com/ )
|
||||
Version: 25 August 2004
|
||||
|
||||
Copyright 2004 phpBB Group
|
||||
-------------------------------------------------*/
|
||||
/* Print Style Sheet
|
||||
---------------------------------------- */
|
||||
|
||||
|
||||
/* Lots still TODO here! */
|
||||
|
@@ -1,11 +1,9 @@
|
||||
/* phpBB 3.0 Style Sheet
|
||||
/* phpBB3 Style Sheet
|
||||
--------------------------------------------------------------
|
||||
Style name: proSilver
|
||||
Based on style: proSilver (this is the default phpBB 3 style)
|
||||
Original author: subBlue ( http://www.subBlue.com/ )
|
||||
Modified by:
|
||||
|
||||
Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
|
||||
Style name: prosilver (the default phpBB 3.0.x style)
|
||||
Based on style:
|
||||
Original author: Tom Beddard ( http://www.subblue.com/ )
|
||||
Modified by: phpBB Group ( http://www.phpbb.com/ )
|
||||
--------------------------------------------------------------
|
||||
*/
|
||||
|
||||
@@ -17,4 +15,4 @@
|
||||
@import url("forms.css");
|
||||
@import url("tweaks.css");
|
||||
@import url("colours.css");
|
||||
@import url("imageset.css");
|
||||
@import url("imageset.css");
|
||||
|
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# @package phpBB3
|
||||
# @copyright (c) 2006 phpBB Group
|
||||
# @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
#
|
||||
#
|
||||
# At the left is the name, please do not change this
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* proSilver Style Sheet Tweaks
|
||||
/* Style Sheet Tweaks
|
||||
|
||||
These style definitions are mainly IE specific
|
||||
tweaks required due to its poor CSS support.
|
||||
|
Reference in New Issue
Block a user