* style: move compound loading order
* fix: spotlight fiting
* fix: don't use internal compound css var in settings subsection
* fix: don't use internaal compound css var in read receipt group
* fix: add important to font settings on body element
* fix: remove play pause button color and fix padding
This color wasn't apply because this PR. Removing to avoid visual
regression
* fix: add important to form help message override in preference settings
* fix: override compound in space panel buttons
* fix: layout of forgot password
* fix: height of encryption tab
* fix: widget avatar border radius
* Switch to rendering svg icons rather than masking them in SpacePanel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix badly rendered icon in JoinRuleDropdown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix badly rendered icon in RoomPreviewCard
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix badly rendered icon in Space menus
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix badly rendered icon in ThreadPanel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshot
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove unused icon underfill
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshot
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Add test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Add missing snapshot
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in left panel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove unused stylesheet
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them for ExternalLink
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them for TabbedView
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them for JoinRuleDropdown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in ManageRestrictedJoinRuleDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in LeaveSpaceDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in ReplyPreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in SearchBox
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in RoomStatusBar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix advanced.svg
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix bad merge conflict resolution
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in Toasts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in RoomInfoLine
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in UploadBar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove unused class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in ConfirmSpaceUserActionDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in FeedbackDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in KeyBackupFailedDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in CopyableText
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in EventTile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in InviteReason
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Add test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Add test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in left panel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove unused stylesheet
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them for ExternalLink
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them for TabbedView
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them for JoinRuleDropdown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in ManageRestrictedJoinRuleDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in LeaveSpaceDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in ReplyPreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in SearchBox
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch to rendering svg icons rather than masking them in RoomStatusBar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix advanced.svg
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix bad merge conflict resolution
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Size Autocomplete relative to the RoomView height rather than the viewport height
* Add screenshot for the autocomplete in a regression changes the height
* Add cjk fonts to support rendering text emoticons displayed in slash command picker
* Maybe when actually running the tests?
* Try after system dependencies and clear font cache
* Add cjk fonts to support rendering text emoticons displayed in slash command picker
Try after system dependencies and clear font cache
Maybe when actually running the tests?
Revert "Add cjk fonts to support rendering text emoticons displayed in slash command picker"
This reverts commit 46fa014308b6010626174f8cd0d3a978488963ee.
* Render emoji autocoplete instead
* Remove font install that didn't work
* Tweak rendering of icons in legacy video feed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove unused classes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in face pile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in overflow tile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in room search view
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in top unread messages bar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in space basic settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in thread summary tile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in legacy room tile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in incoming call toast
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in labs jump to date
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in field validation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in mini avatar uploader
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in info tooltip
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in network dropdown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/chat-bubbles.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/chat-bubbles.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace external-link.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/hide.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/explore.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/hash-*.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/share.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/group-members.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/mask-as-*.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/low-priority.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/plus-circle.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/roles.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update jest snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshot
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/room/composer/attach.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/room/*/emoji.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/room/message-bar/edit.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/room/composer/poll.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/room/composer/plain_text.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove unused star.svg
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/upload.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/settings/preference.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/settings/flask.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/settings/appearance.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/call/dialpad.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/call/hangup.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/call/video-call.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/call/voice-call.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/cloud-off.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Replace element-icons/eye.svg with compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove debug
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in dropdowns
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in composer format bar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in jump to bottom button
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in quick settings button
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in left panel search
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix margin
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in security user settings tab
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tweak rendering of icons in space hierarchy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Simplify
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Tidy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Add test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove some unused CSS & icons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix type
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove another unused class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This was telling the browser that the children of this div will never go
out of the bounding rect of the div. This is incorrect because the
expand button is supposed to sit at the edge of the space panel with
half of it outside the bounding rect.
* Inhibit keyboard highlight in spotlight dialog when effector is not in focus
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Inhibit keyboard highlight in forward dialog when effector is not in focus
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix search box height bouncing on focus/blur
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshot
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Module API experiments
* Move ResizerNotifier into SDKContext
so we don't have to pass it into RoomView
* Add the MultiRoomViewStore
* Make RoomViewStore able to take a roomId prop
* Different interface to add space panel items
A bit less flexible but probably simpler and will help keep things
actually consistent rather than just allowing modules to stick any
JSX into the space panel (which means they also have to worry about
styling if they *do* want it to be consistent).
* Allow space panel items to be updated
and manage which one is selected, allowing module "spaces" to be
considered spaces
* Remove fetchRoomFn from SpaceNotificationStore
which didn't really seem to have any point as it was only called from
one place
* Switch to using module api via .instance
* Fairly awful workaround
to actually break the dependency nightmare
* Add test for multiroomviewstore
* add test
* Make room names deterministic
So the tests don't fail if you add other tests or run them individually
* Add test for builtinsapi
* Update module api
* RVS is not needed as prop anymore
Since it's passed through context
* Add roomId to prop
* Remove RoomViewStore from state
This is now accessed through class field
* Fix test
* No need to pass RVS from LoggedInView
* Add RoomContextType
* Implement new builtins api
* Add tests
* Fix import
* Fix circular dependency issue
* Fix import
* Add more tests
* Improve comment
* room-id is optional
* Update license
* Add implementation for AccountDataApi
* Add implementation for Room
* Add implementation for ClientApi
* Create ClientApi in Api.ts
* Write tests
* Use nullish coalescing assignment
* Implement openRoom in NavigationApi
* Write tests
* Add implementation for StoresApi
* Write tests
* Fix circular dependency
* Add comments in lieu of type
and fix else block
* Change to class field
---------
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
* add variant of ResetIdentityBody for when the user has no verif. methods
* no longer distinguish between the using having a passphrase or not
* use vertical stack of buttons via EncryptionCard
and update wording
* swap logic order to match rendering order
* use the same dialog when no verification options available
* make it agree with the design more
* allow signing out on initial login
* apply styling changes and remove duplicate elements
* fix and add tests
* add missing snapshot
* Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* use a boolean property to disable blurring instead of adding a class
* change string identifiers
* apply changes from review -- simplify logic
* change class name to avoid confusion
---------
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* Assert that we set backup_disabled when turning off key storage
* Prompt the user when key storage is unexpectedly off
* Playwright tests for the Turn on key storage toast
* Don't toggle to the minimised left bar size.
* Don't re-style old room list when at the minimum size
* Only apply larger minimised with on new room list
* Don't tell child views we are minimised for the new room list
* move comment to the correct place
* address PR comments
* Don't wrap search text and add truncation down to a minimum of 50px
* Put min-width on the button so that we don't have to hardcode the 50px
* Keep the flex display, shrink and truncate just the search text and keep the shortcut
* Update snapshots
* Add comment for magic value
* Make inner search text a span
* Add e2e test for smallscreen to test responsiveness
* Update snapshots
* Forcing an empty commit to fix PR
* Change minWidth to 224
* Fix labelling of avatar menu
* Make the integration manager toggle more clear.
* fix label
* lint
* Update snapshots.
* Refactor many cases of checkbox to use the new compound component.
* Remove non-checkbox related changes
* Reset some things
* Remove usages of mx_checkbox* styling.
* Use label locators for apperance tests.
* small linter tweaks
* lint
* update screenshot
* Test updates
* lint
* Realign checkboxes for device selection.
* Fixup QuickSettings styling
* remove comment
* lint
* flex comment
* remove unused label
* remove redundant classes
* add test for spaces
* lint
* Copyright
* fixup spaces test
* spaces lint
* Replace pin with compound pin.
* Realign icons
* Remove hack for colouring icons
* Adjust existing rooms component to correctly label room.
* Add test for adding an existing room to an existing space.
* Set deterministic sort order for rooms
* lint
* chore: update `@vector-im/compound-design-tokens` & `@vector-im/compound-web` to last version
* chore: use `error-solid` icon instead of `error`
* chore: update jest snapshot
* fix: `AccessibleButton` lint
* feat(new room list)!: hide Favourites and People meta spaces when the new room list is enabled
* test(space store): add testcase for new labs flag
* feat(quick settings): hide pin to sidebar and more options and add extra margin
* Stop URl preview from covering message box
Fixes#23874 by adding a bit of padding.
1em should be sufficient to prevent the browser's URl preview from covering the entry box.
* test: update timeline screenshots
* test: update test, fewer messages are displayed
---------
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Florian D <florianduros@element.io>
* Add commercial licence and update config files
* Update license in headers
* Revert "Update license in headers"
This reverts commit 7ed7949485.
* Update only spdx id
* Remove LicenseRef- from package.json
LicenseRef- no longer allowed in npm v3 package.json
This fixes the warning in the logs and failing build check.
* Remove abandoned Voice Broadcasts labs flag
Any existing voice broadcasts will be shown as a series of voice messages which will sequence play as normal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove dead code
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove stale _LegacyRoomHeader.pcss and icons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* De-duplicate icons using Compound Design Tokens
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove stale _LegacyRoomHeader.pcss and icons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove unused icons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Ensure legacy header styles are not used by HTML export
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots & snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update screenshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove stale _LegacyRoomHeader.pcss and icons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove unused icons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Ensure legacy header styles are not used by HTML export
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
