Skip to content

Commit 3951020

Browse files
authored
Merge pull request #2152 from opensource-workshop/tempusdominus6
[日付入力] 日付入力ライブラリを tempusdominus-bootstrap-4 → @eonasdan/tempus-dominus v6に切替 OW-2520
2 parents aae7bd0 + 537839c commit 3951020

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+424
-1850
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
"production": "mix --production"
1111
},
1212
"devDependencies": {
13+
"@eonasdan/tempus-dominus": "^6.10.2",
1314
"@fortawesome/fontawesome-free": "^6.7.2",
15+
"@popperjs/core": "^2.11.8",
1416
"axios": "^1.6.1",
1517
"bootstrap": "^4.0.0",
1618
"jquery": "^3.7.0",
@@ -23,7 +25,6 @@
2325
"sass": "^1.62.1",
2426
"sass-loader": "^12.6.0",
2527
"sortablejs": "^1.15.2",
26-
"tempusdominus-bootstrap-4": "^5.39.2",
2728
"vue": "^2.5.7",
2829
"vue-loader": "^17.3.0",
2930
"vue-template-compiler": "^2.7.14"

public/css/app.css

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

public/css/connect.css

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,35 @@ a.cc-icon-external:after {
125125
margin: 0 0 3px 5px;
126126
}
127127

128-
/* datepicker
128+
/* Tempus Dominus Date/Time Picker
129129
------------------------------------- */
130-
/* datepickerの土日 */
131-
.datepicker-days th.dow:first-child,
132-
.datepicker-days td:first-child {
130+
/* DateTimePickerの土日 */
131+
.date-container-days div.dow {
132+
color: #000 !important;
133+
font-weight: bold;
134+
}
135+
.date-container-days div.dow:first-child {
136+
color: #c42626 !important;
137+
}
138+
.date-container-days div.dow:nth-child(7) {
139+
color: #005dbf !important;
140+
}
141+
.date-container-days div.day.weekend {
133142
color: #c42626;
134143
}
135-
.datepicker-days th.dow:last-child,
136-
.datepicker-days td:last-child {
144+
.date-container-days div.day:nth-child(7n) {
137145
color: #005dbf;
138146
}
147+
.date-container-days div.day.old.weekend,
148+
.date-container-days div.day.new.weekend {
149+
color: #00000060;
150+
}
151+
152+
/* sideBySideの時間を縦中央表示 */
153+
.tempus-dominus-widget.timepicker-sbs .td-row {
154+
display: flex;
155+
align-items: center;
156+
}
139157

140158
/* プラグイン追加
141159
------------------------------------- */

public/js/707.js

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

public/js/app.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.

public/js/app.js.LICENSE.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
55
*/
66

7+
/*!
8+
* Tempus Dominus v6.10.0 (https://getdatepicker.com/)
9+
* Copyright 2013-2025 Jonathan Peterson
10+
* Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
11+
*/
12+
713
/*!
814
* The buffer module from node.js, for the browser.
915
*
@@ -32,12 +38,6 @@
3238

3339
/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
3440

35-
/*!@preserve
36-
* Tempus Dominus Bootstrap4 v5.39.0 (https://tempusdominus.github.io/bootstrap-4/)
37-
* Copyright 2016-2020 Jonathan Peterson and contributors
38-
* Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
39-
*/
40-
4141
/**
4242
* @license
4343
* Lodash <https://lodash.com/>
@@ -91,4 +91,4 @@
9191

9292
//! moment.js locale configuration
9393

94-
//! version : 0.5.47
94+
//! version : 0.5.48

public/mix-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"/js/app.js": "/js/app.js?id=c59b5ef1c67ae3b8ae487f537305b3c1",
3-
"/css/app.css": "/css/app.css?id=31d7351f318f55dd5ede42aeb63a0ae3"
2+
"/js/app.js": "/js/app.js?id=1d213e4fd13b811592c95f870492094d",
3+
"/css/app.css": "/css/app.css?id=94110667e125790f9646ca8f0c9d2382"
44
}

resources/js/bootstrap.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,13 @@ if (token) {
6060
*/
6161
window.moment = require('moment');
6262
import 'moment/locale/ja';
63-
require('tempusdominus-bootstrap-4');
63+
// require('tempusdominus-bootstrap-4');
6464
import 'moment-timezone';
6565

66+
// Tempus Dominus Date/Time Picker
67+
window.tempusDominus = require('@eonasdan/tempus-dominus');
68+
// 下記でapp.jsに含めると、日付入力時に1度画面上部に飛ばされる動作をするため、含めない
69+
// window.Popper = require('@popperjs/core');
70+
6671
// Default SortableJS
6772
window.Sortable = require('sortablejs').default;

resources/sass/app.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
@import '~@fortawesome/fontawesome-free/scss/regular';
1111
@import '~@fortawesome/fontawesome-free/scss/brands';
1212

13-
// Tempusdominus-bootstrap-4
14-
// tempusdominus-bootstrap-4-build.sass内のImport bootstrap variablesがパス間違いのため、別ファイルにして修正
15-
// @import '~tempusdominus-bootstrap-4/src/sass/tempusdominus-bootstrap-4-build';
16-
@import 'tempusdominus-bootstrap-4-build';
13+
// Tempus Dominus Date/Time Picker
14+
@import '~@eonasdan/tempus-dominus/src/scss/tempus-dominus';
1715

1816
// Connect-CMS
1917
//mixin

0 commit comments

Comments
 (0)