Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-29458: Migrate changeCSS() to CSS variable in utils/utils.jsx #6981

Merged
merged 2 commits into from
Nov 17, 2020
Merged

MM-29458: Migrate changeCSS() to CSS variable in utils/utils.jsx #6981

merged 2 commits into from
Nov 17, 2020

Conversation

ilhan-mstf
Copy link
Contributor

Summary

Migrate changeCSS() to CSS variable in utils/utils.jsx, ln. 549
changeCss('.app*_body .attachment .attachment_*container', 'border-left-color:' <ins> theme.sidebarHeaderBg);

Ticket Link

Fixes mattermost/mattermost#15869
Jira: https://mattermost.atlassian.net/browse/MM-29458

@mattermod
Copy link
Contributor

Hello @ilhan-mstf,

Thanks for your pull request! A Core Committer will review your pull request soon. For code contributions, you can learn more about the review process here.

Per the Mattermost Contribution Guide, we need to add you to the list of approved contributors for the Mattermost project.

Please help complete the Mattermost contribution license agreement?
Once you have signed the CLA, please comment with /check-cla and confirm that the CLA check is green.

This is a standard procedure for many open source projects.

Please let us know if you have any questions.

We are very happy to have you join our growing community! If you're not yet a member, please consider joining our Contributors community channel to meet other contributors and discuss new opportunities with the core team.

@hanzei hanzei added the 2: Dev Review Requires review by a core commiter label Nov 2, 2020
@hanzei
Copy link
Contributor

hanzei commented Nov 2, 2020

/check-cla

