From 56af548973e9bbce1bd052c4cc84f11a19e4fbf2 Mon Sep 17 00:00:00 2001 From: dylan Date: Mon, 18 Oct 2010 14:04:22 -0400 Subject: [PATCH] first jQ tab functions. in retrospect, the naming for .tabs/.projects could not be more backwards. somebody should switch them. hmm. --- includes/style.css | 67 ++++++++++++++++------------------------------ includes/tabs.js | 11 ++++---- index.php | 23 +++++++++++----- 3 files changed, 46 insertions(+), 55 deletions(-) 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 @@ dylanstestserver - + @@ -23,9 +22,21 @@ "dylanstestserver">
-
-

my projects:

repthis.info
+
+
+ REPTHIS +
+
+
+
+
+
+
+
+
+
+


-- 2.30.2