diff options
| author | Shibu Lijack <shibulijack@gmail.com> | 2012-04-10 21:46:14 +0530 |
|---|---|---|
| committer | Shibu Lijack <shibulijack@gmail.com> | 2012-04-10 21:46:14 +0530 |
| commit | fd55c8664a046258c12e8a207d44340010155627 (patch) | |
| tree | 1a520b8965b88f39cee72e5ce8bb093fb9c38d35 /phpBB/styles/prosilver/theme | |
| parent | daee25340381d4b97119be298a9fc2671e681bb3 (diff) | |
| parent | 41e03164c19751624968435f31f1b63367cd4eb2 (diff) | |
| download | forums-fd55c8664a046258c12e8a207d44340010155627.tar forums-fd55c8664a046258c12e8a207d44340010155627.tar.gz forums-fd55c8664a046258c12e8a207d44340010155627.tar.bz2 forums-fd55c8664a046258c12e8a207d44340010155627.tar.xz forums-fd55c8664a046258c12e8a207d44340010155627.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/10734
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
Diffstat (limited to 'phpBB/styles/prosilver/theme')
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/cp.css | 16 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/theme.cfg | 21 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/tweaks.css | 10 |
4 files changed, 25 insertions, 30 deletions
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 01187cc684..3dda343829 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -355,7 +355,7 @@ ul.rightside { /* Table styles ----------------------------------------*/ table.table1 { - /* See tweaks.css */ + width: 100%; } #ucp-main table.table1 { @@ -548,7 +548,7 @@ li.pagination { border: 1px solid transparent; position: fixed; display: none; - top: 100px; + top: 40%; left: 35%; width: 30%; z-index: 50; @@ -667,3 +667,7 @@ p.rules a { .hidden { display: none; } + +.smilies { + vertical-align: text-bottom; +} diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 899b02faf1..bf7d304ca4 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -97,6 +97,22 @@ ul.cplist { width: 100%; } +.tabs-container h2 { + float: left; + margin-bottom: 0px; +} + +.tabs-container #minitabs { + float: right; + margin-top: 19px; +} + +.tabs-container:after { + display: block; + clear: both; + content: ''; +} + /* CP tabbed menu ----------------------------------------*/ #tabs { diff --git a/phpBB/styles/prosilver/theme/theme.cfg b/phpBB/styles/prosilver/theme/theme.cfg deleted file mode 100644 index eced2a665e..0000000000 --- a/phpBB/styles/prosilver/theme/theme.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# -# phpBB Theme Configuration File -# -# @package phpBB3 -# @copyright (c) 2006 phpBB Group -# @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 -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# - -# General Information about this theme -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.1.0-dev diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index cdef01965e..cd6865f66f 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -4,8 +4,9 @@ These style definitions are IE 7 and 8 specific tweaks required due to its poor CSS support. -------------------------------------------------*/ -table.table1 { - width: 100%; +/* Clear float fix for IE7 */ +.inner { + zoom: 1; } /* Align checkboxes/radio buttons nicely */ @@ -28,9 +29,4 @@ dl.details dd { /* Headerbar height fix for IE7 */ #site-description p { *margin-bottom: 1.0em; -} - -/* Clear float fix for IE7 */ -.inner { - zoom: 1; }
\ No newline at end of file |