added version 1.2.0 + small changes on moving tab

chelarucip · chelarucip · commit 0bcb304bfd8d · 2017-04-03T17:05:21.000+03:00
diff --git a/README.md b/README.md
@@ -152,6 +152,11 @@ V1.1.0 - small fix
 V1.1.1 - 21 March (V1.1.0 from Material Dashboard HTML)
 - added "@types/core-js": "0.9.35" in package
 
+V1.2.0 - 04 Apr (V1.1.0 from Material Dashboard HTML)
+- added Upgrade to PRO page
+- update package
+- made sidebar dynamic
+
 
 ## Useful Links
 
diff --git a/app/sidebar/sidebar.component.js b/app/sidebar/sidebar.component.js
diff --git a/app/sidebar/sidebar.component.js.map b/app/sidebar/sidebar.component.js.map
diff --git a/app/sidebar/sidebar.component.ts b/app/sidebar/sidebar.component.ts
@@ -11,7 +11,7 @@ declare var $:any;
 export class SidebarComponent implements OnInit {
     public menuItems: any[];
     ngOnInit() {
-        $.getScript('../../assets/js/material-dashboard-angular.js');
+        $.getScript('../../assets/js/sidebar-moving-tab.js');
         this.menuItems = ROUTES.filter(menuItem => menuItem);
     }
 }
diff --git a/assets/css/demo.css b/assets/css/demo.css
@@ -50,6 +50,13 @@ my-app .main-panel .main-content .card{
     width: 100%;
     bottom: 10px;
 }
+@media (max-width: 991px) {
+    .sidebar .nav > li.active-pro{
+        position: relative;
+        width: 100%;
+        bottom: 10px;
+    }
+}
 
 .tim-row{
     margin-bottom: 20px;
diff --git a/assets/css/material-dashboard.css b/assets/css/material-dashboard.css
@@ -1,7 +1,7 @@
  /*!
 
   =========================================================
-  * Material Dashboard Angular 2 - V1.1.1
+  * Material Dashboard Angular 2 - V1.2.0
   =========================================================
 
   * Product Page: https://www.creative-tim.com/product/material-dashboard-angular2
@@ -3491,7 +3491,7 @@ fieldset[disabled] .form-group.is-focused .togglebutton label {
   z-index: 1029;
 }
 
-@media (max-width: 1199px) {
+@media (max-width: 991px) {
   .nav-container {
     position: relative;
   }
diff --git a/assets/js/material-dashboard.js b/assets/js/material-dashboard.js
@@ -1,7 +1,7 @@
 /*!
 
  =========================================================
- * Material Dashboard Angular 2 - V1.1.1
+ * Material Dashboard Angular 2 - V1.2.0
  =========================================================
 
  * Product Page: https://www.creative-tim.com/product/material-dashboard-angular2
diff --git a/assets/js/sidebar-moving-tab.js b/assets/js/sidebar-moving-tab.js
@@ -1,7 +1,7 @@
 /*!
 
  =========================================================
- * Material Dashboard Angular - V1.1.0.0
+ * Material Dashboard Angular - V1.2.0
  =========================================================
 
  * Product Page: https://www.creative-tim.com/product/material-dashboard-angular2
@@ -14,7 +14,7 @@
 
  */
 
- 
+
 $(document).ready(function(){
     $moving_tab = $('<div class="moving-tab"/>');
     $('.sidebar .nav-container').append($moving_tab);
@@ -39,7 +39,11 @@ $(document).ready(function(){
 
     }
 });
+$(window).resize(function(){
+    $this = $('.sidebar .nav').find('li.active a');
+    animationSidebar($this,true);
 
+});
 $('.sidebar .nav > li > a').click(function(){
     $this = $(this);
     animationSidebar($this, true);
diff --git a/assets/sass/material-dashboard.scss b/assets/sass/material-dashboard.scss
@@ -1,7 +1,7 @@
  /*!
 
   =========================================================
-  * Material Dashboard Angular 2 - V1.1.1
+  * Material Dashboard Angular 2 - V1.2.0
   =========================================================
 
   * Product Page: https://www.creative-tim.com/product/material-dashboard-angular2
diff --git a/assets/sass/md/_navbars.scss b/assets/sass/md/_navbars.scss
@@ -327,7 +327,7 @@
     padding-top: 10px;
     z-index: 1029;
 }
-@media (max-width: $screen-md-max) {
+@media (max-width: 991px) {
     .nav-container{
         position: relative;
     }
diff --git a/changelog.txt b/changelog.txt
@@ -2,3 +2,7 @@ V1.0.0 - 30 Jan 2017 [initial Release]
 V1.1.0 - small fix
 V1.1.1 - 21 March (V1.1.0 from Material Dashboard HTML)
 - added "@types/core-js": "0.9.35" in package
+V1.2.0 - 04 Apr (V1.1.0 from Material Dashboard HTML)
+- added Upgrade to PRO page
+- update package
+- made sidebar dynamic
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "material-dashboard-angular2",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "scripts": {
     "start": "tsc && concurrently \"tsc -w\" \"lite-server\" ",
     "lite": "lite-server",

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ declare var $:any;`
`11`	`11`	`export class SidebarComponent implements OnInit {`
`12`	`12`	`public menuItems: any[];`
`13`	`13`	`ngOnInit() {`
`14`		`- $.getScript('../../assets/js/material-dashboard-angular.js');`
	`14`	`+ $.getScript('../../assets/js/sidebar-moving-tab.js');`
`15`	`15`	`this.menuItems = ROUTES.filter(menuItem => menuItem);`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*!`
`2`	`2`
`3`	`3`	`=========================================================`
`4`		`- * Material Dashboard Angular 2 - V1.1.1`
	`4`	`+ * Material Dashboard Angular 2 - V1.2.0`
`5`	`5`	`=========================================================`
`6`	`6`
`7`	`7`	`* Product Page: https://www.creative-tim.com/product/material-dashboard-angular2`
`@@ -3491,7 +3491,7 @@ fieldset[disabled] .form-group.is-focused .togglebutton label {`
`3491`	`3491`	`z-index: 1029;`
`3492`	`3492`	`}`
`3493`	`3493`
`3494`		`-@media (max-width: 1199px) {`
	`3494`	`+@media (max-width: 991px) {`
`3495`	`3495`	`.nav-container {`
`3496`	`3496`	`position: relative;`
`3497`	`3497`	`}`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@`
`327`	`327`	`padding-top: 10px;`
`328`	`328`	`z-index: 1029;`
`329`	`329`	`}`
`330`		`-@media (max-width: $screen-md-max) {`
	`330`	`+@media (max-width: 991px) {`
`331`	`331`	`.nav-container{`
`332`	`332`	`position: relative;`
`333`	`333`	`}`