-
Notifications
You must be signed in to change notification settings - Fork 462
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
AO3-6622 Decrease margins on definition lists in FAQs #4756
base: master
Are you sure you want to change the base?
Conversation
@@ -1,10 +1,11 @@ | |||
/* ==USERSTUFF: displaying content inputted by a user into a textarea.*/ | |||
|
|||
.userstuff { | |||
word-wrap: break-word; | |||
word-wrap: break-word; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you put the spacing back here? Our house style (developed many, many years ago) is to list CSS3 properties last and indent them four spaces.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, yeah. That's my linter. Let me turn that off for this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like this line got fixed! However, all of the other properties are now indented 2 spaces instead of 4. Can you please restore the original indenting across the file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The screenshot matches what GitHub is showing, but the properties should be indented just two spaces, putting them where the second vertical line is. Basically, the lines were correctly indented in the original version of the file and should be unchanged in this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait, so then I'm confused about the original comment, asking to indent them all 4 spaces?
Or does that mean just for CSS3 properties (indent 4), and previous versions are all indented 2?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, just the CSS3 properties get indented 4 spaces (and go last), and the rest get indented 2. Sorry for the confusion!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this! Docs is really going to appreciate it. (Also, apologies for the premature single comment. I was distracted and hit the wrong button.)
If you want to add FAQ data to your dev environment, you can create an admin account with the superadmin, translation, or docs role to access the interface for creating FAQs.
width: auto; | ||
opacity: 1; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
opacity: 1; | |
opacity: 1; |
(If you compare it to word-wrap
on line 4, you can see opacity
is currently indented a total of 6 spaces instead of the desired 4.)
it "is valid even if the email casing is different" do | ||
legit_user.email = legit_user.email.upcase | ||
User.current_user = legit_user | ||
expect(safe_report.save).to be_truthy | ||
end | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like it ended up on the wrong branch, did you mean to to add this to #4755? (If yes, it worries me a bit that the test didn't fail on this branch. It suggests that it's not testing what it's meant to.)
Pull Request Checklist
as the first thing in your pull request title (e.g.
AO3-1234 Fix thing
)until they are reviewed and merged before creating new pull requests.
Issue
https://otwarchive.atlassian.net/browse/AO3-6622
Purpose
Adjusts the margins for
.userstuff
dl
anddd
elements within.faq
containers to be smaller.Testing Instructions
These margins can be seen on the
/faq
path (although there does not seem to be any FAQ data on my local...)Credit
calm (they/them)