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: move color settings from firewall_schedule_edit.php to theme #2407

Merged
merged 4 commits into from
May 16, 2018

Conversation

fabianfrz
Copy link
Member

No description provided.

@fabianfrz
Copy link
Member Author

@marjohn56 if this gets merged, you will have to update your theme plugins.

@marjohn56
Copy link
Member

OK. Will do so when it's merged and I can test.

@marjohn56
Copy link
Member

I have to take a look also at René's themes, he has forwarded them to me to PR, I'll try and do all three over the next few days.

@fichtner fichtner self-assigned this May 16, 2018
@fichtner
Copy link
Member

thanks. but merge conflict ?

@fabianfrz
Copy link
Member Author

@fichtner you changed the same line in the file - it is already fixed. If you do a squashed merge, it will be gone.

@fichtner fichtner merged commit 435f2fa into opnsense:master May 16, 2018
@fichtner
Copy link
Member

You're right, thanks for the hint and the submission. 👍

@fabianfrz fabianfrz deleted the fix_firewall_schedule_edit.php branch May 16, 2018 15:59
@fabianfrz
Copy link
Member Author

@fichtner which sass do you use for compiling, because it changed so many lines by moving brackets?

sass -v
Sass 3.5.5 (Bleeding Edge)

@fichtner
Copy link
Member

it was @AdSchellevis's change, don't know

@AdSchellevis
Copy link
Member

sass --version
1.3.2

@AdSchellevis
Copy link
Member

https://sass-lang.com/dart-sass seems to be the primary implementation, which is what homebrew installs

@fabianfrz
Copy link
Member Author

OK, I use the ruby one: https://sass-lang.com/ (reference implementation)

@fabianfrz
Copy link
Member Author

update: it was it, now it seems to be unmaintained for the dart one.

@AdSchellevis
Copy link
Member

ok, so, the dart version is what we should use then, isn't it?

@fabianfrz
Copy link
Member Author

probably the c wrapper would fit well and it uses the original library which is also used for most programming languages: https://github.com/sass/sassc
I don't care about it as long as it compiles correctly.

@AdSchellevis
Copy link
Member

let's stick with what the sass manual advises then :)

fichtner pushed a commit that referenced this pull request Jun 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants