Bläddra i källkod

style timepicker and fix onclick issues

Alexander Belanger 3 år sedan
förälder
incheckning
a7e0cb695d

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 14599 - 1
dashboard/package-lock.json


+ 2 - 1
dashboard/package.json

@@ -104,13 +104,14 @@
     "babel-loader": "^8.2.2",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-styled-components": "^1.13.3",
-    "css-loader": "^5.2.7",
+    "css-loader": "^5.2.6",
     "file-loader": "^6.1.0",
     "html-webpack-plugin": "^4.5.0",
     "prettier": "2.2.1",
     "qs": "^6.9.4",
     "react-refresh": "^0.10.0",
     "source-map-loader": "^1.1.0",
+    "style-loader": "^2.0.0",
     "terser-webpack-plugin": "^4.2.3",
     "ts-loader": "^8.0.4",
     "typescript": "^4.1.2",

+ 7 - 5
dashboard/src/components/date-time-picker/DateTimePicker.tsx

@@ -4,6 +4,7 @@ import DatePicker from "react-datepicker";
 import time from "assets/time.svg";
 
 import styled from "styled-components";
+import "./react-datepicker.css";
 
 type Props = {
   startDate: any;
@@ -12,11 +13,12 @@ type Props = {
 
 const DateTimePicker: React.FC<Props> = ({ startDate, setStartDate }) => {
   return (
-    <DateTimePickerWrapper>
-      <link
-        rel="stylesheet"
-        href="https://cdnjs.cloudflare.com/ajax/libs/react-datepicker/2.14.1/react-datepicker.min.css"
-      />
+    <DateTimePickerWrapper
+      onClick={(e) => {
+        e.stopPropagation();
+        e.nativeEvent.stopImmediatePropagation();
+      }}
+    >
       <Bar />
       <StyledDatePicker
         selected={startDate}

+ 34 - 148
dashboard/src/components/date-time-picker/react-datepicker.css

@@ -1,3 +1,7 @@
+.react-datepicker__triangle {
+  display: none;
+}
+
 .react-datepicker-popper[data-placement^="bottom"] .react-datepicker__triangle,
 .react-datepicker-popper[data-placement^="top"] .react-datepicker__triangle,
 .react-datepicker__year-read-view--down-arrow,
@@ -6,7 +10,6 @@
   margin-left: -8px;
   position: absolute;
 }
-
 .react-datepicker-popper[data-placement^="bottom"] .react-datepicker__triangle,
 .react-datepicker-popper[data-placement^="top"] .react-datepicker__triangle,
 .react-datepicker__year-read-view--down-arrow,
@@ -25,7 +28,6 @@
   height: 0;
   width: 1px;
 }
-
 .react-datepicker-popper[data-placement^="bottom"]
   .react-datepicker__triangle::before,
 .react-datepicker-popper[data-placement^="top"]
@@ -39,25 +41,21 @@
   left: -8px;
   border-bottom-color: #aeaeae;
 }
-
 .react-datepicker-popper[data-placement^="bottom"] .react-datepicker__triangle {
   top: 0;
   margin-top: -8px;
 }
-
 .react-datepicker-popper[data-placement^="bottom"] .react-datepicker__triangle,
 .react-datepicker-popper[data-placement^="bottom"]
   .react-datepicker__triangle::before {
   border-top: none;
-  border-bottom-color: #f0f0f0;
+  border-bottom-color: #26292e;
 }
-
 .react-datepicker-popper[data-placement^="bottom"]
   .react-datepicker__triangle::before {
   top: -1px;
   border-bottom-color: #aeaeae;
 }
-
 .react-datepicker-popper[data-placement^="top"] .react-datepicker__triangle,
 .react-datepicker__year-read-view--down-arrow,
 .react-datepicker__month-read-view--down-arrow,
@@ -65,7 +63,6 @@
   bottom: 0;
   margin-bottom: -8px;
 }
-
 .react-datepicker-popper[data-placement^="top"] .react-datepicker__triangle,
 .react-datepicker__year-read-view--down-arrow,
 .react-datepicker__month-read-view--down-arrow,
