Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Compile CSS color variables #6939

Merged
merged 1 commit into from
May 10, 2017
Merged

Conversation

karlprieb
Copy link
Contributor

@RocketChat/core

Closes #6931

@karlprieb karlprieb requested a review from rodrigok May 10, 2017 20:00
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-6939 May 10, 2017 20:00 Inactive
@engelgabriel engelgabriel added this to the 0.56.0 milestone May 10, 2017
@@ -71,25 +71,23 @@ RocketChat.theme = new class {
this.compileDelayed = _.debounce(Meteor.bindEnvironment(this.compile.bind(this)), 100);
Meteor.startup(() => {
RocketChat.settings.onAfterInitialLoad(() => {
RocketChat.settings.get('*', Meteor.bindEnvironment((key, value) => {
RocketChat.settings.get(/^theme-./, Meteor.bindEnvironment((key, value) => {
Copy link
Member

Choose a reason for hiding this comment

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

is this RegExp correct? looks like it's missing +

Copy link
Member

Choose a reason for hiding this comment

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

It works cuz the regex does not define the end ($)

@rodrigok rodrigok merged commit 744232e into release-candidate May 10, 2017
@rodrigok rodrigok deleted the color-compilation branch May 10, 2017 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants