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

[4.2] Add toolbar timer styles to sass files. #4910

Merged
merged 3 commits into from
Jul 12, 2021
Merged

[4.2] Add toolbar timer styles to sass files. #4910

merged 3 commits into from
Jul 12, 2021

Conversation

sfadschm
Copy link
Contributor

@sfadschm sfadschm commented Jul 5, 2021

In #4886, the toolbar styles were updated, but I failed to notice that they are defined in admin in scss files.
This PR pulls the changes over to the preprocessor files.

Checklist:

  • Securely signed commits

Copy link
Member

@MGatner MGatner left a comment

Choose a reason for hiding this comment

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

Thanks!

@MGatner
Copy link
Member

MGatner commented Jul 5, 2021

@LittleJ anything to add?


// Fixed top
&.fixed-top {
& .toolbar {
Copy link
Contributor Author

@sfadschm sfadschm Jul 7, 2021

Choose a reason for hiding this comment

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

Not 100% sure about removing the & here, but the css turns out same with and without as it is originally written as & .toolbar which should be the same.

@sfadschm
Copy link
Contributor Author

sfadschm commented Jul 7, 2021

Happily switching to spaces.
Also "fixed" some other, not unified styling.

@paulbalandan
Copy link
Member

Just a tip. [ci skip] doesn't work on PR titles. It should be on the commit message to actually work.

@paulbalandan paulbalandan changed the title [ci-skip][4.2] Add toolbar timer styles to sass files. [4.2] Add toolbar timer styles to sass files. Jul 7, 2021
@sfadschm
Copy link
Contributor Author

sfadschm commented Jul 7, 2021

Just a tip. [ci skip] doesn't work on PR titles. It should be on the commit message to actually work.

Ah this explains a lot 😆
However, I think it worked when creating the PR. But I will try to remember next time ^.^

@LittleJ
Copy link
Contributor

LittleJ commented Jul 8, 2021

Sorry for the late answer. I forgot I had turned off all the notifications... I will have more time to dedicate to CI the next days and weeks. I will check all the great new updates :-) and those pull requests. Thanks @MGatner for asking me ❤️😄

@paulbalandan
Copy link
Member

I'll proceed first with merging this. Thanks, @sfadschm .

@paulbalandan paulbalandan merged commit fa889e8 into codeigniter4:4.2 Jul 12, 2021
@sfadschm sfadschm deleted the 4.2-toolbar-scss branch July 12, 2021 18:08
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