From c16f1d4e35f2d885d2aa4e5f1ee51af9e95c6bdc Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 Feb 2024 02:27:53 +0200 Subject: more fixes --- src/components/attachment/attachment.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/components/attachment') diff --git a/src/components/attachment/attachment.scss b/src/components/attachment/attachment.scss index 681bab29..b1a3fa5e 100644 --- a/src/components/attachment/attachment.scss +++ b/src/components/attachment/attachment.scss @@ -9,10 +9,8 @@ height: 100%; border-style: solid; border-width: 1px; - border-radius: $fallback--attachmentRadius; - border-radius: var(--attachmentRadius, $fallback--attachmentRadius); - border-color: $fallback--border; - border-color: var(--border, $fallback--border); + border-radius: var(--roundness); + border-color: var(--border); .attachment-wrapper { flex: 1 1 auto; -- cgit v1.2.3-70-g09d2 From 3e198526e66b88301882b14240f0d50b8819b520 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 18 Feb 2024 18:40:14 +0200 Subject: dynamically load .style.js files; move the files closer to related components --- src/components/attachment/attachment.style.js | 15 ++++++ src/components/avatar.style.js | 22 -------- src/components/button.style.js | 2 +- src/components/button_unstyled.style.js | 2 +- src/components/chat/chat.scss | 12 +---- src/components/input.style.js | 2 +- src/components/modal/modals.style.js | 9 ++++ src/components/modals.style.js | 9 ---- src/components/notification.style.js | 22 -------- src/components/notification/notification.style.js | 23 ++++++++ src/components/poll/poll_graph.style.js | 14 +++++ src/components/post.style.js | 22 -------- src/components/rich_content.style.js | 17 ------ src/components/rich_content/rich_content.style.js | 17 ++++++ src/components/status/post.style.js | 24 +++++++++ src/components/user_avatar/avatar.style.js | 22 ++++++++ src/services/theme_data/theme_data_3.service.js | 65 +++++++---------------- 17 files changed, 147 insertions(+), 152 deletions(-) create mode 100644 src/components/attachment/attachment.style.js delete mode 100644 src/components/avatar.style.js create mode 100644 src/components/modal/modals.style.js delete mode 100644 src/components/modals.style.js delete mode 100644 src/components/notification.style.js create mode 100644 src/components/notification/notification.style.js create mode 100644 src/components/poll/poll_graph.style.js delete mode 100644 src/components/post.style.js delete mode 100644 src/components/rich_content.style.js create mode 100644 src/components/rich_content/rich_content.style.js create mode 100644 src/components/status/post.style.js create mode 100644 src/components/user_avatar/avatar.style.js (limited to 'src/components/attachment') diff --git a/src/components/attachment/attachment.style.js b/src/components/attachment/attachment.style.js new file mode 100644 index 00000000..b76b3eb0 --- /dev/null +++ b/src/components/attachment/attachment.style.js @@ -0,0 +1,15 @@ +export default { + name: 'Attachment', + selector: '.Attachment', + validInnerComponents: [ + 'Border', + 'ButtonUnstyled' + ], + defaultRules: [ + { + directives: { + roundness: 3 + } + } + ] +} diff --git a/src/components/avatar.style.js b/src/components/avatar.style.js deleted file mode 100644 index 812d45a4..00000000 --- a/src/components/avatar.style.js +++ /dev/null @@ -1,22 +0,0 @@ -export default { - name: 'Avatar', - selector: '.Avatar', - variants: { - compact: '.-compact' - }, - defaultRules: [ - { - directives: { - roundness: 3, - shadow: [{ - x: 0, - y: 1, - blur: 8, - spread: 0, - color: '#000000', - alpha: 0.7 - }] - } - } - ] -} diff --git a/src/components/button.style.js b/src/components/button.style.js index 9f238b4e..6560c8fb 100644 --- a/src/components/button.style.js +++ b/src/components/button.style.js @@ -40,7 +40,7 @@ export default { // normal: '' // normal state is implicitly added, it is always included toggled: '.toggled', pressed: ':active', - hover: ':hover', + hover: ':hover:not(:disabled)', focused: ':focus-within', disabled: ':disabled' }, diff --git a/src/components/button_unstyled.style.js b/src/components/button_unstyled.style.js index e80322eb..89e8499c 100644 --- a/src/components/button_unstyled.style.js +++ b/src/components/button_unstyled.style.js @@ -5,7 +5,7 @@ export default { disabled: ':disabled', toggled: '.toggled', pressed: ':active', - hover: ':hover', + hover: ':hover:not(:disabled)', focused: ':focus-within' }, validInnerComponents: [ diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss index 4f8f8492..31061409 100644 --- a/src/components/chat/chat.scss +++ b/src/components/chat/chat.scss @@ -11,7 +11,6 @@ .chat-view-body { box-sizing: border-box; - background-color: var(--chatBg, $fallback--bg); display: flex; flex-direction: column; width: 100%; @@ -38,8 +37,7 @@ .footer { position: sticky; bottom: 0; - background-color: $fallback--bg; - background-color: var(--bg, $fallback--bg); + background-color: var(--background); z-index: 1; } @@ -62,8 +60,6 @@ position: absolute; right: 1.3em; top: -3.2em; - background-color: $fallback--fg; - background-color: var(--btn, $fallback--fg); display: flex; justify-content: center; align-items: center; @@ -80,12 +76,6 @@ visibility: visible; } - i { - font-size: 1em; - color: $fallback--text; - color: var(--text, $fallback--text); - } - .unread-message-count { font-size: 0.8em; left: 50%; diff --git a/src/components/input.style.js b/src/components/input.style.js index 9cddfd8e..7db50b66 100644 --- a/src/components/input.style.js +++ b/src/components/input.style.js @@ -24,7 +24,7 @@ export default { selector: '.input', states: { disabled: ':disabled', - hover: ':hover', + hover: ':hover:not(:disabled)', focused: ':focus-within' }, validInnerComponents: [ diff --git a/src/components/modal/modals.style.js b/src/components/modal/modals.style.js new file mode 100644 index 00000000..c401a0cd --- /dev/null +++ b/src/components/modal/modals.style.js @@ -0,0 +1,9 @@ +export default { + name: 'Modals', + selector: '.modal-view', + lazy: true, + validInnerComponents: [ + 'Panel' + ], + defaultRules: [] +} diff --git a/src/components/modals.style.js b/src/components/modals.style.js deleted file mode 100644 index c401a0cd..00000000 --- a/src/components/modals.style.js +++ /dev/null @@ -1,9 +0,0 @@ -export default { - name: 'Modals', - selector: '.modal-view', - lazy: true, - validInnerComponents: [ - 'Panel' - ], - defaultRules: [] -} diff --git a/src/components/notification.style.js b/src/components/notification.style.js deleted file mode 100644 index 0802da77..00000000 --- a/src/components/notification.style.js +++ /dev/null @@ -1,22 +0,0 @@ -export default { - name: 'Notification', - selector: '.Notification', - validInnerComponents: [ - 'Text', - 'Link', - 'Icon', - 'Border', - 'Button', - 'ButtonUnstyled', - 'RichContent', - 'Input', - 'Avatar' - ], - defaultRules: [ - { - directives: { - background: '--bg' - } - } - ] -} diff --git a/src/components/notification/notification.style.js b/src/components/notification/notification.style.js new file mode 100644 index 00000000..ad7aab65 --- /dev/null +++ b/src/components/notification/notification.style.js @@ -0,0 +1,23 @@ +export default { + name: 'Notification', + selector: '.Notification', + validInnerComponents: [ + 'Text', + 'Link', + 'Icon', + 'Border', + 'Button', + 'ButtonUnstyled', + 'RichContent', + 'Input', + 'Avatar', + 'Attachment' + ], + defaultRules: [ + { + directives: { + background: '--bg' + } + } + ] +} diff --git a/src/components/poll/poll_graph.style.js b/src/components/poll/poll_graph.style.js new file mode 100644 index 00000000..01b4d35c --- /dev/null +++ b/src/components/poll/poll_graph.style.js @@ -0,0 +1,14 @@ +export default { + name: 'PollGraph', + selector: '.poll-graph', + validInnerComponents: [ + 'Text' + ], + defaultRules: [ + { + directives: { + background: '--accent' + } + } + ] +} diff --git a/src/components/post.style.js b/src/components/post.style.js deleted file mode 100644 index f4bd12a6..00000000 --- a/src/components/post.style.js +++ /dev/null @@ -1,22 +0,0 @@ -export default { - name: 'Post', - selector: '.Status', - validInnerComponents: [ - 'Text', - 'Link', - 'Icon', - 'Border', - 'Button', - 'ButtonUnstyled', - 'RichContent', - 'Input', - 'Avatar' - ], - defaultRules: [ - { - directives: { - background: '--bg' - } - } - ] -} diff --git a/src/components/rich_content.style.js b/src/components/rich_content.style.js deleted file mode 100644 index aaf126a5..00000000 --- a/src/components/rich_content.style.js +++ /dev/null @@ -1,17 +0,0 @@ -export default { - name: 'RichContent', - selector: '.RichContent', - validInnerComponents: [ - 'Text', - 'FunText', - 'Link' - ], - defaultRules: [ - { - directives: { - background: '--bg', - textNoCssColor: 'yes' - } - } - ] -} diff --git a/src/components/rich_content/rich_content.style.js b/src/components/rich_content/rich_content.style.js new file mode 100644 index 00000000..aaf126a5 --- /dev/null +++ b/src/components/rich_content/rich_content.style.js @@ -0,0 +1,17 @@ +export default { + name: 'RichContent', + selector: '.RichContent', + validInnerComponents: [ + 'Text', + 'FunText', + 'Link' + ], + defaultRules: [ + { + directives: { + background: '--bg', + textNoCssColor: 'yes' + } + } + ] +} diff --git a/src/components/status/post.style.js b/src/components/status/post.style.js new file mode 100644 index 00000000..dda79220 --- /dev/null +++ b/src/components/status/post.style.js @@ -0,0 +1,24 @@ +export default { + name: 'Post', + selector: '.Status', + validInnerComponents: [ + 'Text', + 'Link', + 'Icon', + 'Border', + 'Button', + 'ButtonUnstyled', + 'RichContent', + 'Input', + 'Avatar', + 'Attachment', + 'PollGraph' + ], + defaultRules: [ + { + directives: { + background: '--bg' + } + } + ] +} diff --git a/src/components/user_avatar/avatar.style.js b/src/components/user_avatar/avatar.style.js new file mode 100644 index 00000000..812d45a4 --- /dev/null +++ b/src/components/user_avatar/avatar.style.js @@ -0,0 +1,22 @@ +export default { + name: 'Avatar', + selector: '.Avatar', + variants: { + compact: '.-compact' + }, + defaultRules: [ + { + directives: { + roundness: 3, + shadow: [{ + x: 0, + y: 1, + blur: 8, + spread: 0, + color: '#000000', + alpha: 0.7 + }] + } + } + ] +} diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index 41c77506..f84a61c9 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -7,56 +7,25 @@ import { relativeLuminance } from '../color_convert/color_convert.js' -import Root from 'src/components/root.style.js' -import TopBar from 'src/components/top_bar.style.js' -import Underlay from 'src/components/underlay.style.js' -import Popover from 'src/components/popover.style.js' -import Modals from 'src/components/modals.style.js' -import MenuItem from 'src/components/menu_item.style.js' -import Panel from 'src/components/panel.style.js' -import PanelHeader from 'src/components/panel_header.style.js' -import Button from 'src/components/button.style.js' -import ButtonUnstyled from 'src/components/button_unstyled.style.js' -import Input from 'src/components/input.style.js' -import Text from 'src/components/text.style.js' -import FunText from 'src/components/fun_text.style.js' -import Link from 'src/components/link.style.js' -import Icon from 'src/components/icon.style.js' -import Border from 'src/components/border.style.js' -import Post from 'src/components/post.style.js' -import Notification from 'src/components/notification.style.js' -import RichContent from 'src/components/rich_content.style.js' -import Avatar from 'src/components/avatar.style.js' -import Badge from 'src/components/badge.style.js' -import Alert from 'src/components/alert.style.js' - const DEBUG = false +// Ensuring the order of components const components = { - Root, - Text, - FunText, - Link, - Icon, - Border, - Underlay, - Modals, - Popover, - MenuItem, - Panel, - PanelHeader, - TopBar, - Button, - ButtonUnstyled, - Input, - Post, - Notification, - RichContent, - Avatar, - Alert, - Badge + Root: null, + Text: null, + FunText: null, + Link: null, + Icon: null, + Border: null } +// Loading all style.js[on] files dynamically +const componentsContext = require.context('src', true, /\.style.js(on)?$/) +componentsContext.keys().forEach(key => { + const component = componentsContext(key).default + components[component.name] = component +}) + // "Unrolls" a tree structure of item: { parent: { ...item2, parent: { ...item3, parent: {...} } }} // into an array [item2, item3] for iterating const unroll = (item) => { @@ -370,7 +339,11 @@ export const init = (extraRuleset, palette) => { // Normalizing states and variants to always include "normal" const states = { normal: '', ...originalStates } const variants = { normal: '', ...originalVariants } - const innerComponents = (validInnerComponents).map(name => components[name]) + const innerComponents = (validInnerComponents).map(name => { + const result = components[name] + if (result === undefined) console.error(`Component ${component.name} references a component ${name} which does not exist!`) + return result + }) // Optimization: we only really need combinations without "normal" because all states implicitly have it const permutationStateKeys = Object.keys(states).filter(s => s !== 'normal') -- cgit v1.2.3-70-g09d2 From 6811191147c6e7eacdff580cdf291538e7df6e5e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 19 Feb 2024 00:10:10 +0200 Subject: i'm stupid --- src/components/attachment.style.js | 23 ----------------------- src/components/attachment/attachment.style.js | 8 ++++++++ src/services/theme_data/theme_data_3.service.js | 6 +++--- 3 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 src/components/attachment.style.js (limited to 'src/components/attachment') diff --git a/src/components/attachment.style.js b/src/components/attachment.style.js deleted file mode 100644 index b6c5da6e..00000000 --- a/src/components/attachment.style.js +++ /dev/null @@ -1,23 +0,0 @@ -export default { - name: 'Attachment', - selector: '.Attachment', - validInnerComponents: [ - 'Border', - 'ButtonUnstyled' - ], - defaultRules: [ - { - directives: { - roundness: 3 - } - }, - { - component: 'ButtonUnstyled', - parent: { component: 'Attachment' }, - directives: { - background: '#FFFFFF', - opacity: 0.9 - } - } - ] -} diff --git a/src/components/attachment/attachment.style.js b/src/components/attachment/attachment.style.js index b76b3eb0..74e355c4 100644 --- a/src/components/attachment/attachment.style.js +++ b/src/components/attachment/attachment.style.js @@ -10,6 +10,14 @@ export default { directives: { roundness: 3 } + }, + { + component: 'ButtonUnstyled', + parent: { component: 'Attachment' }, + directives: { + background: '#FFFFFF', + opacity: 0.5 + } } ] } diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index 84ff20b2..5d3f4e8b 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -169,6 +169,7 @@ export const init = (extraRuleset, palette) => { return rule }) + console.log(rulesetUnsorted) const ruleset = rulesetUnsorted .map((data, index) => ({ data, index })) @@ -187,6 +188,8 @@ export const init = (extraRuleset, palette) => { }) .map(({ data }) => data) + console.log(ruleset.filter(c => c.component === 'ButtonUnstyled')) + const virtualComponents = new Set(Object.values(components).filter(c => c.virtual).map(c => c.name)) const findColor = (color, dynamicVars) => { @@ -196,8 +199,6 @@ export const init = (extraRuleset, palette) => { const [variable, modifier] = color.split(/,/g).map(str => str.trim()) const variableSlot = variable.substring(2) if (variableSlot === 'stack') { - console.log(dynamicVars) - console.log(stacked) const { r, g, b } = dynamicVars.stacked targetColor = { r, g, b } } else if (variableSlot.startsWith('parent')) { @@ -660,7 +661,6 @@ export const init = (extraRuleset, palette) => { } default: if (k.startsWith('--')) { - console.log('LOL', k, rgba2css(findColor(v, computed[selector].dynamicVars))) return k + ': ' + rgba2css(findColor(v, computed[selector].dynamicVars)) } return '' -- cgit v1.2.3-70-g09d2 From d2f4ce442a7130f29aea72cfc558727e597dd1b4 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 21 Feb 2024 14:05:26 +0200 Subject: fix attachment inputs --- src/components/attachment/attachment.style.js | 3 ++- src/components/attachment/attachment.vue | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/components/attachment') diff --git a/src/components/attachment/attachment.style.js b/src/components/attachment/attachment.style.js index 74e355c4..5fb4701c 100644 --- a/src/components/attachment/attachment.style.js +++ b/src/components/attachment/attachment.style.js @@ -3,7 +3,8 @@ export default { selector: '.Attachment', validInnerComponents: [ 'Border', - 'ButtonUnstyled' + 'ButtonUnstyled', + 'Input' ], defaultRules: [ { diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 79f62806..39b1a409 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -38,7 +38,7 @@ v-if="edit" v-model="localDescription" type="text" - class="description-field" + class="input description-field" :placeholder="$t('post_status.media_description')" @keydown.enter.prevent="" > @@ -253,7 +253,7 @@ v-if="edit" v-model="localDescription" type="text" - class="description-field" + class="input description-field" :placeholder="$t('post_status.media_description')" @keydown.enter.prevent="" > -- cgit v1.2.3-70-g09d2 From d134b691cc92d22f27efc432d77e1971cc840d42 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 27 Feb 2024 17:04:56 +0200 Subject: remove button-unstyled from video attachments --- src/components/attachment/attachment.vue | 1 - 1 file changed, 1 deletion(-) (limited to 'src/components/attachment') diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 39b1a409..9abc2627 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -175,7 +175,6 @@ :is="videoTag" v-if="type === 'video' && !hidden" class="video-container" - :class="{ 'button-unstyled': 'isModal' }" :href="attachment.url" @click.stop.prevent="openModal" > -- cgit v1.2.3-70-g09d2 From 23a8bee053c7c5cfa0daee1fe8bd46d22221bb56 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 29 Feb 2024 19:30:54 +0200 Subject: fix more attachments issues --- src/components/attachment/attachment.scss | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/components/attachment') diff --git a/src/components/attachment/attachment.scss b/src/components/attachment/attachment.scss index b1a3fa5e..47660bf6 100644 --- a/src/components/attachment/attachment.scss +++ b/src/components/attachment/attachment.scss @@ -82,6 +82,13 @@ } } + .video-container { + border: none; + outline: none; + color: inherit; + background: transparent; + } + .audio-container { display: flex; align-items: flex-end; -- cgit v1.2.3-70-g09d2 From 075f2cb903fa45ea8e7a52098fd7091b0b14a9fd Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 4 Mar 2024 19:45:42 +0200 Subject: remove all "fallback variables" --- src/App.scss | 1 - src/_variables.scss | 36 ----------------- src/components/account_actions/account_actions.vue | 2 - src/components/announcement/announcement.vue | 8 ++-- .../announcements_page/announcements_page.vue | 6 +-- src/components/attachment/attachment.scss | 18 +-------- src/components/autosuggest/autosuggest.vue | 6 +-- src/components/avatar_list/avatar_list.vue | 5 +-- src/components/chat/chat.vue | 1 - src/components/chat_list/chat_list.vue | 5 +-- src/components/chat_list_item/chat_list_item.vue | 1 - src/components/chat_new/chat_new.vue | 1 - src/components/chat_title/chat_title.vue | 5 +-- src/components/checkbox/checkbox.vue | 1 - src/components/color_input/color_input.scss | 4 -- src/components/conversation/conversation.vue | 34 ++++++++-------- src/components/desktop_nav/desktop_nav.scss | 2 - src/components/dialog_modal/dialog_modal.vue | 11 +----- src/components/emoji_input/emoji_input.vue | 2 - src/components/emoji_picker/emoji_picker.scss | 5 +-- src/components/emoji_reactions/emoji_reactions.vue | 16 +++----- src/components/extra_buttons/extra_buttons.vue | 4 +- .../extra_notifications/extra_notifications.vue | 5 +-- src/components/favorite_button/favorite_button.vue | 4 +- src/components/flash/flash.vue | 2 - src/components/font_control/font_control.vue | 2 - src/components/gallery/gallery.vue | 2 - .../global_notice_list/global_notice_list.vue | 2 - .../interface_language_switcher.vue | 2 - src/components/link-preview/link-preview.vue | 7 +--- src/components/lists_edit/lists_edit.vue | 2 - .../lists_user_search/lists_user_search.vue | 2 - src/components/login_form/login_form.vue | 2 - src/components/media_upload/media_upload.vue | 2 - src/components/mention_link/mention_link.scss | 10 ++--- src/components/mobile_nav/mobile_nav.vue | 8 +--- .../mobile_post_status_button.vue | 5 +-- .../moderation_tools/moderation_tools.vue | 2 - .../mrf_transparency_panel.vue | 1 - src/components/nav_panel/nav_panel.vue | 2 - src/components/navigation/navigation_pins.vue | 2 - src/components/notifications/notifications.scss | 2 - src/components/panel_loading/panel_loading.vue | 8 +--- src/components/password_reset/password_reset.vue | 9 +---- src/components/poll/poll.vue | 5 +-- src/components/poll/poll_form.vue | 2 - .../post_status_form/post_status_form.vue | 29 +++++--------- src/components/react_button/react_button.vue | 8 +--- src/components/registration/registration.vue | 6 +-- src/components/reply_button/reply_button.vue | 4 +- src/components/report/report.scss | 2 - src/components/retweet_button/retweet_button.vue | 4 +- src/components/scope_selector/scope_selector.vue | 2 - src/components/search_bar/search_bar.vue | 5 +-- src/components/select/select.vue | 3 -- src/components/settings_modal/settings_modal.scss | 2 - .../settings_modal_admin_content.scss | 7 +--- .../settings_modal_user_content.scss | 7 +--- .../settings_modal/tabs/profile_tab.scss | 2 - .../settings_modal/tabs/security_tab/mfa.vue | 5 +-- .../tabs/security_tab/mfa_backup_codes.vue | 2 - .../settings_modal/tabs/theme_tab/theme_tab.scss | 10 ++--- src/components/shout_panel/shout_panel.vue | 5 +-- src/components/side_drawer/side_drawer.vue | 2 - src/components/status/status.scss | 45 +++++++--------------- src/components/status_popover/status_popover.vue | 2 - src/components/sticker_picker/sticker_picker.vue | 4 +- src/components/still-image/still-image.vue | 5 +-- src/components/tab_switcher/tab_switcher.scss | 15 ++------ src/components/thread_tree/thread_tree.vue | 8 ++-- src/components/timeline/timeline.scss | 2 - src/components/timeline_menu/timeline_menu.vue | 2 - .../update_notification/update_notification.scss | 4 +- src/components/user_avatar/user_avatar.vue | 2 - src/components/user_card/user_card.scss | 2 - src/components/user_note/user_note.vue | 4 +- src/components/user_popover/user_popover.vue | 2 - src/components/user_profile/user_profile.vue | 2 - .../user_reporting_modal/user_reporting_modal.vue | 8 +--- src/hocs/with_load_more/with_load_more.scss | 5 +-- 80 files changed, 99 insertions(+), 382 deletions(-) delete mode 100644 src/_variables.scss (limited to 'src/components/attachment') diff --git a/src/App.scss b/src/App.scss index 289add77..97d3f516 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,6 +1,5 @@ // stylelint-disable rscss/class-format /* stylelint-disable no-descending-specificity */ -@import "./variables"; @import "./panel"; :root { diff --git a/src/_variables.scss b/src/_variables.scss deleted file mode 100644 index 751fc9a4..00000000 --- a/src/_variables.scss +++ /dev/null @@ -1,36 +0,0 @@ -$main-color: #f58d2c; -$main-background: white; -$darkened-background: whitesmoke; - -$fallback--bg: #121a24; -$fallback--fg: #182230; -$fallback--faint: rgb(185 185 186 / 50%); -$fallback--text: #b9b9ba; -$fallback--link: #d8a070; -$fallback--icon: #666; -$fallback--lightBg: rgb(21 30 42); -$fallback--lightText: #b9b9ba; -$fallback--border: #222; -$fallback--cRed: #f00; -$fallback--cBlue: #0095ff; -$fallback--cGreen: #0fa00f; -$fallback--cOrange: orange; - -$fallback--alertError: rgb(211 16 20 / 50%); -$fallback--alertWarning: rgb(111 111 20 / 50%); - -$fallback--panelRadius: 10px; -$fallback--checkboxRadius: 2px; -$fallback--btnRadius: 4px; -$fallback--inputRadius: 4px; -$fallback--tooltipRadius: 5px; -$fallback--avatarRadius: 4px; -$fallback--avatarAltRadius: 10px; -$fallback--attachmentRadius: 10px; -$fallback--chatMessageRadius: 10px; - -$fallback--buttonShadow: 0 0 2px 0 rgb(0 0 0 / 100%), - 0 1px 0 0 rgb(255 255 255 / 20%) inset, - 0 -1px 0 0 rgb(0 0 0 / 20%) inset; - -$status-margin: 0.75em; diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue index cca7121c..9a7c6824 100644 --- a/src/components/account_actions/account_actions.vue +++ b/src/components/account_actions/account_actions.vue @@ -122,8 +122,6 @@ diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue index 27a475ed..b33ea67e 100644 --- a/src/components/chat_list/chat_list.vue +++ b/src/components/chat_list/chat_list.vue @@ -45,8 +45,6 @@ diff --git a/src/components/chat_list_item/chat_list_item.vue b/src/components/chat_list_item/chat_list_item.vue index cbae2d11..0f9d5c5f 100644 --- a/src/components/chat_list_item/chat_list_item.vue +++ b/src/components/chat_list_item/chat_list_item.vue @@ -48,6 +48,5 @@ diff --git a/src/components/chat_new/chat_new.vue b/src/components/chat_new/chat_new.vue index 5a872b66..673ba56b 100644 --- a/src/components/chat_new/chat_new.vue +++ b/src/components/chat_new/chat_new.vue @@ -48,6 +48,5 @@ diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue index 93db4fa7..68ee7a5a 100644 --- a/src/components/chat_title/chat_title.vue +++ b/src/components/chat_title/chat_title.vue @@ -26,8 +26,6 @@ diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss index 373cb2f2..61d2541c 100644 --- a/src/components/desktop_nav/desktop_nav.scss +++ b/src/components/desktop_nav/desktop_nav.scss @@ -1,5 +1,3 @@ -@import "../../variables"; - .DesktopNav { width: 100%; z-index: var(--ZI_navbar); diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue index 341cf105..b917c637 100644 --- a/src/components/dialog_modal/dialog_modal.vue +++ b/src/components/dialog_modal/dialog_modal.vue @@ -25,8 +25,6 @@ diff --git a/src/components/lists_edit/lists_edit.vue b/src/components/lists_edit/lists_edit.vue index 3c44579a..3c2066f6 100644 --- a/src/components/lists_edit/lists_edit.vue +++ b/src/components/lists_edit/lists_edit.vue @@ -165,8 +165,6 @@ diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index 6380deac..bf608936 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -103,8 +103,6 @@ diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue index 7ac6db74..037b859e 100644 --- a/src/components/password_reset/password_reset.vue +++ b/src/components/password_reset/password_reset.vue @@ -30,7 +30,7 @@

{{ $t('password_reset.password_reset_required') }}

@@ -77,8 +77,6 @@ diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index 1b0674e6..e648e7e3 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -41,7 +41,6 @@ diff --git a/src/components/user_popover/user_popover.vue b/src/components/user_popover/user_popover.vue index 3b2bbc45..413b254c 100644 --- a/src/components/user_popover/user_popover.vue +++ b/src/components/user_popover/user_popover.vue @@ -24,8 +24,6 @@