FeenixMakers/merged
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix prose styles

Browse Source
This commit is contained in:
Torsten 2023-01-21 17:40:14 +02:00
parent eb5ed29a16
commit af58e885d7
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -85,13 +85,13 @@ The developer reviews, merges changes and deploys.
## Installation ## Installation
Add this line to your application's Gemfile: Add to your Gemfile:
```ruby ```ruby
gem "merged" , git: "https://github.com/HubFeenixMakers/merged" gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
``` ```
And then execute: And then bundle:
```bash ```bash
$ bundle $ bundle
``` ```
@ -99,7 +99,7 @@ $ bundle
Mount engine in routes for editing (possibly not in production). Mount engine in routes for editing (possibly not in production).
```ruby ```ruby
mount Merged::Engine => "/merged" mount Merged::Engine => "/merged" unless Rails.env.production?
``` ```
Create route to serve content. Create route to serve content.
@ -126,10 +126,9 @@ pipeline.
#### Apps using tailwind #### Apps using tailwind
If you use tailwind with the basic install, you need to edit the tailwind config. If you use tailwind with the tailwind gem, you need to edit the tailwind config.
Basically it is impossible to have two tailwind generated stylesheets, so your app needs to pick Basically it is impossible to have two tailwind generated stylesheets, so your app needs to pick up the merged styles. This can be configured like so:
up the merged styles. This can be configured like so:
``` ```
const output = execSync('bundle show merged', { encoding: 'utf-8' }); const output = execSync('bundle show merged', { encoding: 'utf-8' });
@ -143,6 +142,11 @@ module.exports = {
] ]
``` ```
Also, merged overrides some tailwind styles (especially prose/markdown),
so if you want to use markdown i suggest importing the `merged/tailwind_styles` into your application.css. This is pure css, and does not
need to be processed by tailwind.
## Developers ## Developers
### Styles ### Styles

8
app/assets/stylesheets/merged/merged.css
View File

@ -2645,14 +2645,10 @@ select {
transition-timing-function: cubic-bezier(0.4, 0, 1, 1); transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
} }
.prose{ .prose {
color: inherit;
--tw-prose-bullets: #6b7280;
}
.prose-lg{
color: inherit; color: inherit;
--tw-prose-bullets: #6b7280; --tw-prose-bullets: #6b7280;
--tw-prose-headings: inherit;
} }
.hover\:scale-105:hover { .hover\:scale-105:hover {

8
app/assets/stylesheets/merged/tailwind_styles.css
View File

@ -1,9 +1,5 @@
.prose{ .prose {
color: inherit;
--tw-prose-bullets: #6b7280;
}
.prose-lg{
color: inherit; color: inherit;
--tw-prose-bullets: #6b7280; --tw-prose-bullets: #6b7280;
--tw-prose-headings: inherit;
} }