Merge pull request #163 from Freemius/develop

Develop

.gitignore

@@ -0,0 +1,16 @@
+output/
+assets/img/icon.*
+
+pootle-page-builder.png
+rating-widget.jpg
+hello-dolly-pro.png
+woocommerce-fiscalita-italiana.png
+assets/img/content-aware-sidebars.png
+assets/img/custom-post-type-ui.png
+.idea
+nextgen-gallery.png
+node_modules
+languages/_freemius-en.mo
+languages/_freemius-en.po
+foobox-image-lightbox.png
+transifex-config.json

assets/scss/_colors.scss

@@ -20,16 +20,23 @@ $fs-logo-blue-color: #29abe1;
 $fs-logo-green-color: #71ae00;
 $fs-logo-magenta-color: #d3135a;
 
-$fs-notice-promotion-border-color: #00a0d2;
-$fs-notice-promotion-bkg: #f2fcff;
-
 // WordPress colors.
 $page-header-bkg: #333;
 $page-header-color: $fms-white;
 $text-dark-color: #333;
 $text-light-color: #666;
 $text-lightest-color: #999;
 
+// Notices.
+$wp-notice-success-color: #f7fff7;
+$wp-notice-success-dark-color: #46b450;
+$wp-notice-error-color: #ffeaea;
+$wp-notice-error-dark-color: #dc3232;
+$wp-notice-warn-color: #fff8e5;
+$wp-notice-warn-dark-color: #ffb900;
+$fs-notice-promotion-border-color: #00a0d2;
+$fs-notice-promotion-bkg: #f2fcff;
+
 // WP Buttons.
 $button-primary-bkg: #6bc406;
 $button-primary-color: $fms-white;

assets/scss/_mixins.scss

@@ -78,13 +78,13 @@ $useIEFilters: 0;
 }
 
 // requires sass 3.2
-//@mixin keyframes {
-//     @-moz-keyframes { @content; }
-//      @-ms-keyframes { @content; }
-//       @-o-keyframes { @content; }
-//  @-webkit-keyframes { @content; }
-//          @keyframes { @content; }
-//}
+@mixin keyframes($name){
+     @-moz-keyframes #{$name} { @content; }
+      @-ms-keyframes #{$name} { @content; }
+       @-o-keyframes #{$name} { @content; }
+  @-webkit-keyframes #{$name} { @content; }
+          @keyframes #{$name} { @content; }
+}
 
 @mixin linear-gradient($from, $to, $ie: $useIEFilters) {
   @if $ie != 1 { background-color: $to; }
@@ -192,6 +192,62 @@ $useIEFilters: 0;
           transition: $value;
 }
 