@@ -78,7 +75,6 @@
   border-bottom: none;
   border-top-color: #fff;
 }
-
 .react-datepicker-popper[data-placement^="top"]
   .react-datepicker__triangle::before,
 .react-datepicker__year-read-view--down-arrow::before,
@@ -87,98 +83,80 @@
   bottom: -1px;
   border-top-color: #aeaeae;
 }
-
 .react-datepicker-wrapper {
   display: inline-block;
   padding: 0;
   border: 0;
 }
-
 .react-datepicker {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 0.8rem;
-  background-color: #fff;
-  color: #000;
+  font-family: "Work Sans", Arial, sans-serif;
+  font-size: 0.75rem;
+  background-color: #26292e;
+  color: white;
   border: 1px solid #aeaeae;
   border-radius: 0.3rem;
   display: inline-block;
   position: relative;
 }
-
 .react-datepicker--time-only .react-datepicker__triangle {
   left: 35px;
 }
-
 .react-datepicker--time-only .react-datepicker__time-container {
   border-left: 0;
 }
-
 .react-datepicker--time-only .react-datepicker__time {
   border-radius: 0.3rem;
 }
-
 .react-datepicker--time-only .react-datepicker__time-box {
   border-radius: 0.3rem;
 }
-
 .react-datepicker__triangle {
   position: absolute;
   left: 50px;
 }
-
 .react-datepicker-popper {
   z-index: 1;
 }
-
 .react-datepicker-popper[data-placement^="bottom"] {
   margin-top: 10px;
 }
-
 .react-datepicker-popper[data-placement="bottom-end"]
   .react-datepicker__triangle,
 .react-datepicker-popper[data-placement="top-end"] .react-datepicker__triangle {
   left: auto;
   right: 50px;
 }
-
 .react-datepicker-popper[data-placement^="top"] {
   margin-bottom: 10px;
 }
-
 .react-datepicker-popper[data-placement^="right"] {
   margin-left: 8px;
 }
-
 .react-datepicker-popper[data-placement^="right"] .react-datepicker__triangle {
   left: auto;
   right: 42px;
 }
-
 .react-datepicker-popper[data-placement^="left"] {
   margin-right: 8px;
 }
-
 .react-datepicker-popper[data-placement^="left"] .react-datepicker__triangle {
   left: 42px;
   right: auto;
 }
-
 .react-datepicker__header {
   text-align: center;
-  background-color: #f0f0f0;
+  background-color: #26292e;
   border-bottom: 1px solid #aeaeae;
   border-top-left-radius: 0.3rem;
   border-top-right-radius: 0.3rem;
   padding-top: 8px;
   position: relative;
 }
-
 .react-datepicker__header--time {
   padding-bottom: 8px;
   padding-left: 5px;
   padding-right: 5px;
 }
-
 .react-datepicker__year-dropdown-container--select,
 .react-datepicker__month-dropdown-container--select,
 .react-datepicker__month-year-dropdown-container--select,
@@ -188,22 +166,19 @@
   display: inline-block;
   margin: 0 2px;
 }
-
 .react-datepicker__current-month,
 .react-datepicker-time__header,
 .react-datepicker-year-header {
   margin-top: 0;
-  color: #000;
+  color: white;
   font-weight: bold;
-  font-size: 0.944rem;
+  font-size: 0.85rem;
 }
-
 .react-datepicker-time__header {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
 }
-
 .react-datepicker__navigation {
   background: none;
   line-height: 1.7rem;
@@ -220,41 +195,33 @@
   text-indent: -999em;
   overflow: hidden;
 }
-
 .react-datepicker__navigation--previous {
   left: 10px;
   border-right-color: #ccc;
 }
-
 .react-datepicker__navigation--previous:hover {
   border-right-color: #b3b3b3;
 }
-
 .react-datepicker__navigation--previous--disabled,
 .react-datepicker__navigation--previous--disabled:hover {
   border-right-color: #e6e6e6;
   cursor: default;
 }
-
 .react-datepicker__navigation--next {
   right: 10px;
   border-left-color: #ccc;
 }
