Merge branch 'pull'

2 files changed, 5 insertions, 14 deletions

diff --git a/view/theme/testbubble/profile_tabs.tpl b/view/theme/testbubble/profile_tabs.tpl
deleted file mode 100644
index ae7c65e1c..000000000
--- a/view/theme/testbubble/profile_tabs.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="tabs-wrapper" >
-	<a href="$url" id="profile-tab-status-link" class="button tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
-	<a href="$url?tab=profile" id="profile-tab-profile-link" class="button tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
-	<a href="$phototab" id="profile-tab-photos-link" class="button tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
-	{{ if $events }}<a href="events" id="profile-tab-events-link" class="button tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
-	{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="button tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}	
-<div class="tabs-end"></div>
-</div>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 5621a972b..341314c1d 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -822,22 +822,22 @@ profile-jot-banner-wrapper {
 /* = Tabs = */
 /* ======== */
 
-.tabs-wrapper {
+.tabs {
 	width: 450px;
 	list-style: none;
 	padding: 10px;
 	margin: 0px 0px 10px 0px;
 	border-bottom: 1px solid #efefef;
 }
-.tabs-wrapper li { display: inline;}
+.tabs li { display: inline;}
 
-.tabs {
+.tab {
 	padding: 5px 10px 5px 10px;
 	margin-right: 5px;
 	font-style: bold;
 }
 
-.tabs:hover {
+.tab:hover {
 	padding: 5px 10px 5px 10px;
 }
 
@@ -3085,4 +3085,4 @@ ul.menu-popup {
 
 #jGrowl {
 	z-index: 20000;
-}
\ No newline at end of file
+}