+@mixin animation($str) {
+    -webkit-animation: #{$str};
+    -moz-animation: #{$str};
+    -ms-animation: #{$str};
+    -o-animation: #{$str};
+    animation: #{$str};
+}
+
+@mixin animation-name($str) {
+    -webkit-animation-name: #{$str};
+    -moz-animation-name: #{$str};
+    -ms-animation-name: #{$str};
+    -o-animation-name: #{$str};
+    animation-name: #{$str};
+}
+
+@mixin animation-duration($str) {
+    -webkit-animation-duration: #{$str};
+    -moz-animation-duration: #{$str};
+    -ms-animation-duration: #{$str};
+    -o-animation-duration: #{$str};
+    animation-duration: #{$str};
+}
+
+@mixin animation-direction($str) {
+    -webkit-animation-direction: #{$str};
+    -moz-animation-direction: #{$str};
+    -ms-animation-direction: #{$str};
+    -o-animation-direction: #{$str};
+    animation-direction: #{$str};
+}
+
+@mixin animation-delay($str) {
+    animation-delay:#{$str};
+    -o-animation-delay:#{$str};
+    -ms-animation-delay:#{$str};
+    -webkit-animation-delay:#{$str};
+    -moz-animation-delay:#{$str};
+}
+
+@mixin animation-iteration-count($str) {
+    animation-iteration-count:#{$str};
+    -o-animation-iteration-count:#{$str};
+    -ms-animation-iteration-count:#{$str};
+    -webkit-animation-iteration-count:#{$str};
+    -moz-animation-iteration-count:#{$str};
+}
+
+@mixin animation-timing-function($str) {
+    -webkit-animation-timing-function: #{$str};
+    -moz-animation-timing-function: #{$str};
+    -ms-animation-timing-function: #{$str};
+    -o-animation-timing-function: #{$str};
+    animation-timing-function: #{$str};
+}
+
 // ==== /CSS3 SASS MIXINS ====
 
 @mixin opacity($opacity) {

assets/scss/admin/_ajax-loader.scss

@@ -0,0 +1,49 @@
+$color: $wp-selected-color;
+$bkg-color: #fff;
+$size: 20;
+
+.fs-ajax-loader
+{
+    position: relative;
+    width:    #{8*$size + 10}px;
+    height:   #{$size}px;
+    margin:   auto;
+
+    .fs-ajax-loader-bar
+    {
+        position:         absolute;
+        top:              0;
+        background-color: $color;
+        width:            #{$size}px;
+        height:           #{$size}px;
+        @include animation-name(bounce_ajaxLoader);
+        @include animation-duration(1.5s);
+        @include animation-iteration-count(infinite);
+        @include animation-direction(normal);
+        @include transform(.3);
+    }
+
+    @for $i from 0 through 7
+    {
+        .fs-ajax-loader-bar-#{$i + 1}
+        {
+            left: #{$i*($size - 1)}px;
+            @include animation-delay(#{0.6 + $i*0.15}s);
+        }
+    }
+}
+
+@include keyframes(bounce_ajaxLoader)
+{
+    0%
+    {
+        @include transform(scale(1));
+        background-color: $color;
+    }
+
+    100%
+    {
+        @include transform(scale(.3));
+        background-color: $bkg-color;
+    }
+}

assets/scss/admin/_auto-install.scss

@@ -0,0 +1,33 @@
+.fs-modal-auto-install
+{
+    $max-width: 300px;
+
+    #request-filesystem-credentials-form
+    {
+        h2,
+        .request-filesystem-credentials-action-buttons
+        {
+            display: none;
+        }
+
+        input[type=password],
+        input[type=email],
+        input[type=text]
+        {
+            -webkit-appearance: none;
+            padding:            10px 10px 5px 10px;
+            width:              $max-width;
+            max-width:          100%;
+        }
+
+        > div,
+        label,
+        fieldset
+        {
+            width:     $max-width;
+            max-width: 100%;
+            margin:    0 auto;
+            display:   block;
+        }
+    }
+}

assets/scss/admin/_modal-common.scss

@@ -46,6 +46,37 @@
 		}
 	}
 
+	&.fs-success {
+		.fs-modal-header {
+			border-bottom-color: $wp-notice-success-dark-color;
+		}
+
+		.fs-modal-body {
+			background-color: $wp-notice-success-color;
+		}
+	}
+
+	&.fs-warn {
+		.fs-modal-header {
+			border-bottom-color: $wp-notice-warn-dark-color;
+		}
+
+		.fs-modal-body {
+			background-color: $wp-notice-warn-color;
+		}
+	}
+
+	&.fs-error {
+		.fs-modal-header {
+			border-bottom-color: $wp-notice-error-dark-color;
+		}
+
+		.fs-modal-body {
+			background-color: $wp-notice-error-color;
+		}
+	}
+
+
 	.fs-modal-body,
 	.fs-modal-footer {
 		border: 0;

assets/scss/admin/dialog-boxes.scss

@@ -2,4 +2,6 @@
 @import "modal-common";
 @import "deactivation-feedback";
 @import "license-activation";
-@import "license-key-resend";
+@import "license-key-resend";
+@import "ajax-loader";
+@import "auto-install";

config.php

@@ -249,6 +249,14 @@
 	}
 	define( 'WP_FS__OPTIONS_OPTION_NAME', WP_FS___OPTION_PREFIX . 'options' );
 
+	/**
+	 * Module types
+	 *
+	 * @since 1.2.2
+	 */
+	define( 'WP_FS__MODULE_TYPE_PLUGIN', 'plugin' );
+	define( 'WP_FS__MODULE_TYPE_THEME', 'theme' );
+
 	/**
 	 * Billing Frequencies
 	 */