mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/merging-style-components

Browse Source 
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
This commit is contained in:
Vjacheslav Trushkin
2012-03-31 10:43:06 +03:00
parent 506951e8af 013a8649a5
commit 398a6c8045
81 changed files with 1716 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
phpBB/adm/style/admin.css
View File

@@ -101,6 +101,10 @@ hr {
font-size: 0.85em;
}
.hidden {
display: none;
}
/* General links */
a:link, a:visited {
color: #105289;
@@ -1087,6 +1091,56 @@ input.disabled {
color: #666666;
}
/* jQuery popups
---------------------------------------- */
.phpbb_alert {
background-color: #FFFFFF;
border: 1px solid #999999;
position: fixed;
display: none;
top: 100px;
left: 35%;
width: 30%;
z-index: 50;
padding: 25px;
padding: 0 25px 20px 25px;
}
.phpbb_alert .alert_close {
display: block;
float: right;
width: 16px;
height: 16px;
overflow: hidden;
text-decoration: none !important;
background: transparent url("../images/alert_close.png") 0 0 no-repeat;
margin-top: -7px;
margin-right: -31px;
}
.phpbb_alert .alert_close:hover {
background-position: 0 -16px;
}
.phpbb_alert p {
margin: 8px 0;
padding-bottom: 8px;
}
#darkenwrapper {
display: none;
}
#darken {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: #000000;
opacity: 0.5;
}
/* Pagination
---------------------------------------- */
.pagination {