Skip to content

Commit

Permalink
Styling and parent fixes for diff.
Browse files Browse the repository at this point in the history
  • Loading branch information
emackey committed Mar 4, 2012
1 parent c2fa0c2 commit 1a67429
Showing 1 changed file with 18 additions and 10 deletions.
28 changes: 18 additions & 10 deletions server/assets/diff.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
}
h2 {
margin: 0.5em 0 0.1em;
text-align: center;
}
a, a:visited {
text-decoration: none;
}
a:focus, a:hover {
text-decoration: underline;
}
label:hover {
text-decoration: underline;
Expand All @@ -24,6 +29,9 @@
table.diff {
white-space: pre-wrap;
}
.top {
text-align: center;
}
.textInput {
display: block;
width: 49%;
Expand Down Expand Up @@ -64,18 +72,18 @@
function computeNames() {
if (!leftSide.loaded) {
leftSide.name = 'Not loaded';
} else if (rightSide.parent === leftSide.id) {
leftSide.name = 'Parent effect ' + leftSide.id;
} else if (rightSide.parent.substring(3) === leftSide.id) {
leftSide.name = 'parent effect ' + leftSide.id;
} else {
leftSide.name = 'Effect ' + leftSide.id;
leftSide.name = 'effect ' + leftSide.id;
}

if (!rightSide.loaded) {
rightSide.name = 'Not loaded';
} else if (leftSide.parent === rightSide.id) {
rightSide.name = 'Parent effect ' + rightSide.id;
} else if (leftSide.parent.substring(3) === rightSide.id) {
rightSide.name = 'parent effect ' + rightSide.id;
} else {
rightSide.name = 'Effect ' + rightSide.id;
rightSide.name = 'effect ' + rightSide.id;
}

document.getElementById('subtitle').innerHTML =
Expand Down Expand Up @@ -150,9 +158,9 @@
</script>
</head>
<body>
<h1><a href="/">GLSL Sandbox</a> Diff</h1>
<h2 id="subtitle">&nbsp;</h2>
<div>
<h1 class="top"><a href="/">GLSL Sandbox</a> Diff</h1>
<h2 class="top" id="subtitle">&nbsp;</h2>
<div class="top">
<input type="radio" name="_viewtype" checked="checked" id="sidebyside" onclick="showDiff(0);" />
<label for="sidebyside">Side-by-side diff</label>
&nbsp; &nbsp;
Expand Down

0 comments on commit 1a67429

Please sign in to comment.