makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* 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
This commit is contained in:
Vjacheslav Trushkin 2012-04-02 16:20:21 +03:00
commit 8363d32765
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/styles/prosilver/template/mcp_topic.html
View file

@ -1,5 +1,6 @@
<!-- INCLUDE mcp_header.html --> <!-- INCLUDE mcp_header.html -->
<div class="tabs-container">
<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2> <h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
<script type="text/javascript"> <script type="text/javascript">
@ -35,6 +36,7 @@ onload_functions.push('subPanels()');
</li> </li>
</ul> </ul>
</div> </div>
</div>
<form id="mcp" method="post" action="{S_MCP_ACTION}"> <form id="mcp" method="post" action="{S_MCP_ACTION}">

16
phpBB/styles/prosilver/theme/cp.css
View file

@ -97,6 +97,22 @@ ul.cplist {
width: 100%; 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 /* CP tabbed menu
----------------------------------------*/ ----------------------------------------*/
#tabs { #tabs {

10
phpBB/styles/prosilver/theme/tweaks.css
View file

@ -25,3 +25,13 @@ dl.details dd {
#site-description p { #site-description p {
*margin-bottom: 1.0em; *margin-bottom: 1.0em;
} }
/* #minitabs fix for IE */
.tabs-container {
zoom: 1;
}
#minitabs {
white-space: nowrap;
*min-width: 50%;
}