diff --git a/package.json b/package.json
index ccb48f49a..cad570f37 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
"stylus": "^0.59.0",
"stylus-loader": "^7.1.0",
"tinymce": "^5.10.3",
+ "tui-calendar-hi": "^1.15.1-5",
"view-design-hi": "^4.7.0-48",
"vite": "^2.9.15",
"vite-plugin-file-copy": "^1.0.0",
@@ -88,7 +89,6 @@
}
],
"dependencies": {
- "@micro-zoe/micro-app": "^0.8.11",
- "@toast-ui/calendar": "^2.1.3"
+ "@micro-zoe/micro-app": "^0.8.11"
}
}
diff --git a/public/images/empty/complete.svg b/public/images/empty/complete.svg
new file mode 100644
index 000000000..d5ef52ac7
--- /dev/null
+++ b/public/images/empty/complete.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 3285a0403..cc4116b04 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -33,7 +33,7 @@
:taskView="false"
:useCreationPopup="false"
@beforeCreateSchedule="onBeforeCreateSchedule"
- @beforeUpdateEvent="onBeforeClickSchedule"
+ @beforeClickSchedule="onBeforeClickSchedule"
@beforeUpdateSchedule="onBeforeUpdateSchedule"
disable-click/>
@@ -137,7 +137,7 @@ export default {
},
computed: {
- ...mapState(['cacheUserBasic', 'cacheTasks', 'taskCompleteTemps', 'wsOpenNum', 'themeIsDark']),
+ ...mapState(['cacheTasks', 'taskCompleteTemps', 'wsOpenNum', 'themeIsDark']),
...mapGetters(['transforTasks']),
@@ -175,15 +175,12 @@ export default {
start: $A.Date(data.start_at).toISOString(),
end: $A.Date(data.end_at).toISOString(),
color: "#515a6e",
- backgroundColor: data.color || '#E3EAFD',
+ bgColor: data.color || '#E3EAFD',
borderColor: data.p_color,
- priority: '1122',
+ priority: '',
preventClick: true,
preventCheckHide: true,
isChecked: !!data.complete_at,
- attendees: false,
- isReadOnly: false,
- state: '',
//
complete_at: data.complete_at,
start_at: data.start_at,
@@ -208,18 +205,17 @@ export default {
}
if (data.complete_at) {
task.color = "#c3c2c2"
- task.backgroundColor = "#f3f3f3"
+ task.bgColor = "#f3f3f3"
task.borderColor = "#e3e3e3"
} else if (data.overdue) {
task.title = `[${this.$L('超期')}] ${task.title}`
task.color = "#f56c6c"
- task.backgroundColor = data.color || "#fef0f0"
+ task.bgColor = data.color || "#fef0f0"
task.priority+= `${this.$L('超期未完成')}`;
}
if (!task.borderColor) {
- task.borderColor = task.backgroundColor;
+ task.borderColor = task.bgColor;
}
- task.state = task.priority
return task;
});
}
@@ -318,11 +314,6 @@ export default {
},
onBeforeClickSchedule(event) {
- // calendar.updateEvent(event.id, event.calendarId, change);
- console.log(2222);
- this.$store.dispatch("openTask", event.event)
- return;
- console.log(event)
const {type, schedule} = event;
let data = this.cacheTasks.find(({id}) => id === schedule.id);
if (!data) {
diff --git a/resources/assets/js/pages/manage/components/Calendar.vue b/resources/assets/js/pages/manage/components/Calendar.vue
index 5c9f5646a..93161440b 100644
--- a/resources/assets/js/pages/manage/components/Calendar.vue
+++ b/resources/assets/js/pages/manage/components/Calendar.vue
@@ -1,12 +1,12 @@
+
diff --git a/resources/assets/js/pages/manage/project.vue b/resources/assets/js/pages/manage/project.vue
index ef7c707ba..73398b590 100644
--- a/resources/assets/js/pages/manage/project.vue
+++ b/resources/assets/js/pages/manage/project.vue
@@ -5,7 +5,7 @@
-
+
{{ $L('选择一个项目查看更多任务') }}
diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss
index 8eafda0bd..62146d115 100755
--- a/resources/assets/sass/pages/components/_.scss
+++ b/resources/assets/sass/pages/components/_.scss
@@ -26,4 +26,5 @@
@import "update-log";
@import "task-exist-tips";
@import "project-menu";
+@import "calendar";
@import "home-calendar";
diff --git a/resources/assets/sass/pages/components/calendar.scss b/resources/assets/sass/pages/components/calendar.scss
new file mode 100644
index 000000000..e5ae046aa
--- /dev/null
+++ b/resources/assets/sass/pages/components/calendar.scss
@@ -0,0 +1,162 @@
+.calendar-wrapper {
+ flex: 1;
+ position: relative;
+ &:before {
+ content: "";
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ height: 2px;
+ background-color: #ffffff;
+ z-index: 1;
+ }
+ .tui-full-calendar-popup {
+ box-shadow: none;
+ .tui-full-calendar-section-header {
+ .tui-full-calendar-ic-checkbox-checked {
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAAhFBMVEUAAACLz3CLz3CLz3CKzm6Gy2+Lz3CLz3CL0HCLz3CLz3CLz3CLz3CMz3GLz3CKz3CLz3CL0HCJ0G+KznCN0HCL0HCLz3CKz3CLz3CLz3CLz3CMz3CLz3CLz3GL0XCL0HCN0XKLz3CLz3CMz3CLz3CM0HCM0G+FzHCLz3CKz3CMz3CLz3Bod5CFAAAAK3RSTlMA18RAOQ3s8+Pc0rmyq3tpiUwTgBnovyDMjmNSRjUvJQX5yKB0WisKppuUFLaY7gAAAotJREFUeNrtm+FymkAUhc8KqIAgSkyUtkmsmqa97/9+HWeSudpCd8qZ7E0m+73A9/1gxmXx4IK0nbipvDFTN2lT9JDVToLh6gx/sHQSFLfEFZUEp8IFczFgrv5CTChe/TsxYvfy/IkZy7M/c2KGywDUYkgNIBdDciARUxI0YkqDiZgygRNTHKZiyhRiTAyIATEgBsSAGBADYsAnCJgdmtIywKUAOrsA94QzJyKA95/pbALcPV7piADGryzDB+Rnv3IkAhi/UhMBjF9pQwbk3/A3JRXA+7GjAng/DqEC5v3+dMYE8P6nQsIEzFOPnw7g/QpC+R8K4QJ4f5iAzaA/TMAm6fdvZQgY+wW2fn9A0a66Bee/2xLH8kp/Rr1MB/3jAxaP0ALCPzagzPBCM9r/XcYH3K4BLfD4vw75xwdMbqB4CmaD/vEB2ztc0RD+MQHFg+c85fffDPv9AbPUd6Lz+ydCBDyjh1//6WcCGngK1L8a8lMBJTwFfj8XIC16+SnX7Af9bIDUngLSrwFEwaD/VogA5YheDj7/Wv1MgL9g/8XjpwNk+c8Cyq8BYwqePX46QOkGCmi/BowrqFi/Bvg4wYv6y7e4Kz4Rfj5AnzY/WSlcwHAB5+cD9ivKzwfIbEX4qQA99RB+NkDfO4b5sRAigHjzpP0C6u6D9wuo2z/eL+DvXx8Zv4C4gVd/qABxCeFnApQT5+cDpOP8fICcLv2VxbfjlQZUNh+vU/XbBIj6jQLm9wDWlZgFyOaYHJ3Ix/gDQwyIATEgBsSAGODBfuBgPvEwH7m0YkqLVExJYfsQuPcwdjOf+5kPHoFKjKio0e3Hn90WUCyGt7v3Nf0GsjqXYOR1hh6SJsz8v0mg/AZRXmaRKXtJBwAAAABJRU5ErkJggg==);
+ }
+ }
+ .tui-full-calendar-popup-container {
+ word-break: break-all;
+ border: 0;
+ box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
+ border-radius: 6px;
+ }
+ .tui-full-calendar-arrow-top .tui-full-calendar-popup-arrow-border {
+ top: -8px;
+ border-bottom-color: rgba(217, 217, 217, .5);
+ }
+ }
+ .tui-full-calendar-dropdown-menu {
+ border-color: #e8e8e8;
+ width: calc(100% - 14px);
+ }
+ .tui-full-calendar-popup-creation {
+ .tui-full-calendar-icon {
+ &.tui-full-calendar-ic-title,
+ &.tui-full-calendar-calendar-dot {
+ display: none;
+ }
+ &.tui-full-calendar-ic-date {
+ background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5NjcwNjA3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE2Mzg4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTk2MCAxMjhIODMzYzAtNTMtNDMtOTYtOTYtOTZoLTE2Yy01MyAwLTk2IDQzLTk2IDk2SDQwMGMwLTI2LjUtMTAuNy01MC41LTI4LjEtNjcuOUMzNTQuNSA0Mi43IDMzMC41IDMyIDMwNCAzMmgtMTZjLTUzIDAtOTYgNDMtOTYgOTZINjRjLTM1LjMgMC02NCAyOC42LTY0IDY0djczNmMwIDM1LjMgMjguNyA2NCA2NCA2NGg4OTZjMzUuMyAwIDY0LTI4LjcgNjQtNjRWMTkyYzAtMzUuNC0yOC43LTY0LTY0LTY0eiBtLTI3MSA4YzAtMjIuMSAxNy45LTQwIDQwLTQwczQwIDE3LjkgNDAgNDB2ODBjMCAyMi4xLTE3LjkgNDAtNDAgNDAtMTEgMC0yMS00LjUtMjguMy0xMS43QzY5My41IDIzNyA2ODkgMjI3IDY4OSAyMTZ2LTgweiBtLTQzMyAwYzAtMjIuMSAxNy45LTQwIDQwLTQwczQwIDE3LjkgNDAgNDB2ODBjMCAyMi4xLTE3LjkgNDAtNDAgNDAtMTEgMC0yMS00LjUtMjguMy0xMS43QzI2MC41IDIzNyAyNTYgMjI3IDI1NiAyMTZ2LTgweiBtNzA0IDc2MGMwIDE3LjctMTQuMyAzMi0zMiAzMkg5NmMtMTcuNyAwLTMyLTE0LjMtMzItMzJWNDQ4aDg5NnY0NDh6IiBwLWlkPSIxNjM4OSIgZmlsbD0iIzUxNTE1MSI+PC9wYXRoPjwvc3ZnPg==");
+ background-size: contain;
+ }
+ }
+ .tui-full-calendar-content {
+ padding-left: 0;
+ }
+ .tui-full-calendar-popup-section {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 10px;
+ .tui-full-calendar-popup-section-item {
+ height: 36px;
+ line-height: 34px;
+ border-color: #e8e8e8;
+ border-radius: 4px;
+ }
+ .tui-full-calendar-popup-section-item input {
+ height: 34px;
+ }
+ }
+ .tui-full-calendar-section-title {
+ width: 100%;
+ input {
+ width: 100%;
+ }
+ }
+ .tui-full-calendar-section-start-date,
+ .tui-full-calendar-section-end-date {
+ width: 210px;
+ .tui-full-calendar-content {
+ padding-left: 8px;
+ }
+ }
+ .tui-full-calendar-popup-location,
+ .tui-full-calendar-section-private,
+ .tui-full-calendar-section-allday,
+ .tui-full-calendar-section-state {
+ display: none;
+ }
+ }
+ .tui-full-calendar-popup-task {
+ .priority {
+ color: #ffffff;
+ padding: 2px 4px;
+ border-radius: 4px;
+ margin-right: 6px;
+ }
+ .overdue {
+ color: #f5222d;
+ background: #fff1f0;
+ border: 1px solid #ffa39e;
+ padding: 1px 3px;
+ border-radius: 4px;
+ margin-right: 6px;
+ }
+ .tui-full-calendar-calendar-dot,
+ .tui-full-calendar-ic-priority {
+ opacity: 0;
+ }
+ .tui-full-calendar-ic-edit {
+ top: -2px;
+ background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5MzY4MTg5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjExMTkiIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIj48cGF0aCBkPSJNODMzLjQyODU3MTY4IDYySDE5MC41NzE0MjgzMmExMjguNTcxNDI4MzIgMTI4LjU3MTQyODMyIDAgMCAwLTEyOC41NzE0MjgzMiAxMjguNTcxNDI4MzJ2NjQyLjg1NzE0MzM2YTEyOC41NzE0MjgzMiAxMjguNTcxNDI4MzIgMCAwIDAgMTI4LjU3MTQyODMyIDEyOC41NzE0MjgzMmg2NDIuODU3MTQzMzZhMTI4LjU3MTQyODMyIDEyOC41NzE0MjgzMiAwIDAgMCAxMjguNTcxNDI4MzItMTI4LjU3MTQyODMyVjE5MC41NzE0MjgzMmExMjguNTcxNDI4MzIgMTI4LjU3MTQyODMyIDAgMCAwLTEyOC41NzE0MjgzMi0xMjguNTcxNDI4MzJ6IG02NC4yODU3MTQxNiA3NzEuNDI4NTcxNjhhNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTYgMCAwIDEtNjQuMjg1NzE0MTcgNjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyYTY0LjI4NTcxNDE2IDY0LjI4NTcxNDE2IDAgMCAxLTY0LjI4NTcxNDE2LTY0LjI4NTcxNDE2VjE5MC41NzE0MjgzMmE2NC4yODU3MTQxNiA2NC4yODU3MTQxNiAwIDAgMSA2NC4yODU3MTQxNy02NC4yODU3MTQxNmg2NDIuODU3MTQzMzVhNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTYgMCAwIDEgNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTd6IiBwLWlkPSIxMTIwIiBmaWxsPSIjNTE1MTUxIj48L3BhdGg+PHBhdGggZD0iTTE5MC41NzE0MjgzMiAyNTQuODU3MTQyNDhoNjQuMjg1NzE0MTZ2NjQuMjg1NzE1MDRIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgMjU0Ljg1NzE0MjQ4aDQ1MHY2NC4yODU3MTUwNEgzMTkuMTQyODU3NTJ6TTE5MC41NzE0MjgzMiA0NDcuNzE0Mjg1ODRoNjQuMjg1NzE0MTZ2NjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgNDQ3LjcxNDI4NTg0aDQ1MHY2NC4yODU3MTQxNkgzMTkuMTQyODU3NTJ6TTE5MC41NzE0MjgzMiA2NDAuNTcxNDI4MzJoNjQuMjg1NzE0MTZ2NjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgNjQwLjU3MTQyODMyaDMyMS40Mjg1NzA4djY0LjI4NTcxNDE2SDMxOS4xNDI4NTc1MnoiIHAtaWQ9IjExMjEiIGZpbGw9IiM1MTUxNTEiPjwvcGF0aD48L3N2Zz4=");
+ }
+ .tui-full-calendar-ic-delete {
+ top: -2px;
+ background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5MzMwMTc2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9Ijc5MiIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiPjxwYXRoIGQ9Ik04OTIuMjg4IDI1NmgtMTkxLjE2OEEyMDIuMjQgMjAyLjI0IDAgMCAwIDUwOS42MzIgNjIuMDggMjAxLjIxNiAyMDEuMjE2IDAgMCAwIDMxOC44NDggMjU2SDEyOGMtMTguNjg4IDAtNjYuMDQ4LTQuMjI0LTY2LjA0OCAyNC43NjhDNjEuOTUyIDMyNy43NDQgMTA5LjM3NiAzMjAgMTI4IDMyMGg2NHY1MTJhMTQ2LjQ5NiAxNDYuNDk2IDAgMCAwIDEyNy40MjQgMTI4aDM4Mi4yNzJBMTUwLjAxNiAxNTAuMDE2IDAgMCAwIDgzMiA4MzJsLTMuMzkyLTUxMmg2NGMxOC4zNjggMCA2NS4wMjQgMS40NzIgNjUuMDI0LTM5Ljc0NEE3Mi4zODQgNzIuMzg0IDAgMCAwIDg5Mi4yODggMjU2ek01MDkuNjMyIDEyOC41MTJBMTM4LjE3NiAxMzguMTc2IDAgMCAxIDYzNy40NCAyNTZIMzgyLjU5MmExMzcuOTIgMTM3LjkyIDAgMCAxIDEyNy4wNC0xMjcuNDg4ek03NjggODMyYTk3Ljk4NCA5Ny45ODQgMCAwIDEtNjYuODggNjRIMzE4Ljg0OGE5My41NjggOTMuNTY4IDAgMCAxLTY0LTY0VjMyMEg3Njh2NTEyeiBtLTM4NS40MDgtNjRWNTEyYzAtMTguNDk2IDAuOTYtNjAuOTkyIDM2LjczNi02MC45OTIgMjcuMzI4IDAgMjYuNDk2IDQzLjAwOCAyNi45NDQgNjAuOTkydjI1NmMwIDE4LjQ5Ni02LjQgMjAuMDMyLTI0Ljk2IDIwLjAzMnMtMzguNzItMS41MzYtMzguNzItMjAuMDMyeiBtMTkxLjE2OCAwVjUxMmE2NCA2NCAwIDAgMSAyMy44MDgtNjAuOTkyYzQyLjQzMiAwIDM5LjM2IDQzLjAwOCAzOS44NzIgNjAuOTkydjI1NmMwIDE4LjQ5Ni0xOS41ODQgMjAuMDMyLTM3Ljk1MiAyMC4wMzJzLTI1Ljc5Mi0xLjUzNi0yNS43OTItMjAuMDMyeiIgcC1pZD0iNzkzIiBmaWxsPSIjNTE1MTUxIj48L3BhdGg+PC9zdmc+");
+ }
+ .tui-full-calendar-popup-detail-item-separate {
+ padding-left: 22px;
+ }
+ }
+ .tui-datepicker {
+ border-color: #e8e8e8;
+ .tui-calendar {
+ th,
+ td {
+ height: 32px;
+ }
+ .tui-calendar-prev-month.tui-calendar-date,
+ .tui-calendar-next-month.tui-calendar-date {
+ visibility: visible;
+ }
+ }
+ .tui-datepicker-body .tui-timepicker,
+ .tui-datepicker-footer .tui-timepicker {
+ padding: 16px 46px 16px 47px;
+ }
+ }
+ .tui-full-calendar-week-container{
+ min-height: 100px;
+ }
+}
+
+body.window-portrait {
+ .calendar-wrapper {
+ .tui-full-calendar-popup {
+ font-weight: normal;
+ }
+ .tui-full-calendar-section-button {
+ > button {
+ .tui-full-calendar-icon {
+ width: 14px;
+ height: 14px;
+ background-size: 14px;
+ }
+ .tui-full-calendar-content {
+ font-size: 14px;
+ }
+ }
+ }
+ }
+ @media (max-width: 640px) {
+ .calendar-wrapper {
+ .tui-full-calendar-popup-arrow {
+ display: none;
+ }
+ }
+ }
+}
diff --git a/resources/assets/sass/pages/components/home-calendar.scss b/resources/assets/sass/pages/components/home-calendar.scss
index c77827684..80b5dfffe 100644
--- a/resources/assets/sass/pages/components/home-calendar.scss
+++ b/resources/assets/sass/pages/components/home-calendar.scss
@@ -6,14 +6,12 @@
border-radius: 3px;
display: flex;
flex-direction: column;
- padding: 32px 0;
overflow: auto;
.calendar-header {
display: flex;
align-items: center;
margin-bottom: 20px;
- padding: 0 24px;
.calendar-header-menu {
position: relative;
flex: 1;
@@ -130,141 +128,21 @@
.calendar-tui{
overflow: auto;
flex: 1;
- margin-top: 22px;
+ margin-top: 30px;
border-top: 1px solid #F2F2F2;
- // .tui-full-calendar-vlayout-area>div:nth-child(3){
- // height: 300px !important;
- // }
- // .tui-full-calendar-dayname-layout{
- // display: none;
- // }
- // .tui-full-calendar-left,.tui-full-calendar-timegrid-left{
- // width: 45px !important;
- // }
- // .tui-full-calendar-timegrid-right{
- // margin-left: 45px !important;
- // }
- // .tui-full-calendar-popup {
- // box-shadow: none;
- // margin-left: 5px;
- // .tui-full-calendar-section-header {
- // .tui-full-calendar-ic-checkbox-checked {
- // background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAAhFBMVEUAAACLz3CLz3CLz3CKzm6Gy2+Lz3CLz3CL0HCLz3CLz3CLz3CLz3CMz3GLz3CKz3CLz3CL0HCJ0G+KznCN0HCL0HCLz3CKz3CLz3CLz3CLz3CMz3CLz3CLz3GL0XCL0HCN0XKLz3CLz3CMz3CLz3CM0HCM0G+FzHCLz3CKz3CMz3CLz3Bod5CFAAAAK3RSTlMA18RAOQ3s8+Pc0rmyq3tpiUwTgBnovyDMjmNSRjUvJQX5yKB0WisKppuUFLaY7gAAAotJREFUeNrtm+FymkAUhc8KqIAgSkyUtkmsmqa97/9+HWeSudpCd8qZ7E0m+73A9/1gxmXx4IK0nbipvDFTN2lT9JDVToLh6gx/sHQSFLfEFZUEp8IFczFgrv5CTChe/TsxYvfy/IkZy7M/c2KGywDUYkgNIBdDciARUxI0YkqDiZgygRNTHKZiyhRiTAyIATEgBsSAGBADYsAnCJgdmtIywKUAOrsA94QzJyKA95/pbALcPV7piADGryzDB+Rnv3IkAhi/UhMBjF9pQwbk3/A3JRXA+7GjAng/DqEC5v3+dMYE8P6nQsIEzFOPnw7g/QpC+R8K4QJ4f5iAzaA/TMAm6fdvZQgY+wW2fn9A0a66Bee/2xLH8kp/Rr1MB/3jAxaP0ALCPzagzPBCM9r/XcYH3K4BLfD4vw75xwdMbqB4CmaD/vEB2ztc0RD+MQHFg+c85fffDPv9AbPUd6Lz+ydCBDyjh1//6WcCGngK1L8a8lMBJTwFfj8XIC16+SnX7Af9bIDUngLSrwFEwaD/VogA5YheDj7/Wv1MgL9g/8XjpwNk+c8Cyq8BYwqePX46QOkGCmi/BowrqFi/Bvg4wYv6y7e4Kz4Rfj5AnzY/WSlcwHAB5+cD9ivKzwfIbEX4qQA99RB+NkDfO4b5sRAigHjzpP0C6u6D9wuo2z/eL+DvXx8Zv4C4gVd/qABxCeFnApQT5+cDpOP8fICcLv2VxbfjlQZUNh+vU/XbBIj6jQLm9wDWlZgFyOaYHJ3Ix/gDQwyIATEgBsSAGODBfuBgPvEwH7m0YkqLVExJYfsQuPcwdjOf+5kPHoFKjKio0e3Hn90WUCyGt7v3Nf0GsjqXYOR1hh6SJsz8v0mg/AZRXmaRKXtJBwAAAABJRU5ErkJggg==);
- // }
- // }
- // .tui-full-calendar-popup-container {
- // border: 0;
- // box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
- // border-radius: 6px;
- // }
- // .tui-full-calendar-arrow-top .tui-full-calendar-popup-arrow-border {
- // top: -8px;
- // border-bottom-color: rgba(217, 217, 217, .5);
- // }
- // }
- // .tui-full-calendar-dropdown-menu {
- // border-color: #e8e8e8;
- // width: calc(100% - 14px);
- // }
- // .tui-full-calendar-popup-creation {
- // .tui-full-calendar-icon {
- // &.tui-full-calendar-ic-title,
- // &.tui-full-calendar-calendar-dot {
- // display: none;
- // }
- // &.tui-full-calendar-ic-date {
- // background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5NjcwNjA3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE2Mzg4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTk2MCAxMjhIODMzYzAtNTMtNDMtOTYtOTYtOTZoLTE2Yy01MyAwLTk2IDQzLTk2IDk2SDQwMGMwLTI2LjUtMTAuNy01MC41LTI4LjEtNjcuOUMzNTQuNSA0Mi43IDMzMC41IDMyIDMwNCAzMmgtMTZjLTUzIDAtOTYgNDMtOTYgOTZINjRjLTM1LjMgMC02NCAyOC42LTY0IDY0djczNmMwIDM1LjMgMjguNyA2NCA2NCA2NGg4OTZjMzUuMyAwIDY0LTI4LjcgNjQtNjRWMTkyYzAtMzUuNC0yOC43LTY0LTY0LTY0eiBtLTI3MSA4YzAtMjIuMSAxNy45LTQwIDQwLTQwczQwIDE3LjkgNDAgNDB2ODBjMCAyMi4xLTE3LjkgNDAtNDAgNDAtMTEgMC0yMS00LjUtMjguMy0xMS43QzY5My41IDIzNyA2ODkgMjI3IDY4OSAyMTZ2LTgweiBtLTQzMyAwYzAtMjIuMSAxNy45LTQwIDQwLTQwczQwIDE3LjkgNDAgNDB2ODBjMCAyMi4xLTE3LjkgNDAtNDAgNDAtMTEgMC0yMS00LjUtMjguMy0xMS43QzI2MC41IDIzNyAyNTYgMjI3IDI1NiAyMTZ2LTgweiBtNzA0IDc2MGMwIDE3LjctMTQuMyAzMi0zMiAzMkg5NmMtMTcuNyAwLTMyLTE0LjMtMzItMzJWNDQ4aDg5NnY0NDh6IiBwLWlkPSIxNjM4OSIgZmlsbD0iIzUxNTE1MSI+PC9wYXRoPjwvc3ZnPg==");
- // background-size: contain;
- // }
- // }
- // .tui-full-calendar-content {
- // padding-left: 0;
- // }
- // .tui-full-calendar-popup-section {
- // display: flex;
- // justify-content: space-between;
- // margin-bottom: 10px;
- // .tui-full-calendar-popup-section-item {
- // height: 36px;
- // line-height: 34px;
- // border-color: #e8e8e8;
- // border-radius: 4px;
- // }
- // .tui-full-calendar-popup-section-item input {
- // height: 34px;
- // }
- // }
- // .tui-full-calendar-section-title {
- // width: 100%;
- // input {
- // width: 100%;
- // }
- // }
- // .tui-full-calendar-section-start-date,
- // .tui-full-calendar-section-end-date {
- // width: 210px;
- // .tui-full-calendar-content {
- // padding-left: 8px;
- // }
- // }
- // .tui-full-calendar-popup-location,
- // .tui-full-calendar-section-private,
- // .tui-full-calendar-section-allday,
- // .tui-full-calendar-section-state {
- // display: none;
- // }
- // }
- // .tui-full-calendar-popup-task {
- // .priority {
- // color: #ffffff;
- // padding: 2px 4px;
- // border-radius: 4px;
- // margin-right: 6px;
- // }
- // .overdue {
- // color: #f5222d;
- // background: #fff1f0;
- // border: 1px solid #ffa39e;
- // padding: 1px 3px;
- // border-radius: 4px;
- // margin-right: 6px;
- // }
- // .tui-full-calendar-calendar-dot,
- // .tui-full-calendar-ic-priority {
- // opacity: 0;
- // }
- // .tui-full-calendar-ic-edit {
- // top: -2px;
- // background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5MzY4MTg5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjExMTkiIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIj48cGF0aCBkPSJNODMzLjQyODU3MTY4IDYySDE5MC41NzE0MjgzMmExMjguNTcxNDI4MzIgMTI4LjU3MTQyODMyIDAgMCAwLTEyOC41NzE0MjgzMiAxMjguNTcxNDI4MzJ2NjQyLjg1NzE0MzM2YTEyOC41NzE0MjgzMiAxMjguNTcxNDI4MzIgMCAwIDAgMTI4LjU3MTQyODMyIDEyOC41NzE0MjgzMmg2NDIuODU3MTQzMzZhMTI4LjU3MTQyODMyIDEyOC41NzE0MjgzMiAwIDAgMCAxMjguNTcxNDI4MzItMTI4LjU3MTQyODMyVjE5MC41NzE0MjgzMmExMjguNTcxNDI4MzIgMTI4LjU3MTQyODMyIDAgMCAwLTEyOC41NzE0MjgzMi0xMjguNTcxNDI4MzJ6IG02NC4yODU3MTQxNiA3NzEuNDI4NTcxNjhhNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTYgMCAwIDEtNjQuMjg1NzE0MTcgNjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyYTY0LjI4NTcxNDE2IDY0LjI4NTcxNDE2IDAgMCAxLTY0LjI4NTcxNDE2LTY0LjI4NTcxNDE2VjE5MC41NzE0MjgzMmE2NC4yODU3MTQxNiA2NC4yODU3MTQxNiAwIDAgMSA2NC4yODU3MTQxNy02NC4yODU3MTQxNmg2NDIuODU3MTQzMzVhNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTYgMCAwIDEgNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTd6IiBwLWlkPSIxMTIwIiBmaWxsPSIjNTE1MTUxIj48L3BhdGg+PHBhdGggZD0iTTE5MC41NzE0MjgzMiAyNTQuODU3MTQyNDhoNjQuMjg1NzE0MTZ2NjQuMjg1NzE1MDRIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgMjU0Ljg1NzE0MjQ4aDQ1MHY2NC4yODU3MTUwNEgzMTkuMTQyODU3NTJ6TTE5MC41NzE0MjgzMiA0NDcuNzE0Mjg1ODRoNjQuMjg1NzE0MTZ2NjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgNDQ3LjcxNDI4NTg0aDQ1MHY2NC4yODU3MTQxNkgzMTkuMTQyODU3NTJ6TTE5MC41NzE0MjgzMiA2NDAuNTcxNDI4MzJoNjQuMjg1NzE0MTZ2NjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgNjQwLjU3MTQyODMyaDMyMS40Mjg1NzA4djY0LjI4NTcxNDE2SDMxOS4xNDI4NTc1MnoiIHAtaWQ9IjExMjEiIGZpbGw9IiM1MTUxNTEiPjwvcGF0aD48L3N2Zz4=");
- // }
- // .tui-full-calendar-ic-delete {
- // top: -2px;
- // background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5MzMwMTc2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9Ijc5MiIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiPjxwYXRoIGQ9Ik04OTIuMjg4IDI1NmgtMTkxLjE2OEEyMDIuMjQgMjAyLjI0IDAgMCAwIDUwOS42MzIgNjIuMDggMjAxLjIxNiAyMDEuMjE2IDAgMCAwIDMxOC44NDggMjU2SDEyOGMtMTguNjg4IDAtNjYuMDQ4LTQuMjI0LTY2LjA0OCAyNC43NjhDNjEuOTUyIDMyNy43NDQgMTA5LjM3NiAzMjAgMTI4IDMyMGg2NHY1MTJhMTQ2LjQ5NiAxNDYuNDk2IDAgMCAwIDEyNy40MjQgMTI4aDM4Mi4yNzJBMTUwLjAxNiAxNTAuMDE2IDAgMCAwIDgzMiA4MzJsLTMuMzkyLTUxMmg2NGMxOC4zNjggMCA2NS4wMjQgMS40NzIgNjUuMDI0LTM5Ljc0NEE3Mi4zODQgNzIuMzg0IDAgMCAwIDg5Mi4yODggMjU2ek01MDkuNjMyIDEyOC41MTJBMTM4LjE3NiAxMzguMTc2IDAgMCAxIDYzNy40NCAyNTZIMzgyLjU5MmExMzcuOTIgMTM3LjkyIDAgMCAxIDEyNy4wNC0xMjcuNDg4ek03NjggODMyYTk3Ljk4NCA5Ny45ODQgMCAwIDEtNjYuODggNjRIMzE4Ljg0OGE5My41NjggOTMuNTY4IDAgMCAxLTY0LTY0VjMyMEg3Njh2NTEyeiBtLTM4NS40MDgtNjRWNTEyYzAtMTguNDk2IDAuOTYtNjAuOTkyIDM2LjczNi02MC45OTIgMjcuMzI4IDAgMjYuNDk2IDQzLjAwOCAyNi45NDQgNjAuOTkydjI1NmMwIDE4LjQ5Ni02LjQgMjAuMDMyLTI0Ljk2IDIwLjAzMnMtMzguNzItMS41MzYtMzguNzItMjAuMDMyeiBtMTkxLjE2OCAwVjUxMmE2NCA2NCAwIDAgMSAyMy44MDgtNjAuOTkyYzQyLjQzMiAwIDM5LjM2IDQzLjAwOCAzOS44NzIgNjAuOTkydjI1NmMwIDE4LjQ5Ni0xOS41ODQgMjAuMDMyLTM3Ljk1MiAyMC4wMzJzLTI1Ljc5Mi0xLjUzNi0yNS43OTItMjAuMDMyeiIgcC1pZD0iNzkzIiBmaWxsPSIjNTE1MTUxIj48L3BhdGg+PC9zdmc+");
- // }
- // .tui-full-calendar-popup-detail-item-separate {
- // padding-left: 22px;
- // }
- // }
- // .tui-datepicker {
- // border-color: #e8e8e8;
- // .tui-calendar {
- // th,
- // td {
- // height: 32px;
- // }
- // .tui-calendar-prev-month.tui-calendar-date,
- // .tui-calendar-next-month.tui-calendar-date {
- // visibility: visible;
- // }
- // }
- // .tui-datepicker-body .tui-timepicker,
- // .tui-datepicker-footer .tui-timepicker {
- // padding: 16px 46px 16px 47px;
- // }
- // }
- // .tui-full-calendar-popup-detail-item {
- // word-break: break-all;
- // }
+ .tui-full-calendar-dayname-layout{
+ display: none;
+ }
+ .tui-full-calendar-left,.tui-full-calendar-timegrid-left{
+ width: 45px !important;
+ }
+ .tui-full-calendar-timegrid-right{
+ margin-left: 45px !important;
+ }
+ .tui-full-calendar-popup {
+ box-shadow: none;
+ margin-left: 5px;
+ }
}
}
}
diff --git a/resources/assets/sass/pages/page-calendar.scss b/resources/assets/sass/pages/page-calendar.scss
index 90d3ea2f5..e4906e014 100644
--- a/resources/assets/sass/pages/page-calendar.scss
+++ b/resources/assets/sass/pages/page-calendar.scss
@@ -50,149 +50,6 @@
flex-direction: column;
padding: 0 48px 6px;
overflow: hidden;
- .calendar-wrapper {
- flex: 1;
- position: relative;
- &:before {
- content: "";
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- height: 2px;
- background-color: #ffffff;
- z-index: 1;
- }
- .toastui-calendar-popup {
- box-shadow: none;
- .toastui-calendar-section-header {
- .toastui-calendar-ic-checkbox-checked {
- background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAAhFBMVEUAAACLz3CLz3CLz3CKzm6Gy2+Lz3CLz3CL0HCLz3CLz3CLz3CLz3CMz3GLz3CKz3CLz3CL0HCJ0G+KznCN0HCL0HCLz3CKz3CLz3CLz3CLz3CMz3CLz3CLz3GL0XCL0HCN0XKLz3CLz3CMz3CLz3CM0HCM0G+FzHCLz3CKz3CMz3CLz3Bod5CFAAAAK3RSTlMA18RAOQ3s8+Pc0rmyq3tpiUwTgBnovyDMjmNSRjUvJQX5yKB0WisKppuUFLaY7gAAAotJREFUeNrtm+FymkAUhc8KqIAgSkyUtkmsmqa97/9+HWeSudpCd8qZ7E0m+73A9/1gxmXx4IK0nbipvDFTN2lT9JDVToLh6gx/sHQSFLfEFZUEp8IFczFgrv5CTChe/TsxYvfy/IkZy7M/c2KGywDUYkgNIBdDciARUxI0YkqDiZgygRNTHKZiyhRiTAyIATEgBsSAGBADYsAnCJgdmtIywKUAOrsA94QzJyKA95/pbALcPV7piADGryzDB+Rnv3IkAhi/UhMBjF9pQwbk3/A3JRXA+7GjAng/DqEC5v3+dMYE8P6nQsIEzFOPnw7g/QpC+R8K4QJ4f5iAzaA/TMAm6fdvZQgY+wW2fn9A0a66Bee/2xLH8kp/Rr1MB/3jAxaP0ALCPzagzPBCM9r/XcYH3K4BLfD4vw75xwdMbqB4CmaD/vEB2ztc0RD+MQHFg+c85fffDPv9AbPUd6Lz+ydCBDyjh1//6WcCGngK1L8a8lMBJTwFfj8XIC16+SnX7Af9bIDUngLSrwFEwaD/VogA5YheDj7/Wv1MgL9g/8XjpwNk+c8Cyq8BYwqePX46QOkGCmi/BowrqFi/Bvg4wYv6y7e4Kz4Rfj5AnzY/WSlcwHAB5+cD9ivKzwfIbEX4qQA99RB+NkDfO4b5sRAigHjzpP0C6u6D9wuo2z/eL+DvXx8Zv4C4gVd/qABxCeFnApQT5+cDpOP8fICcLv2VxbfjlQZUNh+vU/XbBIj6jQLm9wDWlZgFyOaYHJ3Ix/gDQwyIATEgBsSAGODBfuBgPvEwH7m0YkqLVExJYfsQuPcwdjOf+5kPHoFKjKio0e3Hn90WUCyGt7v3Nf0GsjqXYOR1hh6SJsz8v0mg/AZRXmaRKXtJBwAAAABJRU5ErkJggg==);
- }
- }
- .toastui-calendar-popup-container {
- border: 0;
- box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
- border-radius: 6px;
- }
- .toastui-calendar-arrow-top .toastui-calendar-popup-arrow-border {
- top: -8px;
- border-bottom-color: rgba(217, 217, 217, .5);
- }
- }
- .toastui-calendar-dropdown-menu {
- border-color: #e8e8e8;
- width: calc(100% - 14px);
- }
- .toastui-calendar-popup-creation {
- .toastui-calendar-icon {
- &.toastui-calendar-ic-title,
- &.toastui-calendar-calendar-dot {
- display: none;
- }
- &.toastui-calendar-ic-date {
- background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5NjcwNjA3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE2Mzg4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTk2MCAxMjhIODMzYzAtNTMtNDMtOTYtOTYtOTZoLTE2Yy01MyAwLTk2IDQzLTk2IDk2SDQwMGMwLTI2LjUtMTAuNy01MC41LTI4LjEtNjcuOUMzNTQuNSA0Mi43IDMzMC41IDMyIDMwNCAzMmgtMTZjLTUzIDAtOTYgNDMtOTYgOTZINjRjLTM1LjMgMC02NCAyOC42LTY0IDY0djczNmMwIDM1LjMgMjguNyA2NCA2NCA2NGg4OTZjMzUuMyAwIDY0LTI4LjcgNjQtNjRWMTkyYzAtMzUuNC0yOC43LTY0LTY0LTY0eiBtLTI3MSA4YzAtMjIuMSAxNy45LTQwIDQwLTQwczQwIDE3LjkgNDAgNDB2ODBjMCAyMi4xLTE3LjkgNDAtNDAgNDAtMTEgMC0yMS00LjUtMjguMy0xMS43QzY5My41IDIzNyA2ODkgMjI3IDY4OSAyMTZ2LTgweiBtLTQzMyAwYzAtMjIuMSAxNy45LTQwIDQwLTQwczQwIDE3LjkgNDAgNDB2ODBjMCAyMi4xLTE3LjkgNDAtNDAgNDAtMTEgMC0yMS00LjUtMjguMy0xMS43QzI2MC41IDIzNyAyNTYgMjI3IDI1NiAyMTZ2LTgweiBtNzA0IDc2MGMwIDE3LjctMTQuMyAzMi0zMiAzMkg5NmMtMTcuNyAwLTMyLTE0LjMtMzItMzJWNDQ4aDg5NnY0NDh6IiBwLWlkPSIxNjM4OSIgZmlsbD0iIzUxNTE1MSI+PC9wYXRoPjwvc3ZnPg==");
- background-size: contain;
- }
- }
- .toastui-calendar-content {
- padding-left: 0;
- }
- .toastui-calendar-popup-section {
- display: flex;
- justify-content: space-between;
- margin-bottom: 10px;
- .toastui-calendar-popup-section-item {
- height: 36px;
- line-height: 34px;
- border-color: #e8e8e8;
- border-radius: 4px;
- }
- .toastui-calendar-popup-section-item input {
- height: 34px;
- }
- }
- .toastui-calendar-section-title {
- width: 100%;
- input {
- width: 100%;
- }
- }
- .toastui-calendar-section-start-date,
- .toastui-calendar-section-end-date {
- width: 210px;
- .toastui-calendar-content {
- padding-left: 8px;
- }
- }
- .toastui-calendar-popup-location,
- .toastui-calendar-section-private,
- .toastui-calendar-section-allday,
- .toastui-calendar-section-state {
- display: none;
- }
- }
- .toastui-calendar-popup-container {
- word-break: break-all;
- .priority {
- color: #ffffff;
- padding: 2px 4px;
- border-radius: 4px;
- margin-right: 6px;
- }
- .overdue {
- color: #f5222d;
- background: #fff1f0;
- border: 1px solid #ffa39e;
- padding: 1px 3px;
- border-radius: 4px;
- margin-right: 6px;
- }
- .toastui-calendar-calendar-dot,
- .toastui-calendar-ic-priority {
- opacity: 0;
- }
- .toastui-calendar-ic-edit {
- top: -2px;
- background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5MzY4MTg5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjExMTkiIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIj48cGF0aCBkPSJNODMzLjQyODU3MTY4IDYySDE5MC41NzE0MjgzMmExMjguNTcxNDI4MzIgMTI4LjU3MTQyODMyIDAgMCAwLTEyOC41NzE0MjgzMiAxMjguNTcxNDI4MzJ2NjQyLjg1NzE0MzM2YTEyOC41NzE0MjgzMiAxMjguNTcxNDI4MzIgMCAwIDAgMTI4LjU3MTQyODMyIDEyOC41NzE0MjgzMmg2NDIuODU3MTQzMzZhMTI4LjU3MTQyODMyIDEyOC41NzE0MjgzMiAwIDAgMCAxMjguNTcxNDI4MzItMTI4LjU3MTQyODMyVjE5MC41NzE0MjgzMmExMjguNTcxNDI4MzIgMTI4LjU3MTQyODMyIDAgMCAwLTEyOC41NzE0MjgzMi0xMjguNTcxNDI4MzJ6IG02NC4yODU3MTQxNiA3NzEuNDI4NTcxNjhhNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTYgMCAwIDEtNjQuMjg1NzE0MTcgNjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyYTY0LjI4NTcxNDE2IDY0LjI4NTcxNDE2IDAgMCAxLTY0LjI4NTcxNDE2LTY0LjI4NTcxNDE2VjE5MC41NzE0MjgzMmE2NC4yODU3MTQxNiA2NC4yODU3MTQxNiAwIDAgMSA2NC4yODU3MTQxNy02NC4yODU3MTQxNmg2NDIuODU3MTQzMzVhNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTYgMCAwIDEgNjQuMjg1NzE0MTYgNjQuMjg1NzE0MTd6IiBwLWlkPSIxMTIwIiBmaWxsPSIjNTE1MTUxIj48L3BhdGg+PHBhdGggZD0iTTE5MC41NzE0MjgzMiAyNTQuODU3MTQyNDhoNjQuMjg1NzE0MTZ2NjQuMjg1NzE1MDRIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgMjU0Ljg1NzE0MjQ4aDQ1MHY2NC4yODU3MTUwNEgzMTkuMTQyODU3NTJ6TTE5MC41NzE0MjgzMiA0NDcuNzE0Mjg1ODRoNjQuMjg1NzE0MTZ2NjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgNDQ3LjcxNDI4NTg0aDQ1MHY2NC4yODU3MTQxNkgzMTkuMTQyODU3NTJ6TTE5MC41NzE0MjgzMiA2NDAuNTcxNDI4MzJoNjQuMjg1NzE0MTZ2NjQuMjg1NzE0MTZIMTkwLjU3MTQyODMyek0zMTkuMTQyODU3NTIgNjQwLjU3MTQyODMyaDMyMS40Mjg1NzA4djY0LjI4NTcxNDE2SDMxOS4xNDI4NTc1MnoiIHAtaWQ9IjExMjEiIGZpbGw9IiM1MTUxNTEiPjwvcGF0aD48L3N2Zz4=");
- }
- .toastui-calendar-ic-delete {
- top: -2px;
- background-image: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIzODU5MzMwMTc2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9Ijc5MiIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiPjxwYXRoIGQ9Ik04OTIuMjg4IDI1NmgtMTkxLjE2OEEyMDIuMjQgMjAyLjI0IDAgMCAwIDUwOS42MzIgNjIuMDggMjAxLjIxNiAyMDEuMjE2IDAgMCAwIDMxOC44NDggMjU2SDEyOGMtMTguNjg4IDAtNjYuMDQ4LTQuMjI0LTY2LjA0OCAyNC43NjhDNjEuOTUyIDMyNy43NDQgMTA5LjM3NiAzMjAgMTI4IDMyMGg2NHY1MTJhMTQ2LjQ5NiAxNDYuNDk2IDAgMCAwIDEyNy40MjQgMTI4aDM4Mi4yNzJBMTUwLjAxNiAxNTAuMDE2IDAgMCAwIDgzMiA4MzJsLTMuMzkyLTUxMmg2NGMxOC4zNjggMCA2NS4wMjQgMS40NzIgNjUuMDI0LTM5Ljc0NEE3Mi4zODQgNzIuMzg0IDAgMCAwIDg5Mi4yODggMjU2ek01MDkuNjMyIDEyOC41MTJBMTM4LjE3NiAxMzguMTc2IDAgMCAxIDYzNy40NCAyNTZIMzgyLjU5MmExMzcuOTIgMTM3LjkyIDAgMCAxIDEyNy4wNC0xMjcuNDg4ek03NjggODMyYTk3Ljk4NCA5Ny45ODQgMCAwIDEtNjYuODggNjRIMzE4Ljg0OGE5My41NjggOTMuNTY4IDAgMCAxLTY0LTY0VjMyMEg3Njh2NTEyeiBtLTM4NS40MDgtNjRWNTEyYzAtMTguNDk2IDAuOTYtNjAuOTkyIDM2LjczNi02MC45OTIgMjcuMzI4IDAgMjYuNDk2IDQzLjAwOCAyNi45NDQgNjAuOTkydjI1NmMwIDE4LjQ5Ni02LjQgMjAuMDMyLTI0Ljk2IDIwLjAzMnMtMzguNzItMS41MzYtMzguNzItMjAuMDMyeiBtMTkxLjE2OCAwVjUxMmE2NCA2NCAwIDAgMSAyMy44MDgtNjAuOTkyYzQyLjQzMiAwIDM5LjM2IDQzLjAwOCAzOS44NzIgNjAuOTkydjI1NmMwIDE4LjQ5Ni0xOS41ODQgMjAuMDMyLTM3Ljk1MiAyMC4wMzJzLTI1Ljc5Mi0xLjUzNi0yNS43OTItMjAuMDMyeiIgcC1pZD0iNzkzIiBmaWxsPSIjNTE1MTUxIj48L3BhdGg+PC9zdmc+");
- }
- .toastui-calendar-popup-detail-item-separate {
- padding-left: 22px;
- }
- .toastui-calendar-ic-state-b{
- display: none;
- }
- }
- .toastui-datepicker {
- border-color: #e8e8e8;
- .toastui-calendar {
- th,
- td {
- height: 32px;
- }
- .toastui-calendar-prev-month.toastui-calendar-date,
- .toastui-calendar-next-month.toastui-calendar-date {
- visibility: visible;
- }
- }
- .toastui-datepicker-body .toastui-timepicker,
- .toastui-datepicker-footer .toastui-timepicker {
- padding: 16px 46px 16px 47px;
- }
- }
- // 去除时间
- .toastui-calendar-weekday-event{
- .toastui-calendar-template-time{
- strong{
- display: none;
- }
- }
- }
- }
}
.calendar-menu {
position: absolute;
@@ -224,17 +81,17 @@ body.window-portrait {
padding: 0 24px 5px;
user-select: none;
.calendar-wrapper {
- .toastui-calendar-popup {
+ .tui-full-calendar-popup {
font-weight: normal;
}
- .toastui-calendar-section-button {
+ .tui-full-calendar-section-button {
> button {
- .toastui-calendar-icon {
+ .tui-full-calendar-icon {
width: 14px;
height: 14px;
background-size: 14px;
}
- .toastui-calendar-content {
+ .tui-full-calendar-content {
font-size: 14px;
}
}
@@ -246,7 +103,7 @@ body.window-portrait {
.page-calendar {
.calendar-box {
.calendar-wrapper {
- .toastui-calendar-popup-arrow {
+ .tui-full-calendar-popup-arrow {
display: none;
}
}
diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss
index a59063513..4544c917e 100644
--- a/resources/assets/sass/pages/page-dashboard.scss
+++ b/resources/assets/sass/pages/page-dashboard.scss
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
display: flex;
- flex-direction: column;
+ flex-direction: row;
align-items: center;
justify-content: center;
background-color: #ffffff;
@@ -26,23 +26,107 @@
max-height: 100%;
display: flex;
flex-direction: column;
- align-items: flex-start;
width: 1px;
+ align-items: flex-start;
height: 100%;
flex: 1;
- overflow: hidden;
+ padding: 32px 4%;
+
+ .dashboard-hello {
+ display: flex;
+ .tite{
+ width: 1px;
+ flex: 1;
+ padding-right: 30px;
+ height: 41px;
+ padding-left: 2px;
+ }
+ .dashboard-search {
+ width: 1px;
+ flex-shrink: 0;
+ margin-left: 22px;
+ cursor: pointer;
+ .ivu-poptip{
+ float: right;
+ margin-left: auto;
+ .ivu-poptip-body{
+ padding:8px;
+ ul{
+ li{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ padding: 8px 10px;
+ border-radius: 6px;
+ cursor: pointer;
+ color: #999999;
+ &:hover{
+ color: #8FCE78;
+ }
+ &.selected{
+ color: #8FCE78;
+ }
+ }
+ .empty{
+ text-align: center;
+ color: #999999 !important;
+ }
+ }
+ }
+ }
+ .ivu-input-wrapper {
+ max-width: 100%;
+ margin-left: auto;
+ width: auto;
+ transform: translateZ(0);
+ .ivu-input {
+ border-color: #dcdee2;
+ width: 0;
+ padding-left: 0;
+ padding-right: 38px;
+ border-radius: 32px;
+ transition: all 0.3s;
+ font-size: 14px;
+ }
+ .ivu-input-suffix {
+ width: 40px;
+ i {
+ width: 40px;
+ color: $primary-text-color;
+ }
+ }
+ }
+ .has-value,
+ &:hover {
+ .ivu-input-wrapper {
+ .ivu-input {
+ width: 250px;
+ padding-left: 14px;
+ }
+ }
+ }
+ .selected{
+ .ivu-input-wrapper {
+ .ivu-input {
+ color: #8FCE78;
+ }
+ }
+ }
+ }
+
+ }
+
.dashboard-hello,
.dashboard-desc ,
.dashboard-block ,
.dashboard-list .dashboard-title,
.dashboard-list .dashboard-ul {
- width: 90%;
- max-width: 90%;
- margin: 0 30px;
+ width: 100%;
+ max-width: 100%;
+ margin: 0 auto;
}
.dashboard-hello {
- padding: 32px 12px 0;
color: $primary-title-color;
font-size: 24px;
font-weight: 600;
@@ -52,7 +136,6 @@
display: flex;
align-items: center;
margin-top: 18px;
- padding: 0 12px;
color: #888888;
font-size: 13px;
.dashboard-load {
@@ -66,7 +149,6 @@
}
.dashboard-block {
margin-top: 18px;
- padding: 0 12px;
display: flex;
> li {
flex: 1;
@@ -123,7 +205,6 @@
.dashboard-list {
width: 100%;
margin-top: 22px;
- padding-bottom: 32px;
.dashboard-ref {
height: 0;
}
@@ -132,7 +213,6 @@
top: 0;
z-index: 1;
margin: 0 auto;
- padding: 0 12px;
height: 46px;
line-height: 46px;
font-weight: 600;
@@ -141,7 +221,7 @@
}
.dashboard-ul {
margin: 0 auto 18px;
- padding: 6px 12px 0;
+ padding: 6px 0 0;
overflow: hidden;
> li {
position: relative;
@@ -252,6 +332,18 @@
}
}
}
+
+ .dashboard-calendar{
+ width: 35%;
+ min-width:400px;
+ height: 100%;
+ border-left: 1px solid #F4F5F7;
+ padding: 32px 24px 24px;
+ @media (max-width: 980px) {
+ display: none;
+ }
+ }
+
.nopage {
width: 100%;
height: 100%;
@@ -260,8 +352,6 @@
align-items: center;
justify-content: center;
.nopage-icon {
- background-color: #f4f5f7;
- padding: 20px;
border-radius: 50%;
.ivu-icon {
color: #d1d8dd;
@@ -271,9 +361,9 @@
.nopage-text {
margin-top: 16px;
color: #bec6cc;
- background-color: #f4f5f7;
padding: 4px 15px;
border-radius: 14px;
+ margin-bottom: 60px;
}
}
}
@@ -310,6 +400,7 @@ body.window-portrait {
.page-dashboard {
.dashboard-wrapper {
display: block;
+ padding-top: 20px;
.dashboard-hello,
.dashboard-desc ,
.dashboard-block ,
@@ -336,6 +427,46 @@ body.window-portrait {
user-select: none;
}
}
+ .dashboard-hello{
+ position: relative;
+ .tite{
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ .dashboard-search {
+ .has-value,
+ .selected,
+ &:hover {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 100%;
+ .ivu-input-wrapper {
+ .ivu-input {
+ width: 100%;
+ }
+ }
+ .ivu-poptip,
+ .ivu-poptip-rel,
+ .ivu-poptip-rel .selected,
+ .ivu-input-wrapper{
+ height: 42px;
+ width: 100%;
+ .ivu-input {
+ float: right;
+ padding-left: 14px;
+ }
+ }
+ }
+ }
+ .ivu-poptip-popper{
+ width: 90% !important;
+ }
+ }
+ }
+ .nopage{
+ margin-top: 30px;
}
}
}
diff --git a/resources/assets/statics/public/images/empty/complete.svg b/resources/assets/statics/public/images/empty/complete.svg
new file mode 100644
index 000000000..d5ef52ac7
--- /dev/null
+++ b/resources/assets/statics/public/images/empty/complete.svg
@@ -0,0 +1 @@
+
\ No newline at end of file