1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-18 06:21:19 +02:00

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11408] user_jabber instead of jabber
  [ticket/10202] Rename method names _all() to _array().
  [ticket/10202] Add migration file for config_db_text.
  [ticket/10202] Upgrade TEXT to the bigger MTEXT.
  [ticket/10202] Improve method documentation.
  [ticket/10202] SQL escape the table name.
  [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
  [ticket/10202] Define phpbb_config_db_text as a service.
  [ticket/10202] Add tests for phpbb_config_db_text.
  [ticket/10202] Adjust method names to guidelines.
  [ticket/10202] Add database schema for phpbb_config_db_text.
  [ticket/10202] Implementation of config options with arbitrary length values.
  [ticket/11166] Add ajaxify support to normal ACP confirm_box()
  [ticket/11166] Fix several custom confirm templates in prosilver
  [ticket/11166] Add caption to AJAX confirm box default template
  [ticket/11166] Fix typo in comment
  [ticket/11166] Use provided custom templates on AJAX confirm box
This commit is contained in:
Joas Schilling
2013-03-07 16:09:55 +01:00
25 changed files with 562 additions and 21 deletions

View File

@@ -548,9 +548,9 @@ li.pagination ul {
border: 1px solid transparent;
position: fixed;
display: none;
top: 40%;
left: 35%;
width: 30%;
top: 150px;
left: 25%;
width: 50%;
z-index: 50;
padding: 25px;
padding: 0 25px 20px 25px;
@@ -576,6 +576,20 @@ li.pagination ul {
padding-bottom: 8px;
}
.phpbb_alert label {
display: block;
margin: 8px 0;
padding-bottom: 8px;
}
.phpbb_alert div.alert_text > p,
.phpbb_alert div.alert_text > label,
.phpbb_alert div.alert_text > select,
.phpbb_alert div.alert_text > textarea,
.phpbb_alert div.alert_text > input {
font-size: 1.1em;
}
#darkenwrapper {
display: none;
}