From 5318589afb8f6ec4225032a9d65966ef1d6bd52e Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Wed, 26 Mar 2014 21:49:53 +0000
Subject: [PATCH] Fix tabs layout when used on a dialog window
---
scp/css/scp.css | 6 ++++++
scp/js/scp.js | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 4500c2dfb..50bea7ea4 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1359,6 +1359,12 @@ time {
font-size:0.75em;
}
+.dialog ul.tabs, .dialog ul.tabs * {
+ box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+}
+
.dialog.draggable h3:hover {
cursor: crosshair;
}
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 003c41913..d067b05d5 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -562,7 +562,7 @@ $(document).ready(function(){
$(document).on('click.tab', 'ul.tabs li a', function(e) {
e.preventDefault();
if ($('.tab_content'+$(this).attr('href')).length) {
- $('ul.tabs li a').removeClass('active');
+ $('ul.tabs li a', $(this).closest('ul').parent()).removeClass('active');
$(this).addClass('active');
$('.tab_content').hide();
$('.tab_content'+$(this).attr('href')).show();
--
GitLab