zaa-date Datepicker width fix (#572)

* Fixed zaa-date datepicker width issue * Update CHANGELOG.md Co-authored-by: Basil <git@nadar.io>
luyadev · Oct 1, 2020 · 4c3b4b7 · 4c3b4b7
1 parent 96ed843
commit 4c3b4b7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 In order to read more about upgrading and BC breaks have a look at the [UPGRADE Document](UPGRADE.md).
 
+## 3.6.1 (1. October 2020)
+
++ [#572](https://github.com/luyadev/luya-module-admin/pull/572) Fixed "zaa-date" datepicker width issue.
+
 ## 3.6.0 (30. September 2020)
 
 > This requires LUYA core 1.7

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
  },
  "require-dev":{
  "luyadev/luya-testsuite":"^1.2",
- "twbs/bootstrap":"^4.3",
+ "twbs/bootstrap":"^4.5",
  "bower-asset/angular":"^1.7",
  "bower-asset/angular-loading-bar":"0.9.0",
  "bower-asset/ui-router":"~0.4.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/resources/dist/main.js b/src/resources/dist/main.js
diff --git a/src/resources/js/directives.js b/src/resources/js/directives.js
@@ -2060,7 +2060,7 @@ zaa.directive("zaaDate", function () {
  '<div class="form-side form-side-label">' +
  '<label>{{label}}</label>' +
  '</div>' +
- '<div class="form-side datepicker-wrapper">' +
+ '<div class="form-side form-inline datepicker-wrapper">' +
  '<datepicker class="input-group input-group--append-clickable" date-set="{{pickerPreselect.toString()}}" date-week-start-day="1" datepicker-toggle="false" datepicker-show="{{datePickerToggler}}" date-format="dd.MM.yyyy">' +
  '<input class="form-control datepicker-date-input" ng-model="date" type="text" ng-focus="openDatePicker()" />' +
  '<div class="input-group-append" ng-click="toggleDatePicker()">' +