Skip to content

Commit

Permalink
More indentation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@krawaller
krawaller committed May 18, 2010
1 parent 7c85588 commit ebcc054
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 88 deletions.
6 changes: 3 additions & 3 deletions Resources/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<title>Golingo</title>
<script type="text/javascript" src="js/jquery-1.4.2.js"></script>
<script type="text/javascript" src="js/lowpro.jquery.js"></script>
<script type="text/javascript" src="js/utils.js"></script>
<link href="css/game.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="js/utils.js"></script>
<link href="css/game.css" rel="stylesheet" type="text/css" />
</head>
<body>
<script type="text/javascript" src="js/seedrandom.js"></script>
<script type="text/javascript" src="js/seedrandom.js"></script>
<script type="text/javascript" src="js/golingo.js"></script>
<script type="text/javascript" src="js/board.js"></script>
<script type="text/javascript" src="js/letter.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions Resources/views/credits.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<title>Info</title>
<link rel="stylesheet" type="text/css" media="all" href="credits.css" />
</head>
<body>
<div id="wrapper"></div>
<script type="text/javascript" src="credits.utils.js"></script>
<div id="wrapper"></div>
<script type="text/javascript" src="credits.utils.js"></script>
</body>
</html>
96 changes: 48 additions & 48 deletions Resources/views/help.css
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

html, body {
margin: 0;
padding: 0;
background-repeat: no-repeat;
font-family: Helvetica;
width: 320px;
height: 416px;
position: relative;
font-size: 16px;
/*text-shadow: #de9f7b 0px 1px 0px;*/
margin: 0;
padding: 0;
background-repeat: no-repeat;
font-family: Helvetica;
width: 320px;
height: 416px;
position: relative;
font-size: 16px;
/*text-shadow: #de9f7b 0px 1px 0px;*/
}

