Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:peirix/Fussball

  • Loading branch information...
commit 939271ae107e716de2367f1b6bdcff48f9ff1b39 2 parents 2b3f265 + 415bd5b
@peirix authored
Showing with 33 additions and 21 deletions.
  1. +4 −0 Fussball/Scripts/playgame.js
  2. +29 −21 Fussball/Skin/Site.css
View
4 Fussball/Scripts/playgame.js
@@ -124,6 +124,8 @@ $(document).ready(function () {
var $this = $(this);
Goal.selfGoal = 0;
+ $this.addClass("clicked");
+
$("#SelfGoalOverlay").show().animate({ opacity: 1 }, 2000, function () {
$("#SelfGoalOverlay").hide().removeClass("clicked");
@@ -175,6 +177,8 @@ $(document).ready(function () {
summary.append("<strong>" + scorerName + "</strong> - <a data-goalid='" + goalId + "'>Slett</a><br>");
$(".overlay").show();
+
+ $this.removeClass("clicked");
}
});
View
50 Fussball/Skin/Site.css
@@ -115,7 +115,7 @@ a {
#Main {
margin: 0 auto;
width: 100%;
- max-width: 1180px;
+ max-width: 1280px;
min-width: 480px;
padding: 0;
position: relative;
@@ -163,7 +163,7 @@ a {
/* RED RIBBON */
.ribbon {
width: 100%;
- height: 173px;
+ height: 128px;
clear: left;
position: relative;
margin: 0;
@@ -173,7 +173,10 @@ a {
}
/* INDEX */
-#playerPicker { background: #ff3000 url(gfx/bg_player_navigation.gif) top left repeat; }
+#playerPicker {
+ background: #ff3000 url(gfx/bg_player_navigation.gif) top left repeat;
+ height: 155px;
+ }
.scrollNav {
width: 85px;
@@ -197,12 +200,12 @@ a {
}
#PlayerListContainer {
- width: 1008px;
+ width: 1108px;
float: left;
overflow: hidden;
margin: 0 85px;
position: relative;
- height: 172px;
+ height: 155px;
}
#playerPicker ul {
@@ -224,7 +227,7 @@ a {
text-align: center;
padding: 5px;
position: relative;
- margin: 25px 5px 20px 0;
+ margin: 3px 5px 6px 0;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
@@ -264,7 +267,7 @@ a {
position: relative;
max-width: 960px;
width: 100%;
- margin: 0 auto 30px auto;
+ margin: 0 auto;
}
.freeSpot, .filledSpot, .playerOffense, .playerdefense,
@@ -285,6 +288,8 @@ a {
box-shadow: 3px 3px 3px #999;
}
+ #PlayGame div button.clicked { background-color: #333; }
+
.freeSpot img, .filledSpot img, .playerOffense img, .playerdefense img {
width: 100%;
}
@@ -341,6 +346,7 @@ a {
width: 200px;
background-color: #333;
height: 40px;
+ opacity: 0;
}
#NewPlayer {
@@ -387,7 +393,7 @@ a {
#PlayGame #Table {
float: right;
- margin-top: 67px;
+ margin-top: 20px;
}
#BlueTeam {
@@ -398,7 +404,7 @@ a {
#BlueTeam {
width: 28%;
position: relative;
- margin-top: -13%;
+ margin-top: -9%;
height: 80%;
}
@@ -410,11 +416,12 @@ a {
margin-left: -30%;
top: 50%;
margin-top: -200px;
- padding: 10px;
+ padding: 15px;
color: #000;
display: none;
z-index: 11;
background-color: #fff;
+ line-height: 30px;
}
#PlayGame .closeSummary {
@@ -439,7 +446,7 @@ a {
padding: 5px;
color: #fff;
font-family: 'BrandonGrotesqueBold';
- font-size: 209px;
+ font-size: 148px;
line-height: 0.7em;
}
@@ -474,13 +481,13 @@ a {
#PlayGame #RedTeam button { left: 0; }
- #PlayGame #RedTeam .playerOffense { top: 410px; }
- #PlayGame #RedTeam .playerDefense { top: 673px; }
+ #PlayGame #RedTeam .playerOffense { top: 305px; }
+ #PlayGame #RedTeam .playerDefense { top: 592px; }
#PlayGame #BlueTeam button { right: 0; }
- #PlayGame #BlueTeam .playerDefense { top: 215px; }
- #PlayGame #BlueTeam .playerOffense { top: 484px; }
+ #PlayGame #BlueTeam .playerDefense { top: 130px; }
+ #PlayGame #BlueTeam .playerOffense { top: 416px; }
#PlayGame .playerDefense { bottom: 50%; }
@@ -502,19 +509,20 @@ a {
}
#RedSwitch {
- top: 590px;
- right: 0;
+ top: 524px;
+ right: 15px;
}
#BlueSwitch {
- top: 399px;
- left: 0px;
+ top: 360px;
+ left: 15px;
}
#SelfGoalOverlay {
text-align: center;
clear: both;
display: none;
+ margin-bottom: 0;
}
#SelfGoalOverlay.clicked {
background-color: #333;
@@ -527,7 +535,7 @@ a {
top: 153px;
text-align: center;
width: 150px;
- left: 509px;
+ left: 565px;
color: #fff;
}
@@ -537,7 +545,7 @@ a {
color: #333;
width: 150px;
bottom: 0;
- left: 510px;
+ left: 565px;
background-color: #fff;
text-align: center;
}
Please sign in to comment.
Something went wrong with that request. Please try again.