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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/13058] Add min value to jump to page input
  [ticket/13009] Remove legacy browser hacks
This commit is contained in:
Cesar G 2014-09-14 06:26:32 -07:00
commit 2566cf1499
3 changed files with 20 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@
<link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> <link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
<!-- ENDIF --> <!-- ENDIF -->
<!--[if lte IE 8]> <!--[if lte IE 9]>
<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> <link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
<![endif]--> <![endif]-->

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

@ -7,7 +7,7 @@
<ul class="dropdown-contents"> <ul class="dropdown-contents">
<li>{L_JUMP_TO_PAGE}{L_COLON}</li> <li>{L_JUMP_TO_PAGE}{L_COLON}</li>
<li class="page-jump-form"> <li class="page-jump-form">
<input type="number" name="page-number" maxlength="6" title="{L_JUMP_PAGE}" class="inputbox tiny" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" /> <input type="number" name="page-number" min="1" maxlength="6" title="{L_JUMP_PAGE}" class="inputbox tiny" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" />
<input class="button2" value="{L_GO}" type="button" /> <input class="button2" value="{L_GO}" type="button" />
</li> </li>
</ul> </ul>

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

@ -1,78 +1,27 @@
/* Style Sheet Tweaks /* Style Sheet Tweaks
These style definitions are IE 7 and 8 specific These style definitions are IE 8 & 9 only.
tweaks required due to its poor CSS support. They are required due to the poor CSS support in IE browsers.
-------------------------------------------------*/ ------------------------------------------------------------------------------*/
/* Clear float fix for IE7 */ /* IE 8 Tweaks (value)\9 equates to IE <= 8
.inner { ------------------------------------------------------------------------------*/
zoom: 1;
}
ul.linklist { /* Clear float fix */
zoom: 1; .inner, ul.linklist { zoom: 1\9; }
}
/* Align checkboxes/radio buttons nicely */ /* Align checkboxes/radio buttons nicely */
dd label input { dd label input { vertical-align: text-bottom\9; }
vertical-align: text-bottom;
*vertical-align: middle;
}
/* Simple fix so forum and topic lists always have a height set */ /* Fixes header-avatar aspect-ratio */
dl.icon { .header-avatar img { height: 20px\9; }
*height: 35px;
}
/* Correctly clear floating for details on profile view */
dl.details dd {
*margin-left: 30%;
*float: none;
}
/* Headerbar height fix for IE7 */
#site-description p {
*margin-bottom: 1.0em;
}
/* Forum list column styles for IE7 */
dl.icon dt, dl.icon dd {
*min-height: 32px;
}
dd.posts, dd.topics, dd.views, dd.extra, dd.mark {
*width: 79px;
}
dd.lastpost, dd.redirect, dd.moderation, dd.time, dd.info {
*width: 249px;
}
dd.option {
*width: 124px;
}
/* Notifications list for IE7 */
.dropdown-extended {
*left: 0;
}
.dropdown-extended .header_settings {
*position: absolute;
*right: 10px;
*top: 0;
}
.icon-notification {
*z-index: 2;
}
/* Fixes header-avatar aspect-ratio in IE8 */
.header-avatar img {
height: 20px;
}
/* IE8 often can't handle max-width in %, so we use px instead */ /* IE8 often can't handle max-width in %, so we use px instead */
.postprofile .avatar img { .postprofile .avatar img { max-width: 150px\9; }
max-width: 150px;
}
/* IE 9 Tweaks
------------------------------------------------------------------------------*/