.bubble {
Expand All @@ -19,34 +19,34 @@ html, body {
border: 1px solid rgba(87, 125, 39, 0.75);
margin: -1px;
z-index: 1338;
padding: 10px;
color: #eee;
text-shadow: #333 0px 1px 0px;
opacity: 0;
padding: 10px;
color: #eee;
text-shadow: #333 0px 1px 0px;
opacity: 0;
/*-webkit-transition-property: opacity;
-webkit-transition-duration: 1.4s;*/
}

.loaded .bubble {
opacity: 1;
opacity: 1;
}

.tip {
background-image: url(../pics/tip.png);
width: 34px;
height: 24px;
position: absolute;
background-image: url(../pics/tip.png);
width: 34px;
height: 24px;
position: absolute;
}

.tip.right {
top: 7px;
top: 7px;
right: -34px;
}

.tip.left {
top: 7px;
left: -34px;
-webkit-transform: rotate(180deg);
-webkit-transform: rotate(180deg);
}

.tip.top {
Expand All @@ -62,72 +62,72 @@ html, body {
}

ul {
margin: 5px 0;
margin: 5px 0;
}

.fakeMenu div {
position: absolute;
font-family: Helvetica;
position: absolute;
font-family: Helvetica;
}

.title {
width: 100%;
text-align: center;
text-shadow: 0px 1px 0px #de9f7b;
width: 100%;
text-align: center;
text-shadow: 0px 1px 0px #de9f7b;
}

.headerTitle {
top: 24px;
font-weight: bold;
top: 24px;
font-weight: bold;
font-size: 20px;
}

.headerSubtitle {
top: 54px;
font-size: 16px;
font-size: 16px;
}

.fakeMenu .menu {
position: absolute;
top: 100px;
width: 280px;
left: 20px;
position: absolute;
top: 100px;
width: 280px;
left: 20px;
}

.fakeMenu ul {
list-style: none;
padding: 0;
margin: 0;
list-style: none;
padding: 0;
margin: 0;
}

.fakeMenu li {
line-height: 42px;
width: 100%;
color: #eee;
line-height: 42px;
width: 100%;
color: #eee;
text-shadow: 0px 1px 0px #333;
}

li span {
display: inline-block;
font-size: 16px;
display: inline-block;
font-size: 16px;
}

li span:first-child {
margin-left: 16px;
width: 80px;
margin-left: 16px;
width: 80px;
}

li span:last-child {
width: 160px;
text-align: center;
text-align: center;
}

li span:only-child {
width: 100%;
text-align: center;
margin: 0 auto;
width: 100%;
text-align: center;
margin: 0 auto;
}

.fakeMenu .player0 {
color: #ff5e50;
color: #ff5e50;
}
24 changes: 12 additions & 12 deletions Resources/views/help_step_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<title>Info</title>
<link rel="stylesheet" type="text/css" media="all" href="help.css" />
<style type="text/css">
body {
background-image: url(../pics/help/tiles_small.jpg);
}
</style>
<script type="text/javascript" src="help.utils.js"></script>
<script type="text/tmpl" id="template">
<%= b({ t: 'help_baseTile', x: 15, y: 350, tipPos: 'bottom', tipX: 125, maxWidth: 270}) %>
<%= b({ t: 'help_lostTile', x: 15, y: 140, tipPos: 'top', tipX: 30, maxWidth: 100}) %>
<%= b({ t: 'help_goodTile', x: 190, y: 160, tipPos: 'left', tipY: 30, maxWidth: 100}) %>
<%= b({ t: 'help_badTile', x: 40, y: 300, tipPos: 'top', tipX: 80, maxWidth: 240}) %>
</script>
<style type="text/css">
body {
background-image: url(../pics/help/tiles_small.jpg);
}
</style>
<script type="text/javascript" src="help.utils.js"></script>
<script type="text/tmpl" id="template">
<%= b({ t: 'help_baseTile', x: 15, y: 350, tipPos: 'bottom', tipX: 125, maxWidth: 270}) %>
<%= b({ t: 'help_lostTile', x: 15, y: 140, tipPos: 'top', tipX: 30, maxWidth: 100}) %>
<%= b({ t: 'help_goodTile', x: 190, y: 160, tipPos: 'left', tipY: 30, maxWidth: 100}) %>
<%= b({ t: 'help_badTile', x: 40, y: 300, tipPos: 'top', tipX: 80, maxWidth: 240}) %>
</script>
</head>
<body></body>
</html>
4 changes: 2 additions & 2 deletions Resources/views/help_step_3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<script type="text/javascript" src="help.utils.js"></script>
<script type="text/tmpl" id="template">
<%= b({ t: 'help_twoPlayers', x: 40, y: 10, tipPos: 'left', tipY: 25, maxWidth: 240}) %>
<%= b({ t: 'help_menuButton', x: 50, y: 270, tipPos: 'bottom', tipX: 85, maxWidth: 200}) %>
<%= b({ t: 'help_turnPop', x: 40, y: 260, tipPos: 'top', tipX: 5, maxWidth: 240}) %>
<%= b({ t: 'help_menuButton', x: 50, y: 270, tipPos: 'bottom', tipX: 85, maxWidth: 200}) %>
<%= b({ t: 'help_turnPop', x: 40, y: 260, tipPos: 'top', tipX: 5, maxWidth: 240}) %>
</script>
</head>
<body></body>
Expand Down
40 changes: 20 additions & 20 deletions Resources/views/help_step_6.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@
</style>
<script type="text/javascript" src="help.utils.js"></script>
<script type="text/tmpl" id="template">
<%= b({ t: 'help_seeds', x: 10, y: 200, tipPos: 'top', tipX: 95, maxWidth: 280}) %>
<div class="fakeMenu">
<div class="headerTitle title"><%= t.players %></div>
<div class="headerSubtitle title"><%= t.nameThePlayers %></div>
<div class="menu">
<ul>
<li class="player0">
<span id="playerLabel"><%= t.player + ' 1' %></span>
<span id="player"><%= 'krawaller' %></span>
</li>
<li>
<span id="seedLabel"><%= t.game + ' #' %></span>
<span id="seed"><%= '123456' %></span>
</li>
<li>
<span id="startGame"><%= t.startGame %></span>
</li>
</ul>
</div>
</div>
<%= b({ t: 'help_seeds', x: 10, y: 200, tipPos: 'top', tipX: 95, maxWidth: 280}) %>
<div class="fakeMenu">
<div class="headerTitle title"><%= t.players %></div>
<div class="headerSubtitle title"><%= t.nameThePlayers %></div>
<div class="menu">
<ul>
<li class="player0">
<span id="playerLabel"><%= t.player + ' 1' %></span>
<span id="player"><%= 'krawaller' %></span>
</li>
<li>
<span id="seedLabel"><%= t.game + ' #' %></span>
<span id="seed"><%= '123456' %></span>
</li>
<li>
<span id="startGame"><%= t.startGame %></span>
</li>
</ul>
</div>
</div>
</script>
</head>
<body></body>
Expand Down

0 comments on commit ebcc054

Please sign in to comment.