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

Rename template.css #4644

Merged
merged 4 commits into from
Sep 29, 2022
Merged

Rename template.css #4644

merged 4 commits into from
Sep 29, 2022

Conversation

math-GH
Copy link
Contributor

@math-GH math-GH commented Sep 26, 2022

as discussed in #4641 (comment)

Rename template.css to frss.css.

I use a separate PR, so that hopefully the file history is kept. And hopefully git/github understands this change for the other PRs.

What I did:

> git mv .\template.css .\frss.css
> git log --follow .\frss.css
> git mv .\template.rtl.css .\frss.rtl.css
> git log --follow .\frss.rtl.css

@math-GH math-GH added the UI 🎨 User Interfaces label Sep 26, 2022
@math-GH math-GH mentioned this pull request Sep 26, 2022
2 tasks
@Alkarex Alkarex added this to the 1.21.0 milestone Sep 26, 2022
@math-GH
Copy link
Contributor Author

math-GH commented Sep 27, 2022

Let's merge #4641 before I will resolve this conflict

@Alkarex
Copy link
Member

Alkarex commented Sep 28, 2022

Approved after the conflict resolution

@Alkarex
Copy link
Member

Alkarex commented Sep 28, 2022

@math-GH I have fixed the conflicts and updated a few missing locations. Could you please double-check?

@math-GH
Copy link
Contributor Author

math-GH commented Sep 29, 2022

Looks fine. Let's merge.

@math-GH math-GH merged commit fedbda4 into FreshRSS:edge Sep 29, 2022
@Alkarex Alkarex modified the milestones: 1.21.0, 1.20.1 Oct 9, 2022
@math-GH math-GH deleted the rename-template branch October 31, 2022 21:20
math-GH added a commit to math-GH/FreshRSS that referenced this pull request Nov 15, 2022
* Fix conflicts

* Update doc

* Misses

* Update prefix in CSS

Co-authored-by: Alexandre Alapetite <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
UI 🎨 User Interfaces
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants