Merge remote-tracking branch 'football/master'
# Conflicts: # acp/matches_module.php # adm/style/acp_football_leagues.html # adm/style/acp_football_matches.html # block/all_bets.php # block/rank_matchday.php # block/ranks_total.php # config/services.yml # controller/main.php # event/main_listener.php # includes/constants.php # includes/functions.php # language/de/football.php # language/de/info_acp_leagues.php # language/de/info_acp_matches.php # styles/prosilver/template/all_bets.html # styles/prosilver/template/results.html # styles/prosilver/template/table.html # styles/prosilver/theme/football.css
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
* ----------------------------------------------------------------------------------------- */
|
||||
.fa-paragraph:before {
|
||||
font-weight: bold;
|
||||
content: '§';
|
||||
font-weight: bold;
|
||||
content: '§';
|
||||
}
|
||||
|
||||
ul.dropdown-contents i.icon {
|
||||
@@ -14,8 +14,8 @@ ul.dropdown-contents i.icon {
|
||||
}
|
||||
|
||||
.football-table-scroll {
|
||||
overflow-x:visible;
|
||||
overflow-y:visible;
|
||||
overflow-x:auto;
|
||||
overflow-y:visible;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -195,7 +195,6 @@ table.football td.td_pts_total { text-align: right; padding: 4px 4px 0 2px; }
|
||||
table.football td.td_rank { text-align: right; }
|
||||
table.football td.td_group { text-align: center; }
|
||||
table.football td.td_hits { text-align: center; }
|
||||
table.football td.td_bonus { text-align: center; }
|
||||
table.football td.td_wins { text-align: right; padding: 0 2px 0 4px; }
|
||||
table.football td.td_match_no { text-align: right; }
|
||||
table.football td.td_logo { text-align: center; }
|
||||
|
||||
@@ -1,42 +1,42 @@
|
||||
#footballside {
|
||||
width: 200px;
|
||||
position: fixed;
|
||||
z-index: 1001;
|
||||
left: -185px;
|
||||
top: 100px;
|
||||
min-height: 200px;
|
||||
background-color: #fff;
|
||||
}
|
||||
* html #footballside {
|
||||
position: absolute;
|
||||
height: 200px;
|
||||
}
|
||||
#footballside .forabg {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
#footballside:hover, #footballside.iehover {
|
||||
left: -5px;
|
||||
}
|
||||
#footballside ul {
|
||||
list-style: none;
|
||||
margin-right: 15px;
|
||||
}
|
||||
#footballside li {
|
||||
padding: 3px;
|
||||
}
|
||||
* html #footballside li.header, * html #footballside li.header dl, * html #footballside li.header dl dt {
|
||||
height: 18px;
|
||||
}
|
||||
#footballside li.header {
|
||||
padding: 0 5px;
|
||||
}
|
||||
#dirty {
|
||||
margin: 0;
|
||||
padding: 10px 0;
|
||||
position: relative;
|
||||
float: right;
|
||||
right: 0;
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
color: #FFF;
|
||||
#footballside {
|
||||
width: 200px;
|
||||
position: fixed;
|
||||
z-index: 1001;
|
||||
left: -185px;
|
||||
top: 100px;
|
||||
min-height: 200px;
|
||||
background-color: #fff;
|
||||
}
|
||||
* html #footballside {
|
||||
position: absolute;
|
||||
height: 200px;
|
||||
}
|
||||
#footballside .forabg {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
#footballside:hover, #footballside.iehover {
|
||||
left: -5px;
|
||||
}
|
||||
#footballside ul {
|
||||
list-style: none;
|
||||
margin-right: 15px;
|
||||
}
|
||||
#footballside li {
|
||||
padding: 3px;
|
||||
}
|
||||
* html #footballside li.header, * html #footballside li.header dl, * html #footballside li.header dl dt {
|
||||
height: 18px;
|
||||
}
|
||||
#footballside li.header {
|
||||
padding: 0 5px;
|
||||
}
|
||||
#dirty {
|
||||
margin: 0;
|
||||
padding: 10px 0;
|
||||
position: relative;
|
||||
float: right;
|
||||
right: 0;
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
color: #FFF;
|
||||
}
|
||||
@@ -1,15 +1,15 @@
|
||||
/* -----------------------------------------------------------------------------------------
|
||||
* @package phpBB Extension - Football Football
|
||||
* @copyright (c) 2016 football (http://football.bplaced.net)
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
* ----------------------------------------------------------------------------------------- */
|
||||
#wrap {
|
||||
max-width: none !important;
|
||||
margin: 0;
|
||||
padding: 5px !important;
|
||||
}
|
||||
|
||||
body {
|
||||
padding: 0px !important;
|
||||
|
||||
}
|
||||
/* -----------------------------------------------------------------------------------------
|
||||
* @package phpBB Extension - Football Football
|
||||
* @copyright (c) 2016 football (http://football.bplaced.net)
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
* ----------------------------------------------------------------------------------------- */
|
||||
#wrap {
|
||||
max-width: none !important;
|
||||
margin: 0;
|
||||
padding: 5px !important;
|
||||
}
|
||||
|
||||
body {
|
||||
padding: 0px !important;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<html>
|
||||
<head>
|
||||
<title></title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||
</head>
|
||||
|
||||
<body bgcolor="#FFFFFF" text="#000000">
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<html>
|
||||
<head>
|
||||
<title></title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||
</head>
|
||||
|
||||
<body bgcolor="#FFFFFF" text="#000000">
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user