[Pkg-javascript-commits] [jquery-minicolors] 12/28: Updated from Bootstrap 3-RC1 to Bootstrap 3

Sun Sep 8 14:57:27 UTC 2013

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository jquery-minicolors.

commit 584374eba5fe1f6333379263afb8353dc9e6a098
Author: Cory LaViska <cory at abeautifulsite.net>
Date:   Tue Aug 20 11:31:47 2013 -0400

    Updated from Bootstrap 3-RC1 to Bootstrap 3
---
 index.html            |   13 +++++--------
 jquery.minicolors.css |    4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index c819257..234cdc5 100644
--- a/index.html
+++ b/index.html
@@ -8,17 +8,14 @@
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 	
 	<!-- Bootstrap 3 -->
-	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css">
-	<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js"></script>
+	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
+	<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
 	
 	<!-- MiniColors -->
 	<script src="jquery.minicolors.js"></script>
 	<link rel="stylesheet" href="jquery.minicolors.css">
 	
 	<style>
-		body {
-			line-height: 1.8;
-		}
 		dl {
 			margin: 20px 0;
 		}
@@ -60,8 +57,8 @@
                 //  $(selector).minicolors();
                 //
                 // The way I've done it below is just for the demo, so don't get confused 
-                // by it. Also, data- attributes aren't supported at this time. Again, 
-                // they're only used for the purposes of this demo.
+                // by it. Also, data- attributes aren't supported at this time...they're 
+                // only used for this demo.
                 //
 				$(this).minicolors({
 					control: $(this).attr('data-control') || 'hue',
@@ -87,7 +84,7 @@
 	</script>
 </head>
 <body>
-	<div class="row" style="margin: 40px 20px;">
+	<div class="row" style="margin: 40px 40px;">
 		<div class="col-12">
 			
 			<!-- Intro -->
diff --git a/jquery.minicolors.css b/jquery.minicolors.css
index aa09ea6..f6fce96 100644
--- a/jquery.minicolors.css
+++ b/jquery.minicolors.css
@@ -228,8 +228,8 @@
 .minicolors-theme-bootstrap .minicolors-swatch {
 	top: 3px;
 	left: 3px;
-	width: 32px;
-	height: 32px;
+	width: 28px;
+	height: 28px;
 	border-radius: 3px;
 }
 .minicolors-theme-bootstrap.minicolors-position-right .minicolors-swatch {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/jquery-minicolors.git

