From: dylan <dylan@MAJUSCULE.(none)>
Date: Mon, 18 Oct 2010 18:04:22 +0000 (-0400)
Subject: first jQ tab functions.
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=56af548973e9bbce1bd052c4cc84f11a19e4fbf2;p=dylansserver.git

first jQ tab functions.

in retrospect, the naming for .tabs/.projects could not be more backwards. somebody should switch them. hmm.
---

diff --git a/includes/style.css b/includes/style.css
index a370571..64038be 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -35,50 +35,6 @@
 	margin-right:15px;
 }
 
-#nav_bar {
-	float:right;
-	width:750px;
-	margin-top:25px;
-	margin-right:17px;
-}
-
-#nav_bar ul.tabs {
-	width:750px;
-	border-left: 1px solid black;
-	border-bottom: 1px solid black;
-	height:40px;
-	text-align:center;
-}
-
-#nav_bar li {
-	text-align:center;
-	float:left;
-	border-top: 1px solid black;
-	border-right: 1px solid black;
-	list-style:none;
-	line-height: 40px;
-	height: 39px;
-	margin-bottom: -1px;
-}
-
-#nav_bar a {
-	display:block;
-	padding-left:3px;
-	padding-right:3px;
-	margin-left:1px;
-	margin-right:1px;
-	text-decoration:none;
-	color:black;
-}
-
-#nav_bar ul.tabs li.active {
-	border-bottom: 1px solid #fff;
-}
-
-#nav_bar ul.tabs li.active a {
-	font-weight:bold;
-}
-
 #content {
 	float:right;
 	width:725px;
@@ -90,3 +46,26 @@
 	padding-top:25px;
 	padding-bottom:25px;
 }
+
+.portfolio {
+	float:right;
+	width:350px;
+	margin-right:17px;
+}
+
+#exhibit {
+	float:right;
+	width:150px:
+	margin-top:25px;
+	margin-right:17px;
+}
+
+.project {
+	float:right;
+	list-style:none;
+}
+
+.active {
+	display:block;
+	margin-right:-15px;
+}
diff --git a/includes/tabs.js b/includes/tabs.js
index 57673e5..9107b0c 100644
--- a/includes/tabs.js
+++ b/includes/tabs.js
@@ -1,13 +1,14 @@
 $(document).ready(function() {
 
+	$(".tabs").hide();
 	$("ul.portfolio li").click(function() {
 		//$("ul.tabs li").removeClass("active");
-			$(this).addClass("active");
-			$(".exhibit").hide();
+		$(this).addClass("active");
+		$(".exhibit").hide();
 
-			var activeTab = $(this).find("a").attr("href");
-			$(activeTab).fadeIn();
-			return false;
+		var activeTab = $(this).find("a").attr("href");
+		$(activeTab).fadeIn();
+		return false;
 	});
 
 });
diff --git a/index.php b/index.php
index 62e0586..2c648c3 100644
--- a/index.php
+++ b/index.php
@@ -11,8 +11,7 @@
   <title>dylanstestserver</title>
   <link href="includes/style.css" rel="stylesheet" type="text/css">
   <link rel="icon" href="icon.png" type="image/png">
-  <script type="text/javascript" src="includes/jquery.js">
-</script>
+  <script type="text/javascript" src="includes/jquery.js"></script>
   <script type="text/javascript" src="includes/tabs.js">
 </script>
 </head>
@@ -23,9 +22,21 @@
     "dylanstestserver"></div>
 
     <div id="content">
-      <div style="text-align:right">
-        <h3>my projects:</h3><a href=
-        "http://repthis.info">repthis.info</a><br>
+	<div id="exhibit">
+		<div class="tabs" id="repthis">
+			REPTHIS
+		</div>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+	</div>
+      <ul class="portfolio" style="text-align:right">
+        <h3>my projects:</h3>
+	<li class="project"><a href="#repthis">repthis.info</a></li><br>
         <a href=
         "foxy-addons/peepshow/">foxy-addons/peepshow/</a><br>
         <a href="readoo/">readoo/</a><br>
@@ -51,7 +62,7 @@
 
         <h1><a href="mailto:dylan@psu.edu">dylan</a></h1><a href=
         "mailto:dylan@psu.edu">@psu.edu</a>
-      </div>
+      </ul>
     </div><br>
     <br>
   </div>