diff --git a/dev/prod/webpack.config.js b/dev/prod/webpack.config.js index be27eae953..1360a68f39 100644 --- a/dev/prod/webpack.config.js +++ b/dev/prod/webpack.config.js @@ -155,7 +155,7 @@ module.exports = { } }, { - test: /\.(jpg|png)$/, + test: /\.(jpg|png|webp)$/, use: { loader: 'file-loader', options: { diff --git a/packages/theme/styles/button.scss b/packages/theme/styles/button.scss index 8b4746242d..b0974d855c 100644 --- a/packages/theme/styles/button.scss +++ b/packages/theme/styles/button.scss @@ -94,6 +94,9 @@ &.sh-round { border-radius: 0.5rem; } + &.sh-round2 { + border-radius: 0.75rem; + } &.sh-circle { border-radius: 1rem; &.link { diff --git a/packages/ui/src/components/StylishEdit.svelte b/packages/ui/src/components/StylishEdit.svelte index 566c1636bf..fd2206d219 100644 --- a/packages/ui/src/components/StylishEdit.svelte +++ b/packages/ui/src/components/StylishEdit.svelte @@ -99,7 +99,7 @@ left: 1.25rem; font-size: 0.75rem; color: var(--theme-caption-color); - opacity: 0.3; + opacity: 0.8; transition: top 200ms; pointer-events: none; user-select: none; diff --git a/packages/ui/src/types.ts b/packages/ui/src/types.ts index 2c1090aefd..9f52e30ce1 100644 --- a/packages/ui/src/types.ts +++ b/packages/ui/src/types.ts @@ -126,7 +126,15 @@ export type ButtonKind = | 'list' | 'list-header' export type ButtonSize = 'inline' | 'x-small' | 'small' | 'medium' | 'large' | 'x-large' -export type ButtonShape = 'rectangle' | 'rectangle-left' | 'rectangle-right' | 'circle' | 'round' | 'filter' | undefined +export type ButtonShape = + | 'rectangle' + | 'rectangle-left' + | 'rectangle-right' + | 'circle' + | 'round' + | 'round2' + | 'filter' + | undefined export type EditStyle = 'editbox' | 'large-style' | 'small-style' | 'search-style' | 'underline' export interface PopupPositionElement { getBoundingClientRect: () => DOMRect diff --git a/plugins/login-resources/img/back.svg b/plugins/login-resources/img/back.svg new file mode 100644 index 0000000000..635bc9b639 --- /dev/null +++ b/plugins/login-resources/img/back.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/plugins/login-resources/img/back_signin.png b/plugins/login-resources/img/back_signin.png new file mode 100644 index 0000000000..e5b1cfb962 Binary files /dev/null and b/plugins/login-resources/img/back_signin.png differ diff --git a/plugins/login-resources/package.json b/plugins/login-resources/package.json index 0ee5b83269..b6c5015709 100644 --- a/plugins/login-resources/package.json +++ b/plugins/login-resources/package.json @@ -38,6 +38,7 @@ "@hcengineering/workbench": "^0.6.6", "@hcengineering/core": "^0.6.25", "@hcengineering/presentation": "^0.6.2", - "@hcengineering/setting": "^0.6.7" + "@hcengineering/setting": "^0.6.7", + "@hcengineering/theme": "^0.6.3" } } diff --git a/plugins/login-resources/src/components/Form.svelte b/plugins/login-resources/src/components/Form.svelte index 85204b706e..b95ad93a84 100644 --- a/plugins/login-resources/src/components/Form.svelte +++ b/plugins/login-resources/src/components/Form.svelte @@ -136,6 +136,7 @@