Merge pull request #407 from tkrotoff/master

Update Bootstrap style
qTip2 · Oct 6, 2012 · b32623d · b32623d
2 parents bfcc9ef + f667a14
commit b32623d
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 80 deletions.
diff --git a/dist/basic/jquery.qtip.css b/dist/basic/jquery.qtip.css
@@ -1,7 +1,7 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-09-10
-* http://craigsworks.com/projects/qtip2/
-* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
-
+/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-10-03
+* http://craigsworks.com/projects/qtip2/
+* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
+
 /* Fluid class for determining actual width in IE */
 #qtip-rcontainer{
 	position: absolute;
@@ -128,7 +128,7 @@
 		color: #111;
 	}
 
-
+
 /*! Light tooltip style */
 .ui-tooltip-light{
 	background-color: white;

diff --git a/dist/basic/jquery.qtip.js b/dist/basic/jquery.qtip.js
@@ -1,7 +1,7 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-09-10
-* http://craigsworks.com/projects/qtip2/
-* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
-
+/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-10-03
+* http://craigsworks.com/projects/qtip2/
+* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
+
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
 /*global window: false, jQuery: false, console: false, define: false */
 
@@ -62,7 +62,7 @@
 	$(function() { redrawContainer.appendTo(document.body); });
 
 
-
+
 // Option object sanitizer
 function sanitizeOptions(opts)
 {
@@ -1837,6 +1837,6 @@ QTIP.defaults = {
 	}
 };
 
-
+
 }));
 }( window, document ));
diff --git a/dist/basic/jquery.qtip.min.css b/dist/basic/jquery.qtip.min.css
diff --git a/dist/basic/jquery.qtip.min.js b/dist/basic/jquery.qtip.min.js
diff --git a/dist/jquery.qtip.css b/dist/jquery.qtip.css
@@ -1,7 +1,7 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-09-10
-* http://craigsworks.com/projects/qtip2/
-* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
-
+/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-10-03
+* http://craigsworks.com/projects/qtip2/
+* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
+
 /* Fluid class for determining actual width in IE */
 #qtip-rcontainer{
 	position: absolute;
@@ -128,7 +128,7 @@
 		color: #111;
 	}
 
-
+
 /*! Light tooltip style */
 .ui-tooltip-light{
 	background-color: white;
@@ -232,7 +232,7 @@
 		background-position: -2px 0;
 	}
 
