1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
This commit is contained in:
Nathan Guse
2012-11-14 11:33:24 -06:00
48 changed files with 1519 additions and 514 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%;
}