Big commit

askupasoftware · Sep 9, 2014 · 98049b5 · 98049b5
1 parent f061ef5
commit 98049b5
Show file tree

Hide file tree

Showing 34 changed files with 683 additions and 171 deletions.
diff --git a/Admin/Notifier.php b/Admin/Notifier.php
@@ -3,7 +3,7 @@
 namespace Amarkal\Admin;
 
 /**
- * Implements an admin notifyer.
+ * Implements an admin notifier.
  * 
  * Use this class to print admin notices. If the $page parameter is specified,
  * the notification will only be printed on that page. Otherwise, the notification

diff --git a/Assets/css/options.min.css b/Assets/css/options.min.css
diff --git a/Assets/js/_options_field_Textarea.js b/Assets/js/_options_field_Textarea.js
@@ -0,0 +1,8 @@
+jQuery(document).ready(function($){
+    $('.ao-field-textarea textarea').resizable({
+        minHeight: 150,
+        minWidth: 250
+    });
+    $('.ui-resizable-s').html('<i class="fa fa-bars"></i>');
+    $('.ui-resizable-e').html('<i class="fa fa-bars fa-rotate-90"></i>');
+});
diff --git a/Assets/js/_widget_field_Select.js b/Assets/js/_widget_field_Select.js
@@ -4,9 +4,6 @@
 (function ($) {  
     // Fired when the widget is updated (saved/dragged/refreshed)
 	$(document).bind('widget_init', function(event, widget){
-		// Set select button click event
-        $('.amarkal-widget .select-button').click(function() {
-            $(this).parent().find('select').focus();
-        });
+        $(".amarkal-widget.select select").select2({width:'resolve'});
 	});
 }(jQuery));
diff --git a/Assets/js/options.min.js b/Assets/js/options.min.js
diff --git a/Assets/js/tooltip.min.js b/Assets/js/tooltip.min.js
diff --git a/Assets/js/widget.min.js b/Assets/js/widget.min.js
diff --git a/Assets/sass/_options_core.scss b/Assets/sass/_options_core.scss
@@ -83,36 +83,35 @@ $break-large: 920px;
 
                     a {
                         margin: 0;
-                        padding: 7px 13px;
+                        padding: 7px;
                         text-decoration:none;
                         display: block;
                         outline: 0;
                         color: $theme-color2;
 
                         i {
-                            margin-right: 10px;
-                            @include transition( all .2s ease-in-out );
+                            width: 30px;
+                            text-align: center;
+                            @include transition( all .1s ease-in-out );
 
                             &.fa {font-size: 18px}
                             &.dashicons {font-size: 20px}
                         }
 
                         span {
                             @media screen and (max-width: $break-small) {display:none;}
-                            @include transition( all .2s ease-in-out );
                         }
                     }
 
                     &:hover {
                         i {@include scale( 1.2 );}
-                        span {padding-left:10px}
                     }
 
                     &:hover:not(.active) {
                         border-left: 3px solid;
 
                         a {
-                            padding-left: 10px;
+                            padding-left: 4px;
                         }
                     }
 
@@ -149,6 +148,57 @@ $break-large: 920px;
 
                 &.active {display:block}
 
+                .notification {
+                    margin: 5px;
+                    padding-left: 45px;
+                    border-style: solid;
+                    border-width: 0;
+                    border-left-width: 5px;
+                    position: relative;
+
+                    p {
+                        display: inline-block;
+                    }
+
+                    + .notification {
+                        margin-top: -5px;
+                    }
+
+                    &:before {
+                        font-family: FontAwesome;
+                        font-size: 24px;
+                        position: absolute;
+                        left: 13px;
+                        top: 0;
+                        bottom: 0;
+                        line-height: 45px;
+                    }
+
+                    &.info {
+                        color: rgb(47, 114, 177);
+                        border-color: rgb(47, 114, 177);
+                        background-color: rgb(155, 231, 255);
+
+                        &:before {content: "\f05a";}
+                    }
+
+                    &.success {
+                        color: #2FB15E;
+                        border-color: #2FB15E;
+                        background-color: #CAFFBA;
+
+                        &:before {content: "\f058";}
+                    }
+
+                    &.errors {
+                        color: #B81919;
+                        border-color: #B81919;
+                        background-color: #FFC8C8;
+
+                        &:before {content: "\f057";}
+                    }
+                }
+
                 .section-header {
                     margin: 5px;
                     border: $border;
@@ -259,6 +309,8 @@ $break-large: 920px;
                         display: inline-block;
                         vertical-align: middle;
                         width: 68%;
+
+                        &.full-width{ width: 100%;}
                     }
                 }
             }

diff --git a/Assets/sass/_options_field_Content.scss b/Assets/sass/_options_field_Content.scss
@@ -0,0 +1,14 @@
+.ao-field-content {
+    font-size: 14px;
+
+    .aligncenter {clear: both; display: block; margin-left:auto; margin-right: auto;}
+    .alignleft {float:left;margin-right:10px}
+    .alignright {float:right;margin-left:10px}
+
+    img {margin-top:10px;margin-bottom:10px}
+
+    ul {
+        padding-left: 28px;
+        list-style-type: square;
+    }
+}