Browse Source

Merge pull request #2887 from Budibase/ak-fixes

Fix date picker on mobile + text changes
gh-pages
Andrew Kingston 5 years ago
committed by GitHub
parent
commit
360c99e5c7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/bbui/package.json
  2. 1
      packages/bbui/src/Form/Core/DatePicker.svelte
  3. 8
      packages/bbui/yarn.lock
  4. 4
      packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
  5. 8
      packages/builder/src/components/upgrade/UpgradeModal.svelte

2
packages/bbui/package.json

@ -78,7 +78,7 @@
"@spectrum-css/underlay": "^2.0.9", "@spectrum-css/underlay": "^2.0.9",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",
"dayjs": "^1.10.4", "dayjs": "^1.10.4",
"svelte-flatpickr": "^3.1.0", "svelte-flatpickr": "^3.2.3",
"svelte-portal": "^1.0.0" "svelte-portal": "^1.0.0"
}, },
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"

1
packages/bbui/src/Form/Core/DatePicker.svelte

@ -26,6 +26,7 @@
altFormat: enableTime ? "F j Y, H:i" : "F j, Y", altFormat: enableTime ? "F j Y, H:i" : "F j, Y",
wrap: true, wrap: true,
appendTo, appendTo,
disableMobile: "true",
} }
const handleChange = event => { const handleChange = event => {

8
packages/bbui/yarn.lock

@ -2415,10 +2415,10 @@ supports-color@^7.0.0, supports-color@^7.1.0:
dependencies: dependencies:
has-flag "^4.0.0" has-flag "^4.0.0"
svelte-flatpickr@^3.1.0: svelte-flatpickr@^3.2.3:
version "3.1.0" version "3.2.3"
resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.1.0.tgz#ad83588430dbd55196a1a258b8ba27e7f9c1ee37" resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.3.tgz#db5dd7ad832ef83262b45e09737955ad3d591fc8"
integrity sha512-zKyV+ukeVuJ8CW0Ing3T19VSekc4bPkou/5Riutt1yATrLvSsanNqcgqi7Q5IePvIoOF9GJ5OtHvn1qK9Wx9BQ== integrity sha512-PNkqK4Napx8nTvCwkaUXdnKo8dISThaxEOK+szTUXcY6H0dQM0TSyuoMaVWY2yX7pM+PN5cpCQCcVe8YvTRFSw==
dependencies: dependencies:
flatpickr "^4.5.2" flatpickr "^4.5.2"

4
packages/builder/src/components/design/AppPreview/ThemeEditor.svelte

@ -84,7 +84,7 @@
</div> </div>
</div> </div>
<div class="setting"> <div class="setting">
<Label size="L">Primary color</Label> <Label size="L">Accent color</Label>
<ColorPicker <ColorPicker
spectrumTheme={$store.theme} spectrumTheme={$store.theme}
value={$store.customTheme?.primaryColor || defaultTheme.primaryColor} value={$store.customTheme?.primaryColor || defaultTheme.primaryColor}
@ -92,7 +92,7 @@
/> />
</div> </div>
<div class="setting"> <div class="setting">
<Label size="L">Primary color (hover)</Label> <Label size="L">Accent color (hover)</Label>
<ColorPicker <ColorPicker
spectrumTheme={$store.theme} spectrumTheme={$store.theme}
value={$store.customTheme?.primaryColorHover || value={$store.customTheme?.primaryColorHover ||

8
packages/builder/src/components/upgrade/UpgradeModal.svelte

@ -25,9 +25,9 @@
title="Self-host Budibase" title="Self-host Budibase"
confirmText="Self-host Budibase" confirmText="Self-host Budibase"
> >
<span <span>
>Self-host budibase for free to get unlimited apps and more - and it only Self-host budibase for free to get unlimited apps and more - and it only
takes a few minutes!</span takes a few minutes!
> </span>
</ModalContent> </ModalContent>
</Modal> </Modal>

Loading…
Cancel
Save