diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php index c6463d79..2c6dd61e 100644 --- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php +++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php @@ -15,7 +15,6 @@ use App\Models\Task; use Illuminate\Contracts\Validation\Rule as RuleContract; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent; diff --git a/public/fonts/Inter-Variable.ttf b/public/fonts/Inter-Variable.ttf new file mode 100644 index 00000000..b0f2d424 --- /dev/null +++ b/public/fonts/Inter-Variable.ttf @@ -0,0 +1,2052 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Page not found · GitHub · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ Skip to content + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + +
+ + + + + +
+ + + + + + + + + +
+
+ + + +
+
+ +
+
+ 404 “This is not the web page you are looking for” + + + + + + + + + + + + +
+
+ +
+
+ +
+ + +
+
+
+ Contact Support — + GitHub Status — + @githubstatus +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + diff --git a/public/fonts/Inter-Variable.woff2 b/public/fonts/Inter-Variable.woff2 new file mode 100644 index 00000000..dc8ac65f --- /dev/null +++ b/public/fonts/Inter-Variable.woff2 @@ -0,0 +1,2052 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Page not found · GitHub · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ Skip to content + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + +
+ + + + + +
+ + + + + + + + + +
+
+ + + +
+
+ +
+
+ 404 “This is not the web page you are looking for” + + + + + + + + + + + + +
+
+ +
+
+ +
+ + +
+
+
+ Contact Support — + GitHub Status — + @githubstatus +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + diff --git a/public/fonts/Outfit-Bold.ttf b/public/fonts/Outfit-Bold.ttf deleted file mode 100644 index 0a081bc9..00000000 Binary files a/public/fonts/Outfit-Bold.ttf and /dev/null differ diff --git a/public/fonts/Outfit-ExtraBold.ttf b/public/fonts/Outfit-ExtraBold.ttf deleted file mode 100644 index 0977ed52..00000000 Binary files a/public/fonts/Outfit-ExtraBold.ttf and /dev/null differ diff --git a/public/fonts/Outfit-Medium.ttf b/public/fonts/Outfit-Medium.ttf deleted file mode 100644 index 7ae796b9..00000000 Binary files a/public/fonts/Outfit-Medium.ttf and /dev/null differ diff --git a/public/fonts/Outfit-Regular.ttf b/public/fonts/Outfit-Regular.ttf deleted file mode 100644 index 826899cf..00000000 Binary files a/public/fonts/Outfit-Regular.ttf and /dev/null differ diff --git a/public/fonts/Outfit-SemiBold.ttf b/public/fonts/Outfit-SemiBold.ttf deleted file mode 100644 index 6b37eeb6..00000000 Binary files a/public/fonts/Outfit-SemiBold.ttf and /dev/null differ diff --git a/resources/css/app.css b/resources/css/app.css index ee9798f6..b5cf17cd 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -160,30 +160,17 @@ body { } +/* Inter Variable Font with browser compatibility considerations */ @font-face { - font-family: 'Outfit'; - src: url('/fonts/Outfit-Regular.ttf'); - font-weight: 400; -} -@font-face { - font-family: 'Outfit'; - src: url('/fonts/Outfit-Medium.ttf'); - font-weight: 500; -} -@font-face { - font-family: 'Outfit'; - src: url('/fonts/Outfit-SemiBold.ttf'); - font-weight: 600; -} -@font-face { - font-family: 'Outfit'; - src: url('/fonts/Outfit-Bold.ttf'); - font-weight: 700; -} -@font-face { - font-family: 'Outfit'; - src: url('/fonts/Outfit-ExtraBold.ttf'); - font-weight: 800; + font-family: 'Inter'; + src: url('/fonts/Inter-Variable.woff2') format('woff2 supports variations'), + url('/fonts/Inter-Variable.woff2') format('woff2-variations'), + url('/fonts/Inter-Variable.ttf') format('truetype supports variations'), + url('/fonts/Inter-Variable.ttf') format('truetype-variations'); + font-weight: 100 900; + font-style: normal; + font-display: swap; + font-feature-settings: 'cv02', 'cv03', 'cv04', 'cv11'; } @layer base { diff --git a/resources/js/Components/Common/Reporting/ReportingChart.vue b/resources/js/Components/Common/Reporting/ReportingChart.vue index db2b6563..e40d86b0 100644 --- a/resources/js/Components/Common/Reporting/ReportingChart.vue +++ b/resources/js/Components/Common/Reporting/ReportingChart.vue @@ -127,7 +127,7 @@ const option = computed(() => ({ fontWeight: 600, color: labelColor.value, margin: 16, - fontFamily: 'Outfit, sans-serif', + fontFamily: 'Inter, sans-serif', }, axisTick: { lineStyle: { @@ -139,7 +139,7 @@ const option = computed(() => ({ type: 'value', axisLabel: { color: labelColor.value, - fontFamily: 'Outfit, sans-serif', + fontFamily: 'Inter, sans-serif', }, splitLine: { lineStyle: { diff --git a/resources/js/Components/Common/Reporting/ReportingFilterBadge.vue b/resources/js/Components/Common/Reporting/ReportingFilterBadge.vue index 79c02edd..f215232c 100644 --- a/resources/js/Components/Common/Reporting/ReportingFilterBadge.vue +++ b/resources/js/Components/Common/Reporting/ReportingFilterBadge.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/Components/Common/Reporting/ReportingOverview.vue b/resources/js/Components/Common/Reporting/ReportingOverview.vue index e8f67357..dcc7bde8 100644 --- a/resources/js/Components/Common/Reporting/ReportingOverview.vue +++ b/resources/js/Components/Common/Reporting/ReportingOverview.vue @@ -319,7 +319,7 @@ const tableData = computed(() => {
+ class="flex flex-wrap items-center space-y-2 sm:space-y-0 space-x-3">
Filters
props.minutes, (newMinutes) => { watch(currentInterval, () => { initializeSelectedInterval(); }); + +// Active styling similar to ReportingFilterBadge +const activeClass = computed(() => { + if (props.enabled) { + return 'border-accent-300/50 bg-accent-50 hover:bg-accent-100 dark:border-accent-300/50 dark:bg-accent-300/5 dark:hover:bg-accent-300/10'; + } + return ''; +}); + +const iconClass = computed(() => { + return twMerge( + 'w-4 h-4', + props.enabled ? 'dark:text-accent-300/80 text-accent-400/80' : 'text-muted-foreground opacity-50' + ); +});