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

Eliminate styling conflicts #1003 #1008

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Eliminate styling conflicts #1003 #1008

merged 1 commit into from
Feb 4, 2025

Conversation

NVMakarenko
Copy link
Contributor

dev

Project

Code reviewers

Second Level Review

Summary of issue

Bootstrap and Tailwindcss were used in the project, I need to analyze where conflict are possible

Summary of change

Configurate Tailwindcss to scan all pages except account directory.

CHECK LIST

  • СI passed
  • Сode coverage >=95%
  • PR is reviewed manually again (to make sure you have 100% ready code)
  • All reviewers agreed to merge the PR
  • I've checked new feature as logged in and logged out user if needed
  • PR meets all conventions

Copy link

codecov bot commented Dec 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.82%. Comparing base (fd68b5b) to head (b25f1d0).
Report is 34 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #1008   +/-   ##
========================================
  Coverage    91.82%   91.82%           
========================================
  Files           74       74           
  Lines         1052     1052           
========================================
  Hits           966      966           
  Misses          86       86           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@NVMakarenko NVMakarenko changed the base branch from master to develop December 14, 2024 13:00
@@ -5,7 +5,8 @@ module.exports = {
'./public/*.html',
'./app/helpers/**/*.rb',
'./app/javascript/**/*.js',
'./app/views/**/*.erb'
'./app/views/**/*.erb',
'!./app/views/account/**/*.erb'
],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For unsigned user it is styled with tailwindcss.
image

for admin it is styled with global Tailwindcss styles and Bootstrap.
image

@NVMakarenko NVMakarenko linked an issue Dec 14, 2024 that may be closed by this pull request
@NVMakarenko NVMakarenko self-assigned this Dec 14, 2024
@loqimean loqimean merged commit 2ab19e1 into develop Feb 4, 2025
5 checks passed
@loqimean loqimean deleted the 1003-styling-tw-btp branch February 4, 2025 15:35
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.

Eliminate styling conflicts
2 participants