-
 .react-datepicker__navigation--next--with-time:not(.react-datepicker__navigation--next--with-today-button) {
-  right: 80px;
+  right: 94px;
 }
-
 .react-datepicker__navigation--next:hover {
   border-left-color: #b3b3b3;
 }
-
 .react-datepicker__navigation--next--disabled,
 .react-datepicker__navigation--next--disabled:hover {
   border-left-color: #e6e6e6;
   cursor: default;
 }
-
 .react-datepicker__navigation--years {
   position: relative;
   top: 0;
@@ -262,41 +229,33 @@
   margin-left: auto;
   margin-right: auto;
 }
-
 .react-datepicker__navigation--years-previous {
   top: 4px;
   border-top-color: #ccc;
 }
-
 .react-datepicker__navigation--years-previous:hover {
   border-top-color: #b3b3b3;
 }
-
 .react-datepicker__navigation--years-upcoming {
   top: -4px;
   border-bottom-color: #ccc;
 }
-
 .react-datepicker__navigation--years-upcoming:hover {
   border-bottom-color: #b3b3b3;
 }
-
 .react-datepicker__month-container {
   float: left;
 }
-
 .react-datepicker__month {
   margin: 0.4rem;
   text-align: center;
 }
-
 .react-datepicker__month .react-datepicker__month-text,
 .react-datepicker__month .react-datepicker__quarter-text {
   display: inline-block;
   width: 4rem;
   margin: 2px;
 }
-
 .react-datepicker__input-time-container {
   clear: both;
   width: 100%;
@@ -304,30 +263,25 @@
   margin: 5px 0 10px 15px;
   text-align: left;
 }
-
 .react-datepicker__input-time-container .react-datepicker-time__caption {
   display: inline-block;
 }
-
 .react-datepicker__input-time-container
   .react-datepicker-time__input-container {
   display: inline-block;
 }
-
 .react-datepicker__input-time-container
   .react-datepicker-time__input-container
   .react-datepicker-time__input {
   display: inline-block;
   margin-left: 10px;
 }
-
 .react-datepicker__input-time-container
   .react-datepicker-time__input-container
   .react-datepicker-time__input
   input {
   width: 85px;
 }
-
 .react-datepicker__input-time-container
   .react-datepicker-time__input-container
   .react-datepicker-time__input
@@ -339,27 +293,23 @@
   -webkit-appearance: none;
   margin: 0;
 }
-
 .react-datepicker__input-time-container
   .react-datepicker-time__input-container
   .react-datepicker-time__input
   input[type="time"] {
   -moz-appearance: textfield;
 }
-
 .react-datepicker__input-time-container
   .react-datepicker-time__input-container
   .react-datepicker-time__delimiter {
   margin-left: 5px;
   display: inline-block;
 }
-
 .react-datepicker__time-container {
   float: right;
   border-left: 1px solid #aeaeae;
   width: 85px;
 }
-
 .react-datepicker__time-container--with-today-button {
   display: inline;
   border: 1px solid #aeaeae;
@@ -368,12 +318,10 @@
   right: -72px;
   top: 0;
 }
-
 .react-datepicker__time-container .react-datepicker__time {
   position: relative;
-  background: white;
+  background: #26292e;
 }
-
 .react-datepicker__time-container
   .react-datepicker__time
   .react-datepicker__time-box {
@@ -382,7 +330,6 @@
   margin: 0 auto;
   text-align: center;
 }
-
 .react-datepicker__time-container
   .react-datepicker__time
   .react-datepicker__time-box
@@ -396,44 +343,39 @@
   width: 100%;
   box-sizing: content-box;
 }
-
 .react-datepicker__time-container
   .react-datepicker__time
   .react-datepicker__time-box
   ul.react-datepicker__time-list
   li.react-datepicker__time-list-item {
   height: 30px;
-  padding: 5px 10px;
+  padding: 7px 10px;
   white-space: nowrap;
 }
-
 .react-datepicker__time-container
   .react-datepicker__time
   .react-datepicker__time-box
   ul.react-datepicker__time-list
   li.react-datepicker__time-list-item:hover {
   cursor: pointer;
-  background-color: #f0f0f0;
+  background-color: #26292e;
 }
