Merge branch 'main' into use-number-field

oxidecomputer · Nov 30, 2023 · e5989f8 · e5989f8
2 parents 9bee50b + 65ae121
commit e5989f8
Show file tree

Hide file tree

Showing 9 changed files with 1,297 additions and 979 deletions.
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -1,4 +1,6 @@
 header:
+  # default is 80, need to make it slightly longer for a long shebang
+  license-location-threshold: 100
   license:
     spdx-id: MPL-2.0
     content: |

diff --git a/.prettierrc.js b/.prettierrc.js
@@ -6,7 +6,7 @@
  * Copyright Oxide Computer Company
  */
 
-module.exports = {
+export default {
   // note: it seems like tailwind has to be last for it to work
   plugins: ['@ianvs/prettier-plugin-sort-imports', 'prettier-plugin-tailwindcss'],
   printWidth: 92,

diff --git a/libs/ui/lib/date-picker/DateRangePicker.tsx b/libs/ui/lib/date-picker/DateRangePicker.tsx
@@ -68,7 +68,7 @@ export function DateRangePicker(props: DateRangePickerProps) {
               : 'border-default ring-accent-secondary'
           )}
         >
-          <div className={cn('relative flex w-[16rem] items-center px-3 text-sans-md')}>
+          <div className={cn('relative flex w-[17rem] items-center px-3 text-sans-md')}>
             {label}
             {state.isInvalid && (
               <div className="absolute bottom-0 right-2 top-0 flex items-center text-error">