Merge branch 'develop' of github.com:modularcode/modular-admin-html into develop

Author: Davidtiger92

bower.json

@@ -17,6 +17,7 @@
     "nprogress": "~0.2.0",
     "quill": "~0.20.1",
     "responsive-bootstrap-toolkit": "~2.5.0",
+    "Sortable": "~1.4.2",
     "tether": "~1.1.1",
     "tinycolor": "~1.2.1",
     "Watch.JS": "watch#*"
@@ -50,6 +51,12 @@
     "animate.css": {
       "main": "animate.css"
     },
+    "Sortable":{
+      "main": [
+        "Sortable.js",
+        "jquery.binding.js"
+      ]
+    },
     "quill": {
       "main": [
         "dist/quill.js",

src/_common/animations/animations.js

@@ -0,0 +1,15 @@
+/***********************************************
+*        Animation Settings
+***********************************************/
+
+function animate(options) {
+	var animationName = "animated " + options.name;
+	var animationEnd = "webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend";
+	$(options.selector)
+	.addClass(animationName)
+	.one(animationEnd, 
+		function(){
+			$(this).removeClass(animationName);
+		}
+	);
+}

src/_common/animations/animations.scss

@@ -0,0 +1,4 @@
+.animated {
+  animation-duration: .5s;
+  animation-delay: .1s;
+}

src/_common/card/card.scss

@@ -85,6 +85,7 @@
                     font-size: 14px;
                     border-top-width: 2px;
                     border-bottom: 1px solid $color-divider;
+                    text-decoration: none;
 
                     &.active {
 	                	border-top-color: $color-primary;

src/_common/navigation/navigation.scss

@@ -59,6 +59,8 @@ span a {
 		.nav-item {
 
 			.nav-link {
+				text-decoration: none;
+
 				&:hover {
 					color: #ffffff;	
 					background-color: $color-primary;
@@ -88,6 +90,8 @@ span a {
 		.nav-item {
 
 			.nav-link {
+				text-decoration: none;
+				
 				&:hover {
 					color: $color-text;	
 					background-color: transparent;

src/_common/scrollbar/scrollbar.scss

@@ -1,22 +1,23 @@
 /* Let's get this party started */
 ::-webkit-scrollbar {
-    width: 6px;
-    height: 6px;
+    width: 7px;
+    height: 7px;
 }
 
 /* Track */
 ::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 6px #dddddd; 
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
+    // -webkit-box-shadow: inset 0 0 6px #626d77; 
+    // background: #626d77;
+    -webkit-border-radius: 0;
+    border-radius: 0;
 }
 
 /* Handle */
 ::-webkit-scrollbar-thumb {
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-    background: $color-primary; 
-    -webkit-box-shadow: inset 0 0 6px $color-primary-lighter; 
+    -webkit-border-radius: 0;
+    border-radius: 0;
+    background: darken($color-primary, 5%); 
+    // -webkit-box-shadow: inset 0 0 6px $color-primary; 
 }
 ::-webkit-scrollbar-thumb:window-inactive {
 	background: $color-primary; 

src/_main.scss

@@ -28,4 +28,13 @@ body {
 	.color-primary {
 		color: $color-primary;
 	}
+
+	.chart {
+		.color-primary {
+			color: $chart-color-primary;
+		}
+		.color-secondary {
+			color: $chart-color-secondary;
+		}
+	}
 }

src/_themes/orange-theme.scss

@@ -1,9 +1,12 @@
-$color-primary: #FE7A0E;
+$color-primary: lighten(#FE7A0E, 3%);
 $dashboard-stat-icon-color: #BDBDBD;
 
 $link-color: #969696;
 $link-transition: initial;
 $link-decoration: underline;
 
 $link-hover-color: desaturate(darken($color-primary, 4%), 4%);
-$link-hover-decoration: underline;
+$link-hover-decoration: underline;
+
+$chart-color-primary: lighten($color-primary, 10%);
+$chart-color-secondary: lighten($chart-color-primary, 20%);

src/_themes/purple-theme.scss

@@ -1,2 +1,6 @@
 $color-primary: #7867A7;
-$dashboard-stat-icon-color: #BDBDBD;
+$dashboard-stat-icon-color: #BDBDBD;
+
+
+$chart-color-primary: lighten($color-primary, 8%);
+$chart-color-secondary: lighten($chart-color-primary, 10%);

src/_themes/red-theme.scss

@@ -5,4 +5,7 @@ $link-transition: initial;
 $link-decoration: underline;
 
 $link-hover-color: #E45252;
-$link-hover-decoration: underline;
+$link-hover-decoration: underline;
+
+$chart-color-primary: #FF8585;
+$chart-color-secondary: #ccc;