-
 .react-datepicker__time-container
   .react-datepicker__time
   .react-datepicker__time-box
   ul.react-datepicker__time-list
   li.react-datepicker__time-list-item--selected {
-  background-color: #216ba5;
+  background-color: #949eff;
   color: white;
   font-weight: bold;
 }
-
 .react-datepicker__time-container
   .react-datepicker__time
   .react-datepicker__time-box
   ul.react-datepicker__time-list
   li.react-datepicker__time-list-item--selected:hover {
-  background-color: #216ba5;
+  background-color: #949eff;
 }
-
 .react-datepicker__time-container
   .react-datepicker__time
   .react-datepicker__time-box
@@ -441,7 +383,6 @@
   li.react-datepicker__time-list-item--disabled {
   color: #ccc;
 }
-
 .react-datepicker__time-container
   .react-datepicker__time
   .react-datepicker__time-box
@@ -450,7 +391,6 @@
   cursor: default;
   background-color: transparent;
 }
-
 .react-datepicker__week-number {
   color: #ccc;
   display: inline-block;
@@ -459,32 +399,27 @@
   text-align: center;
   margin: 0.166rem;
 }
-
 .react-datepicker__week-number.react-datepicker__week-number--clickable {
   cursor: pointer;
 }
-
 .react-datepicker__week-number.react-datepicker__week-number--clickable:hover {
   border-radius: 0.3rem;
-  background-color: #f0f0f0;
+  background-color: #26292e;
 }
-
 .react-datepicker__day-names,
 .react-datepicker__week {
   white-space: nowrap;
 }
-
 .react-datepicker__day-name,
 .react-datepicker__day,
 .react-datepicker__time-name {
-  color: #000;
+  color: white;
   display: inline-block;
   width: 1.7rem;
   line-height: 1.7rem;
   text-align: center;
   margin: 0.166rem;
 }
-
 .react-datepicker__month--selected,
 .react-datepicker__month--in-selecting-range,
 .react-datepicker__month--in-range,
@@ -492,50 +427,43 @@
 .react-datepicker__quarter--in-selecting-range,
 .react-datepicker__quarter--in-range {
   border-radius: 0.3rem;
-  background-color: #216ba5;
+  background-color: #949eff;
   color: #fff;
 }
-
 .react-datepicker__month--selected:hover,
 .react-datepicker__month--in-selecting-range:hover,
 .react-datepicker__month--in-range:hover,
 .react-datepicker__quarter--selected:hover,
 .react-datepicker__quarter--in-selecting-range:hover,
 .react-datepicker__quarter--in-range:hover {
-  background-color: #1d5d90;
+  background-color: #949eff;
 }
-
 .react-datepicker__month--disabled,
 .react-datepicker__quarter--disabled {
   color: #ccc;
   pointer-events: none;
 }
-
 .react-datepicker__month--disabled:hover,
 .react-datepicker__quarter--disabled:hover {
   cursor: default;
   background-color: transparent;
 }
-
 .react-datepicker__day,
 .react-datepicker__month-text,
 .react-datepicker__quarter-text {
   cursor: pointer;
 }
-
 .react-datepicker__day:hover,
 .react-datepicker__month-text:hover,
 .react-datepicker__quarter-text:hover {
   border-radius: 0.3rem;
-  background-color: #f0f0f0;
+  background-color: #26292e;
 }
-
 .react-datepicker__day--today,
 .react-datepicker__month-text--today,
 .react-datepicker__quarter-text--today {
   font-weight: bold;
 }
-
 .react-datepicker__day--highlighted,
 .react-datepicker__month-text--highlighted,
 .react-datepicker__quarter-text--highlighted {
@@ -543,25 +471,21 @@
   background-color: #3dcc4a;
   color: #fff;
 }
-
 .react-datepicker__day--highlighted:hover,
 .react-datepicker__month-text--highlighted:hover,
 .react-datepicker__quarter-text--highlighted:hover {
   background-color: #32be3f;
 }
