[Pkg-javascript-commits] [jquery-minicolors] 08/46: Update without-bootstrap.html

[David Prévot]

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

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

commit ebd2ccd9c152a275a0f7aba824c06f4d1ca29fdf
Author: Cyril Rezé <cyril.reze at joomlic.com>
Date:   Thu Sep 17 02:28:37 2015 +0200

    Update without-bootstrap.html
---
 without-bootstrap.html | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/without-bootstrap.html b/without-bootstrap.html
index 3cef51d..0fe3f82 100644
--- a/without-bootstrap.html
+++ b/without-bootstrap.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
 
     <!-- jQuery -->
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 
     <!-- MiniColors -->
     <script src="jquery.minicolors.js"></script>
@@ -49,6 +49,8 @@
                 $(this).minicolors({
                     control: $(this).attr('data-control') || 'hue',
                     defaultValue: $(this).attr('data-defaultValue') || '',
+                    format: $(this).attr('data-format') || 'hex',
+                    keywords: $(this).attr('data-keywords') || '',
                     inline: $(this).attr('data-inline') === 'true',
                     letterCase: $(this).attr('data-letterCase') || 'lowercase',
                     opacity: $(this).attr('data-opacity'),
@@ -132,6 +134,19 @@
         <input type="text" id="position-top-right" class="demo" data-position="top right" value="#0088cc">
     </div>
 
+    <!-- RGB(A) -->
+    <h3>RGB(A)</h3>
+    <div class="form-group">
+        <label for="rgb">rgb</label>
+        <br>
+        <input type="text" id="rgb" class="demo" data-format="rgb" value="rgb(33, 147, 58)">
+    </div>
+    <div class="form-group">
+        <label for="rgba">rgb(a)</label>
+        <br>
+        <input type="text" id="rgba" class="demo" data-format="rgb" data-opacity=".5" value="rgba(52, 64, 158, 0.5)">
+    </div>
+
     <!-- and more -->
     <h3>…and more!</h3>
     <div class="form-group">
@@ -140,6 +155,11 @@
         <input type="text" id="opacity" class="demo" data-opacity=".5" value="#766fa8">
     </div>
     <div class="form-group">
+        <label for="keywords">Keywords</label>
+        <br>
+        <input type="text" id="keywords" class="demo" data-keywords="transparent, inherit, initial" value="transparent">
+    </div>
+    <div class="form-group">
         <label for="default-value">Default Value</label>
         <br>
         <input type="text" id="default-value" class="demo" data-defaultValue="#ff6600">
@@ -151,4 +171,4 @@
     </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>

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