active_frontend 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b35a8a9004aa928de48a975c29fa7e3e059aa6
-  data.tar.gz: ad9af5736fe77d2d1c5ad310a8540821659f5fc9
+  metadata.gz: b7e91d4292e31fd7dee56656a7c4b0d0ebe7ed11
+  data.tar.gz: 6d6e8124b97bf558efc6902208541098ee767df7
 SHA512:
-  metadata.gz: 12892902f34a5fca4b1890d026605363521822a54b38f2521872f8f6f4028d429935945535d45a9362511cb2eee825236dd36076d005648d77e2375e5fdb8c87
-  data.tar.gz: 2b879180927c23a518f48f02412ff76ef246f0ae92b0004c039fabfaf0526cb22ff6861bdabb9d772021424b19914be2fa73f2d93a4d198e34cd6a11a503c62a
+  metadata.gz: 17321d1381613b49bb12cd4ce5ab9a1743463fd47ad62a54d145984afd69e36a3ecf092cd2a45b80133ca2b9316129213f27eae19f47156983c336276d010736
+  data.tar.gz: 2b1b7d3c37c0e65566f769c22c3b63288c7d299e2430361521fd39af15a50753b977acbbaa8db783817cbc75cccf211f388e3f3f6fc8c612c2ba7f5e9620cb2c

data/lib/active_frontend/version.rb

@@ -1,3 +1,3 @@
 module ActiveFrontend
-  VERSION = "2.0.11"
+  VERSION = "2.0.12"
 end

data/vendor/assets/javascripts/color_picker.js

