Skip to content

Commit 8ea6cfa

Browse files
LouisMazelLouisMazel
committed
v1.1.20 : Fix issues with the position of picker when is open
1 parent 8960432 commit 8ea6cfa

23 files changed

+30
-22
lines changed

‎demo/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>vue-ctk-date-time-picker</title><link rel=stylesheet href=./assets/main.css><link href=./static/css/app.08d726dffb5baecfe31edade6eb46d63.css rel=stylesheet></head><body><div id=app></div><script src=/build/build.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.88b4d2f1b6949b36de49.js></script><script type=text/javascript src=./static/js/app.bcc28b3136a0603355ca.js></script></body></html>
1+
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>vue-ctk-date-time-picker</title><link rel=stylesheet href=./assets/main.css><link href=./static/css/app.e06b72e2fbf158d6e5510e7a529723e2.css rel=stylesheet></head><body><div id=app></div><script src=/build/build.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.88b4d2f1b6949b36de49.js></script><script type=text/javascript src=./static/js/app.b92df41e8cac0b017c12.js></script></body></html>

‎demo/static/css/app.08d726dffb5baecfe31edade6eb46d63.css

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎demo/static/css/app.08d726dffb5baecfe31edade6eb46d63.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎demo/static/css/app.e06b72e2fbf158d6e5510e7a529723e2.css

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/static/css/app.e06b72e2fbf158d6e5510e7a529723e2.css.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/static/js/app.bcc28b3136a0603355ca.js renamed to ‎demo/static/js/app.b92df41e8cac0b017c12.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/static/js/app.b92df41e8cac0b017c12.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/static/js/app.bcc28b3136a0603355ca.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎demo/static/js/manifest.3ad1d5771e9b13dbdad2.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/umd/vue-ctk-date-time-picker.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/umd/vue-ctk-date-time-picker.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/umd/vue-ctk-date-time-picker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/umd/vue-ctk-date-time-picker.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-ctk-date-time-picker.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-ctk-date-time-picker.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-ctk-date-time-picker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-ctk-date-time-picker.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-ctk-date-time-picker",
3-
"version": "1.1.19",
3+
"version": "1.1.20",
44
"description": "A vue component for select date & time (by Chronotruck)",
55
"author": "Louis Mazel <[email protected]>",
66
"main": "dist/vue-ctk-date-time-picker.min.js",

‎src/vue-ctk-date-time-picker/_subs/CtkDatePickerAgenda.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ export default {
228228
position: absolute;
229229
z-index: 5;
230230
border-radius: 4px;
231+
overflow: hidden;
231232
background: #FFF;
232233
-webkit-box-shadow: 0 2px 1px -1px rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
233234
box-shadow: 0 2px 1px -1px rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 1px 3px 0 rgba(0, 0, 0, 0.12);

‎src/vue-ctk-date-time-picker/vue-ctk-date-time-picker.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,14 @@ export default {
176176
}
177177
const rect = this.$refs.parent.getBoundingClientRect()
178178
const windowHeight = window.innerHeight
179-
const datePickerHeight = 300
179+
let datePickerHeight = 428
180+
if (!this.enableButtonValidate) {
181+
datePickerHeight = datePickerHeight - 46
182+
}
183+
if (this.withoutHeader) {
184+
datePickerHeight = datePickerHeight - 65
185+
}
186+
console.log('datePickerHeight', datePickerHeight)
180187
if (((windowHeight - (rect.top + rect.height)) > datePickerHeight) || ((windowHeight - rect.top) > windowHeight / 2 + rect.height)) {
181188
this.agendaPosition = 'top'
182189
} else {

‎styleguide/build/bundle.d32a826d.js renamed to ‎styleguide/build/bundle.bfb8cc49.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎styleguide/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Vue Ctk Date Time Picker Style Guide</title></head><body><div id="rsg-root"></div><script src="build/bundle.d32a826d.js"></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Vue Ctk Date Time Picker Style Guide</title></head><body><div id="rsg-root"></div><script src="build/bundle.bfb8cc49.js"></script></body></html>

0 commit comments

Comments
 (0)