-
 .react-datepicker__day--highlighted-custom-1,
 .react-datepicker__month-text--highlighted-custom-1,
 .react-datepicker__quarter-text--highlighted-custom-1 {
   color: magenta;
 }
-
 .react-datepicker__day--highlighted-custom-2,
 .react-datepicker__month-text--highlighted-custom-2,
 .react-datepicker__quarter-text--highlighted-custom-2 {
   color: green;
 }
-
 .react-datepicker__day--selected,
 .react-datepicker__day--in-selecting-range,
 .react-datepicker__day--in-range,
@@ -572,10 +496,9 @@
 .react-datepicker__quarter-text--in-selecting-range,
 .react-datepicker__quarter-text--in-range {
   border-radius: 0.3rem;
-  background-color: #216ba5;
+  background-color: #949eff;
   color: #fff;
 }
-
 .react-datepicker__day--selected:hover,
 .react-datepicker__day--in-selecting-range:hover,
 .react-datepicker__day--in-range:hover,
@@ -585,51 +508,44 @@
 .react-datepicker__quarter-text--selected:hover,
 .react-datepicker__quarter-text--in-selecting-range:hover,
 .react-datepicker__quarter-text--in-range:hover {
-  background-color: #1d5d90;
+  background-color: #949eff;
 }
-
 .react-datepicker__day--keyboard-selected,
 .react-datepicker__month-text--keyboard-selected,
 .react-datepicker__quarter-text--keyboard-selected {
   border-radius: 0.3rem;
-  background-color: #2a87d0;
+  background-color: #949eff;
   color: #fff;
 }
-
 .react-datepicker__day--keyboard-selected:hover,
 .react-datepicker__month-text--keyboard-selected:hover,
 .react-datepicker__quarter-text--keyboard-selected:hover {
-  background-color: #1d5d90;
+  background-color: #949eff;
 }
-
 .react-datepicker__day--in-selecting-range,
 .react-datepicker__month-text--in-selecting-range,
 .react-datepicker__quarter-text--in-selecting-range {
   background-color: rgba(33, 107, 165, 0.5);
 }
-
 .react-datepicker__month--selecting-range .react-datepicker__day--in-range,
 .react-datepicker__month--selecting-range
   .react-datepicker__month-text--in-range,
 .react-datepicker__month--selecting-range
   .react-datepicker__quarter-text--in-range {
-  background-color: #f0f0f0;
-  color: #000;
+  background-color: #26292e;
+  color: white;
 }
-
 .react-datepicker__day--disabled,
 .react-datepicker__month-text--disabled,
 .react-datepicker__quarter-text--disabled {
   cursor: default;
   color: #ccc;
 }
-
 .react-datepicker__day--disabled:hover,
 .react-datepicker__month-text--disabled:hover,
 .react-datepicker__quarter-text--disabled:hover {
   background-color: transparent;
 }
-
 .react-datepicker__month-text.react-datepicker__month--selected:hover,
 .react-datepicker__month-text.react-datepicker__month--in-range:hover,
 .react-datepicker__month-text.react-datepicker__quarter--selected:hover,
@@ -638,33 +554,28 @@
 .react-datepicker__quarter-text.react-datepicker__month--in-range:hover,
 .react-datepicker__quarter-text.react-datepicker__quarter--selected:hover,
 .react-datepicker__quarter-text.react-datepicker__quarter--in-range:hover {
-  background-color: #216ba5;
+  background-color: #949eff;
 }
-
 .react-datepicker__month-text:hover,
 .react-datepicker__quarter-text:hover {
-  background-color: #f0f0f0;
+  background-color: #949eff;
 }
-
 .react-datepicker__input-container {
   position: relative;
   display: inline-block;
   width: 100%;
 }
-
 .react-datepicker__year-read-view,
 .react-datepicker__month-read-view,
 .react-datepicker__month-year-read-view {
   border: 1px solid transparent;
   border-radius: 0.3rem;
 }
-
 .react-datepicker__year-read-view:hover,
 .react-datepicker__month-read-view:hover,
 .react-datepicker__month-year-read-view:hover {
   cursor: pointer;
 }