-
+
 /* Add shadows to your tooltips in: FF3+, Chrome 2+, Opera 10.6+, IE9+, Safari 2+ */
 .ui-tooltip-shadow{
 	-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
@@ -449,52 +449,86 @@
  * Does not work with IE 7.
  */
 .ui-tooltip-bootstrap{
-	font-size: 13px;
-	line-height: 18px;
-
+	/** Taken from Bootstrap body */
+	font-size: 14px;
+	line-height: 20px;
 	color: #333333;
-	background-color: #ffffff;
-
 
+	/** Taken from Bootstrap .popover */
+	padding: 1px;
+	background-color: #ffffff;
 	border: 1px solid #ccc;
 	border: 1px solid rgba(0, 0, 0, 0.2);
-
-	*border-right-width: 2px;
-	*border-bottom-width: 2px;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
 	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
 	-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
 	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-
 	-webkit-background-clip: padding-box;
 	-moz-background-clip: padding;
 	background-clip: padding-box;
 }
 
 	.ui-tooltip-bootstrap .ui-tooltip-titlebar{
-		font-size: 18px;
-		line-height: 22px;
-
-		border-bottom: 1px solid #ccc;
-		background-color: transparent;
+		/** Taken from Bootstrap .popover-title */
+		padding: 8px 14px;
+		margin: 0;
+		font-size: 14px;
+		font-weight: normal;
+		line-height: 18px;
+		background-color: #f7f7f7;
+		border-bottom: 1px solid #ebebeb;
+		-webkit-border-radius: 5px 5px 0 0;
+		-moz-border-radius: 5px 5px 0 0;
+		border-radius: 5px 5px 0 0;
 	}
 
 		.ui-tooltip-bootstrap .ui-tooltip-titlebar .ui-state-default{
-			right: 9px; top: 49%;
+			/**
+			 * Overrides qTip2:
+			 * .ui-tooltip-titlebar .ui-state-default{
+			 *   [...]
+			 *   right: 4px;
+			 *   top: 50%;
+			 *   [...]
+			 *   border-style: solid;
+			 * }
+			 */
+			right: 11px;
+			top: 45%;
 			border-style: none;
 		}
 
+	.ui-tooltip-bootstrap .ui-tooltip-content{
+		/** Taken from Bootstrap .popover-content */
+		padding: 9px 14px;
+	}
+
 	.ui-tooltip-bootstrap .ui-tooltip-icon{
-		background: white;
+		/**
+		 * Overrides qTip2:
+		 * .ui-tooltip-default .ui-tooltip-icon {
+		 *   border-color: #CCC;
+		 *   background: #F1F1F1;
+		 *   color: #777;
+		 * }
+		 */
+		background: transparent;
 	}
 
 		.ui-tooltip-bootstrap .ui-tooltip-icon .ui-icon{
+			/**
+			 * Overrides qTip2:
+			 * .ui-tooltip-icon .ui-icon{
+			 *   width: 18px;
+			 *   height: 14px;
+			 * }
+			 */
 			width: auto;
 			height: auto;
+
+			/* Taken from Bootstrap .close */
 			float: right;
 			font-size: 20px;
 			font-weight: bold;
@@ -506,6 +540,7 @@
 		}
 
 		.ui-tooltip-bootstrap .ui-tooltip-icon .ui-icon:hover{
+			/* Taken from Bootstrap .close:hover */
 			color: #000000;
 			text-decoration: none;
 			cursor: pointer;
@@ -521,7 +556,7 @@
 	-ms-filter: none;
 }
 
-
+
 /* Tips plugin */
 .ui-tooltip .ui-tooltip-tip{
 	margin: 0 auto;
@@ -547,7 +582,7 @@
 		behavior: url(#default#VML);
 		display: inline-block;
 		visibility: visible;
-	}
+	}
 /* Modal plugin */
 #qtip-overlay{
 	position: fixed;

diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js
@@ -1,7 +1,7 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-09-10
-* http://craigsworks.com/projects/qtip2/
-* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
-
+/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-10-03
+* http://craigsworks.com/projects/qtip2/
+* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
+
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
 /*global window: false, jQuery: false, console: false, define: false */
 
@@ -62,7 +62,7 @@
 	$(function() { redrawContainer.appendTo(document.body); });
 
 
-
+
 // Option object sanitizer
 function sanitizeOptions(opts)
 {
@@ -1837,7 +1837,7 @@ QTIP.defaults = {
 	}
 };
 
-
+
 PLUGINS.svg = function(api, svg, corner, adjustMethod)
 {
 	var doc = $(document),
@@ -1885,7 +1885,7 @@ PLUGINS.svg = function(api, svg, corner, adjustMethod)
 	return result;
 };
 
-
+
 function Ajax(api)
 {
 	var self = this,
@@ -2054,7 +2054,7 @@ $.extend(TRUE, QTIP.defaults, {
 	}
 });
 
-
+
 // Tip coordinates calculator
 function calculateTip(corner, width, height)
 {	
@@ -2689,7 +2689,7 @@ $.extend(TRUE, QTIP.defaults, {
 	}
 });
 
-
+
 function Modal(api)
 {
 	var self = this,
@@ -3013,7 +3013,7 @@ $.extend(TRUE, QTIP.defaults, {
 	}
 });
 
-
+
 PLUGINS.viewport = function(api, position, posOptions, targetWidth, targetHeight, elemWidth, elemHeight)
 {
 	var target = posOptions.target,
@@ -3125,7 +3125,7 @@ PLUGINS.viewport = function(api, position, posOptions, targetWidth, targetHeight
 	}
 
 	return adjusted;
-};
+};
 PLUGINS.imagemap = function(api, area, corner, adjustMethod)
 {
 	if(!area.jquery) { area = $(area); }
@@ -3283,7 +3283,7 @@ PLUGINS.imagemap = function(api, area, corner, adjustMethod)
 	return result;
 };
 
-
+
 /* 
  * BGIFrame adaption (http://plugins.jquery.com/project/bgiframe)
  * Special thanks to Brandon Aaron
@@ -3360,6 +3360,6 @@ PLUGINS.bgiframe = function(api)
 // Plugin needs to be initialized on render
 PLUGINS.bgiframe.initialize = 'render';
 
-
+
 }));
 }( window, document ));