diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-02 16:20:21 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-02 16:20:21 +0300 |
| commit | 8363d3276522dedc55b20f63b53de116002a28eb (patch) | |
| tree | 8511a5c93421be1c58c91b06c5f6d5130a00b4c3 /phpBB | |
| parent | 2c68dc2e6dd4491744224c91c52f6da1e6c6b81d (diff) | |
| parent | 51bc9540cf10d41b34ff5f6afb90697557f4d050 (diff) | |
| download | forums-8363d3276522dedc55b20f63b53de116002a28eb.tar forums-8363d3276522dedc55b20f63b53de116002a28eb.tar.gz forums-8363d3276522dedc55b20f63b53de116002a28eb.tar.bz2 forums-8363d3276522dedc55b20f63b53de116002a28eb.tar.xz forums-8363d3276522dedc55b20f63b53de116002a28eb.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10699] Long h2 title breaks div.minitabs in MCP
[ticket/10699] Long h2 title breaks div.minitabs in MCP
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_topic.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/cp.css | 16 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/tweaks.css | 10 |
3 files changed, 28 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index ab0c83a56f..5f240b73fc 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -1,5 +1,6 @@ <!-- INCLUDE mcp_header.html --> +<div class="tabs-container"> <h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2> <script type="text/javascript"> @@ -35,6 +36,7 @@ onload_functions.push('subPanels()'); </li> </ul> </div> +</div> <form id="mcp" method="post" action="{S_MCP_ACTION}"> diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 74f11e47a6..6119691336 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/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index b32faaf501..40df61580e 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -24,4 +24,14 @@ dl.details dd { /* Headerbar height fix for IE7 */ #site-description p { *margin-bottom: 1.0em; +} + +/* #minitabs fix for IE */ +.tabs-container { + zoom: 1; +} + +#minitabs { + white-space: nowrap; + *min-width: 50%; }
\ No newline at end of file |