-
 .react-datepicker__year-read-view:hover
   .react-datepicker__year-read-view--down-arrow,
 .react-datepicker__year-read-view:hover
@@ -679,7 +590,6 @@
   .react-datepicker__month-read-view--down-arrow {
   border-top-color: #b3b3b3;
 }
-
 .react-datepicker__year-read-view--down-arrow,
 .react-datepicker__month-read-view--down-arrow,
 .react-datepicker__month-year-read-view--down-arrow {
@@ -690,11 +600,10 @@
   position: relative;
   border-width: 0.45rem;
 }
-
 .react-datepicker__year-dropdown,
 .react-datepicker__month-dropdown,
 .react-datepicker__month-year-dropdown {
-  background-color: #f0f0f0;
+  background-color: #26292e;
   position: absolute;
   width: 50%;
   left: 25%;
@@ -704,20 +613,17 @@
   border-radius: 0.3rem;
   border: 1px solid #aeaeae;
 }
-
 .react-datepicker__year-dropdown:hover,
 .react-datepicker__month-dropdown:hover,
 .react-datepicker__month-year-dropdown:hover {
   cursor: pointer;
 }
-
 .react-datepicker__year-dropdown--scrollable,
 .react-datepicker__month-dropdown--scrollable,
 .react-datepicker__month-year-dropdown--scrollable {
   height: 150px;
   overflow-y: scroll;
 }
-
 .react-datepicker__year-option,
 .react-datepicker__month-option,
 .react-datepicker__month-year-option {
@@ -727,14 +633,12 @@
   margin-left: auto;
   margin-right: auto;
 }
-
 .react-datepicker__year-option:first-of-type,
 .react-datepicker__month-option:first-of-type,
 .react-datepicker__month-year-option:first-of-type {
   border-top-left-radius: 0.3rem;
   border-top-right-radius: 0.3rem;
 }
-
 .react-datepicker__year-option:last-of-type,
 .react-datepicker__month-option:last-of-type,
 .react-datepicker__month-year-option:last-of-type {
@@ -745,13 +649,11 @@
   border-bottom-left-radius: 0.3rem;
   border-bottom-right-radius: 0.3rem;
 }
-
 .react-datepicker__year-option:hover,
 .react-datepicker__month-option:hover,
 .react-datepicker__month-year-option:hover {
   background-color: #ccc;
 }
-
 .react-datepicker__year-option:hover
   .react-datepicker__navigation--years-upcoming,
 .react-datepicker__month-option:hover
@@ -760,7 +662,6 @@
   .react-datepicker__navigation--years-upcoming {
   border-bottom-color: #b3b3b3;
 }
-
 .react-datepicker__year-option:hover
   .react-datepicker__navigation--years-previous,
 .react-datepicker__month-option:hover
@@ -769,14 +670,12 @@
   .react-datepicker__navigation--years-previous {
   border-top-color: #b3b3b3;
 }
-
 .react-datepicker__year-option--selected,
 .react-datepicker__month-option--selected,
 .react-datepicker__month-year-option--selected {
   position: absolute;
   left: 15px;
 }
-
 .react-datepicker__close-icon {
   cursor: pointer;
   background-color: transparent;
@@ -790,10 +689,9 @@
   display: table-cell;
   vertical-align: middle;
 }
-
 .react-datepicker__close-icon::after {
   cursor: pointer;
-  background-color: #216ba5;
+  background-color: #949eff;
   color: #fff;
   border-radius: 50%;
   height: 16px;
@@ -806,9 +704,8 @@
   vertical-align: middle;
   content: "\00d7";
 }
-
 .react-datepicker__today-button {
-  background: #f0f0f0;
+  background: #26292e;
   border-top: 1px solid #aeaeae;
   cursor: pointer;
   text-align: center;
@@ -816,7 +713,6 @@
   padding: 5px 0;
   clear: left;
 }
-
 .react-datepicker__portal {
   position: fixed;
   width: 100vw;
@@ -829,14 +725,12 @@
   display: flex;
   z-index: 2147483647;
 }
