1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-17 22:11:26 +02:00

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

* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [ticket/11285] Use more granularity in dependency checks in compress test
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
  [ticket/10803] Show failure message until user dismisses it
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [ticket/10954] Miscellaneous coding fixes
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [ticket/10763] Use self when calling get_extension() in filespec class
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/posting.php
This commit is contained in:
Joas Schilling
2012-12-20 22:51:38 +01:00
297 changed files with 7665 additions and 1970 deletions

View File

@@ -331,20 +331,20 @@ a.top2 {
}
/* Arrow links */
a.up { background-image: url("./images/arrow_up.gif") }
a.down { background-image: url("./images/arrow_down.gif") }
a.left { background-image: url("./images/arrow_left.gif") }
a.right { background-image: url("./images/arrow_right.gif") }
a.arrow-up { background-image: url("./images/arrow_up.gif") }
a.arrow-down { background-image: url("./images/arrow_down.gif") }
a.arrow-left { background-image: url("./images/arrow_left.gif") }
a.arrow-right { background-image: url("./images/arrow_right.gif") }
a.up:hover {
a.arrow-up:hover {
background-color: transparent;
}
a.left:hover {
a.arrow-left:hover {
color: #368AD2;
}
a.right:hover {
a.arrow-right:hover {
color: #368AD2;
}

View File

@@ -145,44 +145,44 @@ a.top2 {
}
/* Arrow links */
a.up { background: none no-repeat left center; }
a.down { background: none no-repeat right center; }
a.left { background: none no-repeat 3px 60%; }
a.right { background: none no-repeat 95% 60%; }
a.arrow-up { background: none no-repeat left center; }
a.arrow-down { background: none no-repeat right center; }
a.arrow-left { background: none no-repeat 3px 60%; }
a.arrow-right { background: none no-repeat 95% 60%; }
a.up, a.up:link, a.up:active, a.up:visited {
a.arrow-up, a.arrow-up:link, a.arrow-up:active, a.arrow-up:visited {
padding-left: 10px;
text-decoration: none;
border-bottom-width: 0;
}
a.up:hover {
a.arrow-up:hover {
background-position: left top;
}
a.down, a.down:link, a.down:active, a.down:visited {
a.arrow-down, a.arrow-down:link, a.arrow-down:active, a.arrow-down:visited {
padding-right: 10px;
}
a.down:hover {
a.arrow-down:hover {
background-position: right bottom;
text-decoration: none;
}
a.left, a.left:active, a.left:visited {
a.arrow-left, a.arrow-left:active, a.arrow-left:visited {
padding-left: 12px;
}
a.left:hover {
a.arrow-left:hover {
text-decoration: none;
background-position: 0 60%;
}
a.right, a.right:active, a.right:visited {
a.arrow-right, a.arrow-right:active, a.arrow-right:visited {
padding-right: 12px;
}
a.right:hover {
a.arrow-right:hover {
text-decoration: none;
background-position: 100% 60%;
}