diff --git a/app/javascript/dashboard/assets/scss/_next-colors.scss b/app/javascript/dashboard/assets/scss/_next-colors.scss index 48cfce921..f23c01d42 100644 --- a/app/javascript/dashboard/assets/scss/_next-colors.scss +++ b/app/javascript/dashboard/assets/scss/_next-colors.scss @@ -29,6 +29,19 @@ --iris-11: 87 83 198; --iris-12: 39 41 98; + --blue-1: 251 253 255; + --blue-2: 245 249 255; + --blue-3: 233 243 255; + --blue-4: 218 236 255; + --blue-5: 201 226 255; + --blue-6: 181 213 255; + --blue-7: 155 195 252; + --blue-8: 117 171 247; + --blue-9: 39 129 246; + --blue-10: 16 115 233; + --blue-11: 8 109 224; + --blue-12: 11 50 101; + --ruby-1: 255 252 253; --ruby-2: 255 247 248; --ruby-3: 254 234 237; @@ -131,6 +144,19 @@ --iris-11: 158 177 255; --iris-12: 224 223 254; + --blue-1: 10 17 28; + --blue-2: 15 24 38; + --blue-3: 15 39 72; + --blue-4: 10 49 99; + --blue-5: 18 61 117; + --blue-6: 29 84 134; + --blue-7: 40 89 156; + --blue-8: 48 106 186; + --blue-9: 39 129 246; + --blue-10: 21 116 231; + --blue-11: 126 182 255; + --blue-12: 205 227 255; + --ruby-1: 25 17 19; --ruby-2: 30 21 23; --ruby-3: 58 20 30; diff --git a/app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue b/app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue index ce9330076..bbb31d72c 100644 --- a/app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue +++ b/app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue @@ -218,14 +218,14 @@ const emitDateRange = () => { />
@@ -251,12 +251,12 @@ const emitDateRange = () => { @validate="updateManualInput($event, calendar)" @error="handleManualInputError($event)" /> -
+
import { CALENDAR_PERIODS } from '../helpers/DatePickerHelper'; +import NextButton from 'dashboard/components-next/button/Button.vue'; + defineProps({ calendarType: { type: String, @@ -38,42 +40,38 @@ const onClickSetView = (type, mode) => { diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateInput.vue b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateInput.vue index b9fe88993..715bc8cb3 100644 --- a/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateInput.vue +++ b/app/javascript/dashboard/components/ui/DatePicker/components/CalendarDateInput.vue @@ -65,7 +65,7 @@ const validateDate = () => { {