-
 .react-datepicker__portal .react-datepicker__day-name,
 .react-datepicker__portal .react-datepicker__day,
 .react-datepicker__portal .react-datepicker__time-name {
   width: 3rem;
   line-height: 3rem;
 }
-
 @media (max-width: 400px), (max-height: 550px) {
   .react-datepicker__portal .react-datepicker__day-name,
   .react-datepicker__portal .react-datepicker__day,
@@ -845,39 +739,31 @@
     line-height: 2rem;
   }
 }
-
 .react-datepicker__portal .react-datepicker__current-month,
 .react-datepicker__portal .react-datepicker-time__header {
   font-size: 1.44rem;
 }
-
 .react-datepicker__portal .react-datepicker__navigation {
   border: 0.81rem solid transparent;
 }
-
 .react-datepicker__portal .react-datepicker__navigation--previous {
   border-right-color: #ccc;
 }
-
 .react-datepicker__portal .react-datepicker__navigation--previous:hover {
   border-right-color: #b3b3b3;
 }
-
 .react-datepicker__portal .react-datepicker__navigation--previous--disabled,
 .react-datepicker__portal
   .react-datepicker__navigation--previous--disabled:hover {
   border-right-color: #e6e6e6;
   cursor: default;
 }
-
 .react-datepicker__portal .react-datepicker__navigation--next {
   border-left-color: #ccc;
 }
-
 .react-datepicker__portal .react-datepicker__navigation--next:hover {
   border-left-color: #b3b3b3;
 }
-
 .react-datepicker__portal .react-datepicker__navigation--next--disabled,
 .react-datepicker__portal .react-datepicker__navigation--next--disabled:hover {
   border-left-color: #e6e6e6;

+ 4 - 7
dashboard/src/main/home/cluster-dashboard/expanded-chart/logs-section/LogsSection.tsx

@@ -67,10 +67,7 @@ const QueryModeSelectionToggle = (props: QueryModeSelectionToggleProps) => {
           onClick={() => props.setSelectedDate(dayjs().toDate())}
           selected={!!props.selectedDate}
         >
-          <TimeIcon 
-            src={time} 
-            selected={!!props.selectedDate}
-          />
+          <TimeIcon src={time} selected={!!props.selectedDate} />
           {props.selectedDate && (
             <DateTimePicker
               startDate={props.selectedDate}
@@ -89,10 +86,10 @@ const Dot = styled.div<{ selected?: boolean }>`
   height: 8px;
   margin-right: 9px;
   border-radius: 20px;
-  background: ${props => props.selected ? "#ed5f85" : "#ffffff22"};
+  background: ${(props) => (props.selected ? "#ed5f85" : "#ffffff22")};
   border: 0px;
   outline: none;
-  box-shadow: ${props => props.selected ? "0px 0px 5px 1px #ed5f85" : ""};
+  box-shadow: ${(props) => (props.selected ? "0px 0px 5px 1px #ed5f85" : "")};
 `;
 
 const LogsSection: React.FC<Props> = ({
@@ -623,5 +620,5 @@ const TimeIcon = styled.img<{ selected?: boolean }>`
   width: 16px;
   height: 16px;
   z-index: 999;
-  opacity: ${props => props.selected ? "" : "50%"}
+  opacity: ${(props) => (props.selected ? "" : "50%")};
 `;

+ 11 - 4
dashboard/webpack.config.js

@@ -88,12 +88,19 @@ module.exports = () => {
           test: /\.(png|svg|jpg|gif|mp3)$/,
           use: ["file-loader"],
         },
+        // {
+        //   test: /\.css$/i,
+        //   loader: "css-loader",
+        //   options: {
+        //     import: true,
+        //   },
+        // },
         {
           test: /\.css$/i,
-          loader: "css-loader",
-          options: {
-            import: true,
-          },
+          use: [
+            { loader: "style-loader", options: { injectType: "linkTag" } },
+            { loader: "file-loader" },
+          ],
         },
         {
           test: /\.(woff(2)?|ttf|eot)(\?v=\d+\.\d+\.\d+)?$/,

Vissa filer visades inte eftersom för många filer har ändrats