Merge pull request #57 from mrholek/v1.0.10

v1.0.10
coreui · Feb 2, 2018 · ef2bdea · ef2bdea
2 parents 3988c41 + 6bc15e2
commit ef2bdea
Show file tree

Hide file tree

Showing 13 changed files with 325 additions and 348 deletions.
diff --git a/Angular5_CLI_Full_Project/.angular-cli.json b/Angular5_CLI_Full_Project/.angular-cli.json
@@ -1,7 +1,7 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "@coreui/angular"
   },
   "apps": [

diff --git a/Angular5_CLI_Full_Project/CHANGELOG.md b/Angular5_CLI_Full_Project/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [angular](./README.md) version `changelog`
 
+###### `v1.0.10`
+- update: ngx-bootstrap to `2.0.2`
+- update: dependencies
+
 ###### `v1.0.9`
 - update: bootstrap to `v4.0.0`
 - update: dependencies 

diff --git a/Angular5_CLI_Full_Project/package-lock.json b/Angular5_CLI_Full_Project/package-lock.json
diff --git a/Angular5_CLI_Full_Project/package.json b/Angular5_CLI_Full_Project/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@coreui/angular",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "http://coreui.io",
-  "copyright": "Copyright 2017 creativeLabs Łukasz Holeczek",
+  "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -16,46 +16,46 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "5.2.1",
-    "@angular/common": "5.2.1",
-    "@angular/compiler": "5.2.1",
-    "@angular/core": "5.2.1",
-    "@angular/forms": "5.2.1",
-    "@angular/http": "5.2.1",
-    "@angular/platform-browser": "5.2.1",
-    "@angular/platform-browser-dynamic": "5.2.1",
-    "@angular/router": "5.2.1",
-    "@angular/upgrade": "5.2.1",
+    "@angular/animations": "5.2.3",
+    "@angular/common": "5.2.3",
+    "@angular/compiler": "5.2.3",
+    "@angular/core": "5.2.3",
+    "@angular/forms": "5.2.3",
+    "@angular/http": "5.2.3",
+    "@angular/platform-browser": "5.2.3",
+    "@angular/platform-browser-dynamic": "5.2.3",
+    "@angular/router": "5.2.3",
+    "@angular/upgrade": "5.2.3",
     "bootstrap": "4.0.0",
     "chart.js": "2.7.1",
     "core-js": "2.5.3",
     "flag-icon-css": "2.9.0",
     "font-awesome": "^4.7.0",
     "moment": "2.20.1",
     "ng2-charts": "1.6.0",
-    "ngx-bootstrap": "2.0.0",
+    "ngx-bootstrap": "2.0.2",
     "rxjs": "5.5.6",
     "simple-line-icons": "^2.4.1",
     "ts-helpers": "1.1.2",
     "zone.js": "0.8.20"
   },
   "devDependencies": {
-    "@angular/cli": "1.6.5",
-    "@angular/compiler-cli": "5.2.1",
-    "@angular/language-service": "5.2.1",
-    "@types/jasmine": "2.8.4",
+    "@angular/cli": "1.6.7",
+    "@angular/compiler-cli": "5.2.3",
+    "@angular/language-service": "5.2.3",
+    "@types/jasmine": "2.8.6",
     "@types/jasminewd2": "2.0.3",
-    "@types/node": "9.3.0",
+    "@types/node": "9.4.0",
     "codelyzer": "4.1.0",
-    "jasmine-core": "2.9.0",
+    "jasmine-core": "2.9.1",
     "jasmine-spec-reporter": "4.2.1",
     "karma": "2.0.0",
     "karma-chrome-launcher": "2.2.0",
     "karma-cli": "1.0.1",
-    "karma-coverage-istanbul-reporter": "1.3.3",
+    "karma-coverage-istanbul-reporter": "1.4.1",
     "karma-jasmine": "1.1.1",
     "karma-jasmine-html-reporter": "0.2.2",
-    "protractor": "5.2.2",
+    "protractor": "5.3.0",
     "ts-node": "4.1.0",
     "tslint": "5.9.1",
     "typescript": "2.6.2"

diff --git a/Angular5_CLI_Full_Project/src/scss/core/_card.scss b/Angular5_CLI_Full_Project/src/scss/core/_card.scss
@@ -20,7 +20,7 @@
 .card-header {
 
   .icon-bg {
-    display: inline-body;
+    display: inline-block;
     padding: $card-spacer-y $card-spacer-x !important;
     margin-top: -$card-spacer-y;
     margin-right: $card-spacer-x;
@@ -135,12 +135,12 @@
       }
 
       [class^="icon-"], [class*=" icon-"] {
-        display: inline-body;
+        display: inline-block;
         vertical-align: middle;
       }
 
       i {
-        display: inline-body;
+        display: inline-block;
         transition: .4s;
       }
 
@@ -153,7 +153,7 @@
       width: 230px;
       margin: 6px;
 
-      .input-group-addon {
+      .input-group-prepend, .input-group-append {
         background: #fff;
       }
 

diff --git a/Angular5_CLI_Full_Project/src/scss/core/_input-group.scss b/Angular5_CLI_Full_Project/src/scss/core/_input-group.scss
@@ -1,6 +1,5 @@
-.input-group-addon,
-.input-group-btn {
-  min-width: 40px;
+.input-group-prepend,
+.input-group-append {
   white-space: nowrap;
   vertical-align: middle; // Match the inputs
 }
diff --git a/Angular5_CLI_Full_Project/src/scss/style.scss b/Angular5_CLI_Full_Project/src/scss/style.scss
@@ -1,6 +1,6 @@
 /*!
  * CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.9
+ * @version v1.0.10
  * @link http://coreui.io
  * Copyright (c) 2018 creativeLabs Łukasz Holeczek
  * @license MIT

diff --git a/Angular5_CLI_Starter/.angular-cli.json b/Angular5_CLI_Starter/.angular-cli.json
@@ -1,7 +1,7 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "@coreui/angular"
   },
   "apps": [

diff --git a/Angular5_CLI_Starter/package.json b/Angular5_CLI_Starter/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@coreui/angular",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "http://coreui.io",
-  "copyright": "Copyright 2017 creativeLabs Łukasz Holeczek",
+  "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -16,46 +16,46 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "5.2.1",
-    "@angular/common": "5.2.1",
-    "@angular/compiler": "5.2.1",
-    "@angular/core": "5.2.1",
-    "@angular/forms": "5.2.1",
-    "@angular/http": "5.2.1",
-    "@angular/platform-browser": "5.2.1",
-    "@angular/platform-browser-dynamic": "5.2.1",
-    "@angular/router": "5.2.1",
-    "@angular/upgrade": "5.2.1",
+    "@angular/animations": "5.2.3",
+    "@angular/common": "5.2.3",
+    "@angular/compiler": "5.2.3",
+    "@angular/core": "5.2.3",
+    "@angular/forms": "5.2.3",
+    "@angular/http": "5.2.3",
+    "@angular/platform-browser": "5.2.3",
+    "@angular/platform-browser-dynamic": "5.2.3",
+    "@angular/router": "5.2.3",
+    "@angular/upgrade": "5.2.3",
     "bootstrap": "4.0.0",
     "chart.js": "2.7.1",
     "core-js": "2.5.3",
     "flag-icon-css": "2.9.0",
     "font-awesome": "^4.7.0",
     "moment": "2.20.1",
     "ng2-charts": "1.6.0",
-    "ngx-bootstrap": "2.0.0",
+    "ngx-bootstrap": "2.0.2",
     "rxjs": "5.5.6",
     "simple-line-icons": "^2.4.1",
     "ts-helpers": "1.1.2",
     "zone.js": "0.8.20"
   },
   "devDependencies": {
-    "@angular/cli": "1.6.5",
-    "@angular/compiler-cli": "5.2.1",
-    "@angular/language-service": "5.2.1",
-    "@types/jasmine": "2.8.4",
+    "@angular/cli": "1.6.7",
+    "@angular/compiler-cli": "5.2.3",
+    "@angular/language-service": "5.2.3",
+    "@types/jasmine": "2.8.6",
     "@types/jasminewd2": "2.0.3",
-    "@types/node": "9.3.0",
+    "@types/node": "9.4.0",
     "codelyzer": "4.1.0",
-    "jasmine-core": "2.9.0",
+    "jasmine-core": "2.9.1",
     "jasmine-spec-reporter": "4.2.1",
     "karma": "2.0.0",
     "karma-chrome-launcher": "2.2.0",
     "karma-cli": "1.0.1",
-    "karma-coverage-istanbul-reporter": "1.3.3",
+    "karma-coverage-istanbul-reporter": "1.4.1",
     "karma-jasmine": "1.1.1",
     "karma-jasmine-html-reporter": "0.2.2",
-    "protractor": "5.2.2",
+    "protractor": "5.3.0",
     "ts-node": "4.1.0",
     "tslint": "5.9.1",
     "typescript": "2.6.2"

diff --git a/Angular5_CLI_Starter/src/scss/core/_card.scss b/Angular5_CLI_Starter/src/scss/core/_card.scss
@@ -20,7 +20,7 @@
 .card-header {
 
   .icon-bg {
-    display: inline-body;
+    display: inline-block;
     padding: $card-spacer-y $card-spacer-x !important;
     margin-top: -$card-spacer-y;
     margin-right: $card-spacer-x;
@@ -135,12 +135,12 @@
       }
 
       [class^="icon-"], [class*=" icon-"] {
-        display: inline-body;
+        display: inline-block;
         vertical-align: middle;
       }
 
       i {
-        display: inline-body;
+        display: inline-block;
         transition: .4s;
       }
 
@@ -153,7 +153,7 @@
       width: 230px;
       margin: 6px;
 
-      .input-group-addon {
+      .input-group-prepend, .input-group-append {
         background: #fff;
       }
 

diff --git a/Angular5_CLI_Starter/src/scss/core/_input-group.scss b/Angular5_CLI_Starter/src/scss/core/_input-group.scss
@@ -1,6 +1,5 @@
-.input-group-addon,
-.input-group-btn {
-  min-width: 40px;
+.input-group-prepend,
+.input-group-append {
   white-space: nowrap;
   vertical-align: middle; // Match the inputs
 }
diff --git a/Angular5_CLI_Starter/src/scss/style.scss b/Angular5_CLI_Starter/src/scss/style.scss
@@ -1,6 +1,6 @@
 /*!
  * CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.9
+ * @version v1.0.10
  * @link http://coreui.io
  * Copyright (c) 2018 creativeLabs Łukasz Holeczek
  * @license MIT

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [angular](./README.md) version `changelog`
 
+###### `v1.0.10`
+- update: ngx-bootstrap to `2.0.2`
+- update: dependencies
+
 ###### `v1.0.9`
 - update: bootstrap to `v4.0.0`
 - update: dependencies