From 68fb7356b827ba73aba6cb9dd64311ec14732ebd Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 8 Mar 2012 01:38:16 +0200 Subject: [PATCH 1/4] [feature/prosilver-cleanup/remove-tweaks2] Tweaks.css only for IE Removing tweaks.css from stylesheet.css, including it for IE8 or older via conditional statements PHPBB3-10622 --- phpBB/styles/prosilver/template/overall_header.html | 4 ++++ phpBB/styles/prosilver/template/simple_header.html | 4 ++++ phpBB/styles/prosilver/theme/stylesheet.css | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 364373f439..5e095d0a0d 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -84,6 +84,10 @@ + + diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index f71dd8d85c..f0dcbed5a4 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -50,6 +50,10 @@ + + diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index 3cf60ea494..f7b526780f 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -13,6 +13,5 @@ @import url("buttons.css"); @import url("cp.css"); @import url("forms.css"); -@import url("tweaks.css"); @import url("colours.css"); @import url("imageset.css"); From 179fa3ef40ceb2081db6e20459b5c6da241b0386 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 8 Mar 2012 01:40:09 +0200 Subject: [PATCH 2/4] [feature/prosilver-cleanup/remove-tweaks2] Removing tweaks from forms Removing IE6 tweaks from forms.css PHPBB3-10622 --- phpBB/styles/prosilver/theme/forms.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 43888733cc..f352fb2538 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -149,10 +149,6 @@ fieldset.fields2 dl:hover dt label { width: 95%; } -* html #timezone { - width: 50%; -} - /* Quick-login on index page */ fieldset.quick-login { margin-top: 5px; From dfce7c7e962bc185c88eee07d8296af827cccbc7 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 8 Mar 2012 01:42:27 +0200 Subject: [PATCH 3/4] [feature/prosilver-cleanup/remove-tweaks2] Copying common tweaks Copying commonly used code from tweaks.css to common.css PHPBB3-10622 --- phpBB/styles/prosilver/theme/common.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 7eb00bd808..fd41d66793 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -299,6 +299,8 @@ span.corners-bottom span { ul.linklist { display: block; margin: 0; + height: 4%; + overflow: hidden; } ul.linklist li { @@ -485,6 +487,11 @@ dl.details dd { width: 65%; } +.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls { + height: 1%; + overflow: hidden; +} + /* Pagination ---------------------------------------- */ .pagination { From f70786ab2eca2a2d44fdda3e8ec19951e8f8ddcd Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 8 Mar 2012 01:43:11 +0200 Subject: [PATCH 4/4] [feature/prosilver-cleanup/remove-tweaks2] Updating tweaks Removing unnecessary tweaks, changing IE7 tweaks to modern code PHPBB3-10622 --- phpBB/styles/prosilver/theme/tweaks.css | 92 ++++--------------------- 1 file changed, 13 insertions(+), 79 deletions(-) diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index ae724e1419..416c4a5510 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -1,97 +1,31 @@ /* Style Sheet Tweaks -These style definitions are mainly IE specific +These style definitions are IE 7 and 8 specific tweaks required due to its poor CSS support. -------------------------------------------------*/ -* html table, * html select, * html input { font-size: 100%; } -* html hr { margin: 0; } -* html span.corners-top, * html span.corners-bottom { background-image: url("./images/corners_left.gif"); } -* html span.corners-top span, * html span.corners-bottom span { background-image: url("./images/corners_right.gif"); } - table.table1 { - width: 99%; /* IE < 6 browsers */ - /* Tantek hack */ - voice-family: "\"}\""; - voice-family: inherit; width: 100%; } -html>body table.table1 { width: 100%; } /* Reset 100% for opera */ -* html ul.topiclist li { position: relative; } -* html .postbody h3 img { vertical-align: middle; } - -/* Form styles */ -html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/radio buttons nicely */ - -* html input.button1, * html input.button2 { - padding-bottom: 0; - margin-bottom: 1px; +/* Align checkboxes/radio buttons nicely */ +dd label input { + vertical-align: text-bottom; + *vertical-align: middle; } -/* Misc layout styles */ -* html .column1, * html .column2 { width: 45%; } - -/* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above) - From http://www.positioniseverything.net/easyclearing.html -#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -}*/ - -.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls { - height: 1%; - overflow: hidden; -} - -/* viewtopic fix */ -* html .post { - height: 25%; - overflow: hidden; -} - -/* navbar fix */ -* html .clearfix, * html .navbar, ul.linklist { - height: 4%; - overflow: hidden; -} - -/* Simple fix so forum and topic lists always have a min-height set, even in IE6 - From http://www.dustindiaz.com/min-height-fast-hack */ +/* Simple fix so forum and topic lists always have a height set */ dl.icon { - min-height: 35px; - height: auto !important; - height: 35px; -} - -* html li.row dl.icon dt { - height: 35px; - overflow: visible; -} - -* html #search-box { - width: 25%; + *height: 35px; } /* Correctly clear floating for details on profile view */ -*:first-child+html dl.details dd { - margin-left: 30%; - float: none; +dl.details dd { + *margin-left: 30%; + *float: none; } -* html dl.details dd { - margin-left: 30%; - float: none; -} - -/* Headerbar height fix for IE7 and below */ -* html #site-description p { - margin-bottom: 1.0em; -} - -*:first-child+html #site-description p { - margin-bottom: 1.0em; +/* Headerbar height fix for IE7 */ +#site-description p { + *margin-bottom: 1.0em; } \ No newline at end of file