diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-02 16:18:56 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-02 16:18:56 +0300 |
| commit | 51bc9540cf10d41b34ff5f6afb90697557f4d050 (patch) | |
| tree | e41a5ece03647534b7919f1764b62fa4ea8af6c8 /phpBB | |
| parent | b1b530f92cca7eb115e096ea8901133d421771d2 (diff) | |
| parent | 17e050e109e7048b75a24cac87ad9d5bad4893e5 (diff) | |
| download | forums-51bc9540cf10d41b34ff5f6afb90697557f4d050.tar forums-51bc9540cf10d41b34ff5f6afb90697557f4d050.tar.gz forums-51bc9540cf10d41b34ff5f6afb90697557f4d050.tar.bz2 forums-51bc9540cf10d41b34ff5f6afb90697557f4d050.tar.xz forums-51bc9540cf10d41b34ff5f6afb90697557f4d050.zip | |
Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympus
* sadu/ticket/10699:
[ticket/10699] Long h2 title breaks div.minitabs in MCP
[ticket/10699] Long h2 title breaks div.minitabs in MCP
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 5dbc8d670c..13b661ef0a 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 aed88831a8..7c7158bd00 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -104,6 +104,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 5e11b2122b..0c03020100 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -94,4 +94,14 @@ dl.icon { *:first-child+html #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 |