github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-02 07:26:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

correct TOS links, correct ul/li body-page style

Browse Source
This commit is contained in:
Jeff Atwood 2013-02-09 02:50:13 -08:00
parent 5d21745dcf
commit 6af0d0789c
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/stylesheets/application/faqs.css.scss
View File

@ -25,6 +25,7 @@
pre,
ul,
ol,
li,
table {
margin: 0 0 20px;
font-size: 16px;
@ -35,16 +36,6 @@
ul,
ol {
margin-left: 40px;
padding: 0;
font-size: 16px;
line-height: 22px;
}
li {
> ul,
> ol {
margin-bottom: 0;
}
}
}

14
app/views/static/faq.html.erb
View File

@ -16,11 +16,11 @@
<article id="improve-stuff">
<h2>Improve the Discussion</h2>
<p>
Help us make this a great place for discussion by always working to improve the discussion in some way. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.
Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.
</p>
<div class="more">
<p>
The topics discussed here matter to us and we want you to act as if they matter to you too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.
The topics discussed here matter to us and we want you to act as if they matter to you too. Be respectful of our topics and the people discussing them, even if you disagree with some of what is being said.
</p>
<p>
One way to improve the discussion is by searching for ones that are already happening. Please use the search function before starting a new discussion, and you will have a better chance of meeting others who share your interests.
@ -69,7 +69,7 @@
</p>
<div class="more">
<p>
When you see bad behavior, you may have the urge to call it out with a quick reply. Resist this urge. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. Just flag it. If enough flags accrue, action will be taken, either automatically or by moderator intervention.
When you see bad behavior, you may have the urge to call it out with a reply. Resist this urge. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. Just flag it. If enough flags accrue, action will be taken, either automatically or by moderator intervention.
</p>
<p>
In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts or take any preemptive action, therefore, the moderators and site operators take no responsibility for any content posted by the community.
@ -90,7 +90,7 @@
</p>
<div class="more">
<p>
These are not concrete terms with precise definitions — avoid even the <em>appearance</em> of any of these things. If you're unsure, ask yourself how you would feel if your post was on the front page of The New York Times.
These are not concrete terms with precise definitions &mdash; avoid even the <em>appearance</em> of any of these things. If you're unsure, ask yourself how you would feel if your post was on the front page of The New York Times.
</p>
<p>
This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.
@ -111,10 +111,10 @@
</p>
<div class="more">
<p>
Discourse can help keep things orderly — for example, rather than posting "+1" or "Agreed," use the Like button. Choose to Reply as a New Topic rather than taking an existing topic in a radically different direction.
Discourse can help keep things orderly &mdash; for example, rather than posting "+1" or "Agreed," use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.
</p>
<p>
Also, don't sign your posts — every post has your profile information attached to it.
Also, don't sign your posts &mdash; every post has your profile information attached to it.
</p>
</div>
</article>
@ -131,7 +131,7 @@
<article id="terms">
<h2>Terms of Service</h2>
<p>
Yes, legalese is boring, but we must protect ourselves &ndash; and by extension, you and your data &ndash; against unfriendly folks. We have a Terms of Service <a href="/tos">TOS</a> describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by the TOS.
Yes, legalese is boring, but we must protect ourselves &ndash; and by extension, you and your data &ndash; against unfriendly folks. We have a Terms of Service <a href="/tos">TOS</a> describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by the <a href="/tos">TOS</a>.
</p>
<div class="more">
</div>