Merge branch 'master' of github.com:tareq1988/wordpress-settings-api-class

Conflicts:
	class.settings-api.php

Author: tareq1988

class.settings-api.php

@@ -40,6 +40,7 @@ public function __construct() {
      */
     function admin_enqueue_scripts() {
         wp_enqueue_style( 'wp-color-picker' );
+
         wp_enqueue_script( 'wp-color-picker' );
         wp_enqueue_script( 'jquery' );
         wp_enqueue_script( 'media-upload' );
@@ -341,7 +342,7 @@ function callback_color( $args ) {
         $value = esc_attr( $this->get_option( $args['id'], $args['section'], $args['std'] ) );
         $size = isset( $args['size'] ) && !is_null( $args['size'] ) ? $args['size'] : 'regular';
 
-        $html = sprintf( '<input type="text" class="%1$s-text wp-color-picker-field" id="%2$s[%3$s]" name="%2$s[%3$s]" value="%4$s"/>', $size, $args['section'], $args['id'], $value );
+        $html = sprintf( '<input type="text" class="%1$s-text wp-color-picker-field" id="%2$s[%3$s]" name="%2$s[%3$s]" value="%4$s" data-default-color="%5$s" />', $size, $args['section'], $args['id'], $value, $args['std'] );
         $html .= sprintf( '<span class="description" style="display:block;"> %s</span>', $args['desc'] );
 
         echo $html;
@@ -511,7 +512,7 @@ function(){
         </script>
 
         <style type="text/css">
-            /* WordPress 3.8 Fix */
+            /** WordPress 3.8 Fix **/
             .form-table th { padding: 20px 10px; }
             #wpbody-content .metabox-holder { padding-top: 5px; }
         </style>