Merge branch 'master' of git.raylu.net:otakuhub

5 files changed, 98 insertions, 21 deletions

diff --git a/webroot/css/base.css b/webroot/css/base.css
index 29fd2c3..1bbd83c 100644
--- a/webroot/css/base.css
+++ b/webroot/css/base.css
@@ -24,6 +24,8 @@ h2.ribbon {
 	border-radius: 3px 3px 3px 0px;
 	-moz-border-radius: 3px 3px 3px 0px;
 	-webkit-border-radius: 3px 3px 3px 0px;
+}
+h2.full {
 	width: 890px;
 }
 .triangle-ribbon {
@@ -146,11 +148,11 @@ footer {
 	width: 980px;
 	margin: 25px auto 20px;
 }
-#page {
+article {
 	background: #fff;
 	color: #191919;
 	border: 1px solid #d9d9d9;
-	padding: 40px;
+	padding: 25px 40px 30px;
 	position: relative;
 	width: 898px;
 	margin: 0 auto;
@@ -243,13 +245,16 @@ body.ie7 form, body.ie8 {
 form p {
 	margin-bottom:15px;
 }
-form input, form textarea {
+form input, form textarea, form select {
 	padding: 7px 5px;
 	border: 1px solid #ccc;
 	border-radius: 3px;
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 }
+form select {
+	padding: 6px 5px;
+}
 input[type="button"], input[type="submit"], button {
 	padding: 6px 5px; /* looks high in FF at inherited 7 5 */
 	line-height: 18px; /* looks small in webkit at 6 5 */
@@ -257,24 +262,12 @@ input[type="button"], input[type="submit"], button {
 	display: inline-block;
 	font-weight: 700;
 	outline: none;
-	background: #ddd;
 	color: #444;
 	text-shadow: 0 -1px 0 #eee;
 	border-radius: 3px;
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 }
-input[type="button"]:hover, input[type="submit"]:hover, button:hover {
-	background: #eee;
-}
-form select {
-	padding: 6px 5px;
-	border: 1px solid #ccc;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	background-color: #eee;
-}
 
 div#login {
 	text-align: center;
diff --git a/webroot/css/search.css b/webroot/css/search.css
index ff9907e..20ea164 100644
--- a/webroot/css/search.css
+++ b/webroot/css/search.css
@@ -16,13 +16,13 @@ p.more a {
 	border-radius: 3px;
 	background: #ddd;
 	background: -moz-linear-gradient(top, #ddd, #bbb);
-	background: -webkit-linear-gradient(top, rgba(255,255,255,1), rgba(255,255,255,0));
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffffff00', GradientType=1);
+	background: -webkit-linear-gradient(top, #ddd, #bbb);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#bbbbbb');
 	color: #111;
 }
 p.more a:hover {
 	background: #eee;
 	background: -moz-linear-gradient(top, #eee, #ccc);
-	background: -webkit-linear-gradient(top, rgba(255,255,255,1), rgba(255,255,255,0));
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffffff00', GradientType=1);
+	background: -webkit-linear-gradient(top, #eee, #ccc);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#cccccc');
 }
diff --git a/webroot/css/themes/light.css b/webroot/css/themes/light.css
index b3b95ae..677557a 100644
--- a/webroot/css/themes/light.css
+++ b/webroot/css/themes/light.css
@@ -48,6 +48,28 @@ a.gradient:hover {
 	color: #fff;
 }
 
+form input, form textarea, form select {
+	background: #f7f7f7;
+	background: -moz-linear-gradient(top, #eee, #fff);
+	background: -webkit-linear-gradient(top, #eee, #fff);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eee', endColorstr='#fff');
+}
+input[type="button"], input[type="submit"], button {
+	background: #ddd;
+	background: -moz-linear-gradient(top, #ddd, #eee);
+	background: -webkit-linear-gradient(top, #ddd, #eee);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ddd', endColorstr='#eee');
+}
+form input:focus, form textarea:focus, select:focus {
+	border-color: #88c;
+}
+input[type="button"]:hover, input[type="submit"]:hover, button:hover {
+	background: #eee;
+	background: -moz-linear-gradient(top, #e0e0e0, #f7f7f7);
+	background: -webkit-linear-gradient(top, #e0e0e0, #f7f7f7);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e0e0e0', endColorstr='#f7f7f7');
+}
+
 footer {
 	color: #666;
 }
diff --git a/webroot/css/view.css b/webroot/css/view.css
new file mode 100644
index 0000000..4b0a9a1
--- /dev/null
+++ b/webroot/css/view.css
@@ -0,0 +1,48 @@
+/* for viewing individual anime/manga/kdrama, rather than table.css */
+
+aside#img {
+	float: left;
+	margin: 0 25px 25px 0;
+	width: 225px;
+}
+
+section#info {
+	float: left;
+	width: 470px;
+}
+
+section#cast {
+	float: left;
+	width: 620px;
+}
+section#cast p {
+	margin: 0;
+}
+section#cast table {
+	table-layout: fixed;
+	display: none;
+}
+section#cast td {
+	padding: 3px;
+}
+section#cast td:nth-child(1) {
+	width: 60px;
+}
+section#cast td:nth-child(2) {
+	width: 250px;
+}
+section#cast td:nth-child(3) {
+	width: 200px;
+}
+section#cast #castlink {
+	display: none;
+}
+
+aside#malstats {
+	float: right;
+	width: 150px;
+}
+
+p {
+	text-indent: 0;
+}
diff --git a/webroot/js/functions.js b/webroot/js/functions.js
index 510b0cf..86f3f3c 100644
--- a/webroot/js/functions.js
+++ b/webroot/js/functions.js
@@ -10,8 +10,22 @@ jQuery(document).ready(function($) {
 	$('form [title]').tipsy({fade: true, trigger: 'focus', gravity: 'w'});
 
 	setTimeout(function() {
-		$(".flash-message").fadeOut("slow", function () {
-			$(".flash-message").remove();
+		$('.flash-message').fadeOut('slow', function () {
+			$('.flash-message').remove();
 		});
 	}, 2000);
 });
+
+function toggleCast() {
+	var table = $('#cast table');
+	if (table.css('display') == 'inline') {
+		table.css('display', 'none');
+		$('#cast > p > a').text('Cast ↓');
+		$('#castlink').css('display', 'none');
+	} else {
+		table.css('display', 'inline');
+		$('#cast > p > a').text('Cast ↑');
+		$('#castlink').css('display', 'inline');
+	}
+	return false;
+}