@hmhealey hmhealey added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Nov 4, 2020
hmhealey
hmhealey suggested changes Nov 4, 2020
View reviewed changes
sass/layout/_webhooks.scss Outdated
.app__body {
.attachment {
.attachment__container {
border-left-color: var(--sidebar-header-bg);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution, @ilhan-mstf!

I know the rule doesn't exactly match the old one, but would you mind moving this style to be up around line 107 in the .post .attachment .attachment__container rule? These files need a lot of cleanup eventually, and it would help a lot if this was near the other styling rules for that element. The .app__body part shouldn't matter here since message attachments always appear in a post anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you,
I've updated as you requested. Can you please check again?

@hmhealey hmhealey requested review from nevyangelova and removed request for abhijit-singh November 4, 2020 20:33
hmhealey
hmhealey approved these changes Nov 4, 2020
View reviewed changes
Copy link
Member

@hmhealey hmhealey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Looks good to me

nevyangelova
nevyangelova approved these changes Nov 9, 2020
View reviewed changes
Copy link
Contributor

@nevyangelova nevyangelova left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! 🎉

jgilliam17
jgilliam17 approved these changes Nov 16, 2020
View reviewed changes
Copy link
Contributor

@jgilliam17 jgilliam17 left a comment •
edited by hanzei
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @ilhan-mstf
Tested, looks good to merge.

  • Verified webhook post border color (using the same color as Sidebar Text Active Border by default).

@hmhealey can you please help merge? Thanks 🙂

@jgilliam17 jgilliam17 added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Nov 16, 2020
@mm-cloud-bot
Copy link

Test server destroyed

@hanzei hanzei merged commit 20b2171 into mattermost:campaign/applytheme_sidebar-header-bg Nov 17, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation and removed Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Nov 17, 2020
deanwhillier pushed a commit that referenced this pull request Jan 22, 2021
@ilhan-mstf @deanwhillier
MM-29458: Migrate changeCSS() to CSS variable in utils/utils.jsx (#6981)
e081313
deanwhillier added a commit that referenced this pull request Mar 2, 2021
@deanwhillier @arc9693
@haardikdharma10 @ilhan-mstf @mattermod
Campaign/applytheme sidebar header bg (#7383)
0b0043f 
* Remove usage of changeCss() for modal-header background (#6700)

Closes [mattermost/mattermost#15867

* Migrate changeCSS() to CSS variable in utils/utils.jsx in 550. (#6713)

* MM-29458: Migrate changeCSS() to CSS variable in utils/utils.jsx (#6981)

* Update sass/layout/_webhooks.scss

- ensure new line at the end of the file

* Address MM-29457

* Removed unecessary line

Co-authored-by: Archana Choudhary <[email protected]>
Co-authored-by: Haardik Dharma <[email protected]>
Co-authored-by: Mustafa İlhan <[email protected]>
Co-authored-by: Mattermod <[email protected]>
furqanmlk pushed a commit to furqanmlk/mattermost-webapp that referenced this pull request Mar 2, 2021
Added guest test cases
85956e7 
Added guest test cases

[MM-33127] Fixing admin console search clear icon (mattermost#7578)

Automatic Merge

Fixing MM-33118 (mattermost#7574)

Automatic Merge

MM-33209 Downgrade serialize error (mattermost#7586)

Hiding custom statuses config when feature flag is disabled (mattermost#7582)

Automatic Merge

[MM-20386] migrate popover_bar to typescript (mattermost#7539)

Co-authored-by: Mattermod <[email protected]>

MM-31740 Gif picker empty when no results are displayed (mattermost#7501)

Automatic Merge

dont focus the logs table (mattermost#7519)

Co-authored-by: Mattermod <[email protected]>

[MM-32691] - Send email when the users are not able to join a workspace (mattermost#7553)

* [MM-32691] - Send email when the users are not able to join a workspace

* make i18n-extract

* Update redux

* Silently send email

* Restore package-lock

* Update package-lock with mattermost-redux hash

* Restore package.json

* Update package.json with mattermost-redux hash

Co-authored-by: Mattermod <[email protected]>

[MM-32641] - Add the 'Invite Members' module to the end-user onboarding flow (mattermost#7580)

* [MM-32641] - Add the 'Invite Members' module to the end-user onboarding flow

* Fix tsx linting

[MM-32690] - Add 'Notify Admin' button when end-users are presented with the user limit reached modal (mattermost#7579)

* [MM-32690] - Add 'Notify Admin' button when end-users are presented with the user limit reached modal

* Remove comment

* Fix snaps

* Fix import

MM-33237 Update webpack-livereload-plugin (mattermost#7590)

fix several failed tests (mattermost#7583)

MM-20371 migrate add_groups_to_team_modal to ts (mattermost#7567)

[MM-32098] Add Cypress Test for Support Packet Generation (mattermost#7558)

Automatic Merge

Cypress/E2E: Fix E2E due to recent change in at-mention suggestion list (mattermost#7565)

* fix e2e due to recent change in at-mention suggestion list

* Apply suggestions from code review

Co-authored-by: Prapti <[email protected]>

* Apply suggestions from code review

Co-authored-by: Caleb Roseland <[email protected]>

Co-authored-by: Prapti <[email protected]>
Co-authored-by: Caleb Roseland <[email protected]>

Cypress/E2E: Fix failed tests on theme (mattermost#7589)

* fix failed tests on theme

* add TM4J keys

MM-33245 Fix casing on contenthash for CSS (mattermost#7594)

Removed unused roles requests state objects (mattermost#7562)

MM-33285 Turn off snapshotting of node_modules and minor webpack changes (mattermost#7598)

* Remove default option

* Use contenthash instead of the now-deprecated hash

* Turn of snapshotting of node_modules to fix dev:watch

Update links in README.md (mattermost#7603)

Translations plus fix (mattermost#7606)

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

* Translated using Weblate (Korean)

Currently translated at 79.4% (3561 of 4484 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ko/

Translated using Weblate (Korean)

Currently translated at 78.8% (3537 of 4484 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ko/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/

Translated using Weblate (Swedish)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/

Translated using Weblate (Swedish)

Currently translated at 100.0% (4484 of 4484 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/

* Translated using Weblate (German)

Currently translated at 87.8% (3937 of 4484 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (4484 of 4484 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (4484 of 4484 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ja/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 98.2% (4406 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/

* Translated using Weblate (Bulgarian)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/

* Translated using Weblate (Romanian)

Currently translated at 100.0% (4483 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/

* Translated using Weblate (German)

Currently translated at 87.8% (3938 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/

* Translated using Weblate (German)

Currently translated at 87.8% (3938 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/

* Translated using Weblate (German)

Currently translated at 88.0% (3949 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/

* Translated using Weblate (German)

Currently translated at 88.0% (3949 of 4483 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/

* Remove korean empty translation

Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: 카리스턱 <[email protected]>
Co-authored-by: MArtin Johnson <[email protected]>
Co-authored-by: Friederike J <[email protected]>
Co-authored-by: Tom De Moor <[email protected]>
Co-authored-by: kaakaa <[email protected]>
Co-authored-by: Kaya Zeren <[email protected]>
Co-authored-by: aeomin <[email protected]>
Co-authored-by: Nikolai Zahariev <[email protected]>
Co-authored-by: Viorel-Cosmin Miron <[email protected]>
Co-authored-by: Elisabeth Kulzer <[email protected]>

Fix zoom on pdf previews (mattermost#7600)

Cypress/E2E: Reorganize and add keys for Elasticsearch autocomplete - users (mattermost#7591)

* fix e2e due to recent change in at-mention suggestion list

* reorganize tests for Elasticsearch automplete for users

* Update users_spec.js

Changing comment from statement to verification

Co-authored-by: Prapti <[email protected]>

[MM-33132] - Subscription stats are not updated when a user is deactivated/activated (mattermost#7595)

[MM-33107][MM-33312] fix rhs over textbox (mattermost#7581)

* [MM-33107] fix rhs over textbox

* improve transition

* [MM-33312] move the sidebar up when in tablet size

Co-authored-by: = <=>
Co-authored-by: Mattermod <[email protected]>

Updating font size for add people to channel modal (mattermost#7525)

adding rtl word order support for the web app (text is still left aligned to look good on an ltr localized ui) (mattermost#7283)

Co-authored-by: Anton Wolkov <[email protected]>
Co-authored-by: Mattermod <[email protected]>

update compass font icon (mattermost#7559)

Co-authored-by: Mattermod <[email protected]>

Update NOTICE.txt (mattermost#7611)

Automatic Merge

Campaign/applytheme sidebar header bg (mattermost#7383)

* Remove usage of changeCss() for modal-header background (mattermost#6700)

Closes [mattermost/mattermost#15867

* Migrate changeCSS() to CSS variable in utils/utils.jsx in 550. (mattermost#6713)

* MM-29458: Migrate changeCSS() to CSS variable in utils/utils.jsx (mattermost#6981)

* Update sass/layout/_webhooks.scss

- ensure new line at the end of the file

* Address MM-29457

* Removed unecessary line

Co-authored-by: Archana Choudhary <[email protected]>
Co-authored-by: Haardik Dharma <[email protected]>
Co-authored-by: Mustafa İlhan <[email protected]>
Co-authored-by: Mattermod <[email protected]>

Guest test cases added

removed old file
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hmhealey hmhealey hmhealey approved these changes

@nevyangelova nevyangelova nevyangelova approved these changes

@jgilliam17 jgilliam17 jgilliam17 approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation Hacktoberfest hacktoberfest-accepted
Projects
None yet
Milestone
No milestone
8 participants
@ilhan-mstf @mattermod @hanzei @mm-cloud-bot @hmhealey @nevyangelova @jgilliam17 @amyblais