1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-15 03:55:23 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
This commit is contained in:
Andreas Fischer 2011-11-14 13:45:01 +01:00
commit b21e343b5e
11 changed files with 22 additions and 34 deletions

View File

@ -1,4 +1,4 @@
/* proSilver RTL definitions
/* RTL definitions
---------------------------------------- */
/**
@ -519,7 +519,7 @@
/**
* cp.css
*/
/* proSilver Control Panel Styles
/* Control Panel Styles
---------------------------------------- */

View File

@ -1,4 +1,4 @@
/* proSilver Button Styles
/* Button Styles
---------------------------------------- */
/* Rollover buttons

View File

@ -1,4 +1,4 @@
/* General proSilver Markup Styles
/* General Markup Styles
---------------------------------------- */
* {

View File

@ -1,4 +1,4 @@
/* proSilver Content Styles
/* Content Styles
---------------------------------------- */
ul.topiclist {

View File

@ -1,4 +1,4 @@
/* proSilver Control Panel Styles
/* Control Panel Styles
---------------------------------------- */

View File

@ -1,4 +1,4 @@
/* proSilver Form Styles
/* Form Styles
---------------------------------------- */
/* General form styles

View File

@ -1,4 +1,4 @@
/* proSilver Link Styles
/* Link Styles
---------------------------------------- */
/* Links adjustment to correctly display an order of rtl/ltr mixed content */

View File

@ -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! */

View File

@ -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");

View File

@ -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.

View File

@ -1,14 +1,9 @@
/* phpBB 3.0 Style Sheet
/* phpBB3 Style Sheet
--------------------------------------------------------------
Style name: subsilver2
Based on style: subSilver (the default phpBB 2 style)
Original author: subBlue ( http://www.subBlue.com/ )
Modified by: psoTFX and the phpBB team ( http://www.phpbb.com )
This is an alternative style for phpBB3 for those wishing to stay with
the familiar subSilver style of phpBB version 2.x
Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
Style name: subsilver2
Based on style: subSilver (the default phpBB 2.0.x style)
Original author: Tom Beddard ( http://www.subblue.com/ )
Modified by: phpBB Group ( http://www.phpbb.com/ )
--------------------------------------------------------------
*/