@@ -12,73 +12,55 @@
     constructor : ColorPicker,
 
     _init : function() {
-
-      var callback = this.options.callback;
-
+      var callback    = this.options.callback;
       var selectValue = this.$select.val();
       var selectColor = this.$select.find("option:selected").data("color");
 
-      var $markupUl = $("<ul>").addClass("dropdown-menu").addClass("dropdown-caret");
-      var $markupDiv = $("<div>").addClass("dropdown").addClass("dropdown-colorpicker");
-      var $markupSpan = $("<span>").addClass("btn-colorpicker").css("background-color", selectColor);
-      var $markupA = $("<a>").attr("data-toggle", "dropdown").addClass("dropdown-toggle").attr("href", "#").append($markupSpan);
+      var $markupUl   = $("<ul>").addClass("dropdown-menu").addClass("dropdown-caret");
+      var $markupDiv  = $("<div>").addClass("dropdown").addClass("dropdown-colorpicker");
+      var $markupSpan = $("<span>").addClass("dropdown-swatch").css("background", selectColor);
+      var $markupA    = $("<a>").attr("data-toggle", "dropdown").addClass("dropdown-toggle").attr("href", "#").append($markupSpan);
 
-      // create an li-tag for every option of the select
       $("option", this.$select).each(function() {
-
         var option = $(this);
-        var value = option.attr("value");
-        var color = option.data("color");
-        var title = option.text();
+        var value  = option.attr("value");
+        var color  = option.data("color");
+        var title  = option.text();
 
-        // create a-tag
-        var $markupA = $("<a>").addClass("color-btn");
+        var $markupA = $("<a>").addClass("colorpicker-swatch");
         if (option.prop("selected") === true || selectValue === color) {
           $markupA.addClass("selected");
         }
-        $markupA.css("background-color", color);
+        $markupA.css("background", color);
         $markupA.attr("href", "#").attr("data-color", color).attr("data-value", value).attr("title", title);
 
-        // create li-tag
         $markupUl.append($("<li>").append($markupA));
       });
 
-      // append the colorpicker
       $markupDiv.append($markupA);
-      // append the colorpicker-dropdown
       $markupDiv.append($markupUl);
 
-      // hide the select
       this.$select.hide();
-
-      // insert the colorpicker
       this.$selector = $($markupDiv).insertAfter(this.$select);
-
-      // register change handler
       this.$select.on("change", function() {
-
         var value = $(this).val();
         var color = $(this).find("option[value='" + value + "']").data("color");
         var title = $(this).find("option[value='" + value + "']").text();
 
-        // remove old and set new selected color
         $(this).next().find("ul").find("li").find(".selected").removeClass("selected");
         $(this).next().find("ul").find("li").find("a[data-color='" + color + "']").addClass("selected");
-
-        $(this).next().find(".btn-colorpicker").css("background-color", color);
+        $(this).next().find(".dropdown-swatch").css("background", color);
 
         callback(value, color, title);
       });
 
-      // register click handler
       $markupUl.on('click.colorpicker', $.proxy(this._clickColor, this));
     },
 
     _clickColor : function(e) {
-
       var a = $(e.target);
 
-      if (!a.is(".color-btn")) {
+      if (!a.is(".colorpicker-swatch")) {
         return false;
       }
 
@@ -89,7 +71,6 @@
     },
 
     setColor : function(color) {
-      // find value for color
       var value = $(this.$selector).find("li").find("a[data-color='" + color + "']").data("value");
       this.setValue(value);
     },
@@ -105,12 +86,12 @@
     args.shift();
 
     return this.each(function() {
-
       var $this = $(this), data = $this.data("colorpicker"), options = $.extend({}, $.fn.colorpicker.defaults, $this.data(), typeof option == "object" && option);
 
       if (!data) {
         $this.data("colorpicker", (data = new ColorPicker(this, options)));
       }
+
       if (typeof option == "string") {
         data[option].apply(data, args);
       }

data/vendor/assets/stylesheets/colorpicker.scss

@@ -4,41 +4,17 @@
 
 /* # Colorpicker
 ================================================== */
-.dropdown-colorpicker > .dropdown-menu {
-  left: -7px;
-  padding: 4px;
-}
-.dropdown-colorpicker > .dropdown-menu.pull-right {
-  left: auto;
-  right: -7px;
-}
-.dropdown-colorpicker > .dropdown-menu.dropdown-caret:before {
-  border-bottom: 7px solid rgba(245,248,250,1);
-  border-left: 7px solid transparent;
-  border-right: 7px solid transparent;
-  content: "";
-  display: inline-block;
-  left: 9px;
-  position: absolute;
-  top: -7px;
-}
-.dropdown-colorpicker > .dropdown-menu.dropdown-caret:after {
-  border-bottom: 6px solid rgba(245,248,250,1);
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  content: "";
+.dropdown-swatch {
+  background: rgba(102,117,127,1);
+  border-radius: 2px;
   display: inline-block;
-  left: 10px;
-  position: absolute;
-  top: -6px;
-}
-.dropdown-colorpicker > .dropdown-menu.pull-right.dropdown-caret:before {
-  left: auto;
-  right: 9px;
+  height: 25px;
+  vertical-align: middle;
+  width: 25px;
 }
-.dropdown-colorpicker > .dropdown-menu.pull-right.dropdown-caret:after {
-  left: auto;
-  right: 10px;
+.dropdown-colorpicker > .dropdown-menu {
+  margin-left: -5px;
+  padding: 4px;
 }
 .dropdown-colorpicker > .dropdown-menu > li {
   display: block;
@@ -47,7 +23,7 @@
   height: 26px;
   margin: 2px;
 }
-.dropdown-colorpicker > .dropdown-menu > li > .color-btn {
+.dropdown-colorpicker > .dropdown-menu > li > .colorpicker-swatch {
   border-radius: 2px;
   display: block;
   height: 26px;
@@ -59,7 +35,7 @@
   transition: all ease 0.1s;
   width: 26px;
 }
-.dropdown-colorpicker > .dropdown-menu > li > .color-btn.selected:after {
+.dropdown-colorpicker > .dropdown-menu > li > .colorpicker-swatch.selected:after {
   color: rgba(255,255,255,1);
   content: "\f3fe";
   display: inline-block;
@@ -70,12 +46,4 @@
   position: absolute;
   right: 0;
   text-align: center;
-}
-.btn-colorpicker {
-  background: rgba(102,117,127,1);
-  border-radius: 2px;
-  display: inline-block;
-  height: 25px;
-  vertical-align: middle;
-  width: 25px;
 }

data/vendor/assets/stylesheets/datepicker.scss

@@ -74,6 +74,7 @@
   cursor: pointer;
 }
 .datepicker td.day.disabled { color: rgba(136,153,166,1); }
+.datepicker td.day.disabled:hover { color: rgba(43,50,53,1); }
 .datepicker td.old,
 .datepicker td.new { color: rgba(136,153,166,1); }
 .datepicker td.active,

data/vendor/assets/stylesheets/dropdown.scss

@@ -67,6 +67,35 @@
   padding-right: 20px;
   padding-left: 20px;
 }
+.dropdown-menu.dropdown-caret { top: calc(100% + 5px); }
+.dropdown-menu.dropdown-caret:before {
+  border-bottom: 7px solid rgba(240,243,250,1);
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  content: "";
+  display: inline-block;
+  left: 9px;
+  position: absolute;
+  top: -7px;
+}
+.dropdown-menu.dropdown-caret:after {
+  border-bottom: 6px solid rgba(245,248,250,1);
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  content: "";
+  display: inline-block;
+  left: 10px;
+  position: absolute;
+  top: -6px;
+}
+.dropdown-menu.pull-right.dropdown-caret:before {
+  left: auto;
+  right: 9px;
+}
+.dropdown-menu.pull-right.dropdown-caret:after {
+  left: auto;
+  right: 10px;
+}
 
 /* # Submenu
 ================================================== */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_frontend
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: ActiveFrontend Responsive Web Framework