From c7a864450a1cf5d5dc6e3d53de26f1381cb29116 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Sat, 23 Apr 2016 08:14:17 -0400 Subject: [PATCH 1/6] Add guidelines route --- src/routes.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/routes.json b/src/routes.json index 3416549e1..076cdcc42 100644 --- a/src/routes.json +++ b/src/routes.json @@ -75,5 +75,11 @@ "name": "donate", "pattern": "^/info/donate", "redirect": "https://secure.donationpay.org/scratchfoundation/" + }, + { + "name": "guidelines", + "pattern": "^/community_guidelines$", + "view": "guidelines/guidelines", + "title": "Scratch Community Guidelines" } ] From 117eed5eb3be7dce3f9f5bfaf16abf64db80c6e9 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Sat, 23 Apr 2016 14:27:08 -0400 Subject: [PATCH 2/6] Squash and Merge --- src/_typography.scss | 4 +++ src/views/guidelines/guidelines.jsx | 41 ++++++++++++++++++++++++++++ src/views/guidelines/guidelines.scss | 11 ++++++++ src/views/guidelines/l10n.json | 17 ++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 src/views/guidelines/guidelines.jsx create mode 100644 src/views/guidelines/guidelines.scss create mode 100644 src/views/guidelines/l10n.json diff --git a/src/_typography.scss b/src/_typography.scss index 89db665fc..d4405de4f 100644 --- a/src/_typography.scss +++ b/src/_typography.scss @@ -121,5 +121,9 @@ dt { font-weight: 700; } + + dd { + margin: 0; + } } } diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx new file mode 100644 index 000000000..00665c430 --- /dev/null +++ b/src/views/guidelines/guidelines.jsx @@ -0,0 +1,41 @@ +var React = require('react'); +var FormattedMessage = require('react-intl').FormattedMessage; + +var render = require('../../lib/render.jsx'); +var Page = require('../../components/page/www/page.jsx'); +var Box = require('../../components/box/box.jsx'); + +require('./guidelines.scss'); + +var Guidelines = React.createClass({ + type: 'Guidelines', + render: function () { + return ( +
+ }> +

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ sprites +
+ +
+ ); + } +}); + +render(, document.getElementById('app')); diff --git a/src/views/guidelines/guidelines.scss b/src/views/guidelines/guidelines.scss new file mode 100644 index 000000000..d6a9fcc07 --- /dev/null +++ b/src/views/guidelines/guidelines.scss @@ -0,0 +1,11 @@ +@import "../../colors"; +@import "../../typography"; + +.view { + .guidelines-footer { + text-align: center; + img { + margin: 0 auto; + } + } +} diff --git a/src/views/guidelines/l10n.json b/src/views/guidelines/l10n.json new file mode 100644 index 000000000..454347e9a --- /dev/null +++ b/src/views/guidelines/l10n.json @@ -0,0 +1,17 @@ +{ + "guidelines.title": "Scratch Community Guidelines", + "guidelines.header": "We need everyone’s help to keep Scratch a friendly and creative community where people with different backgrounds and interests feel welcome.", + "guidelines.respectheader": "Be respectful.", + "guidelines.respectbody": "When sharing projects or posting comments, remember that people of many different ages and backgrounds will see what you’ve shared.", + "guidelines.constructiveheader": "Be constructive.", + "guidelines.constructivebody": "When commenting on others' projects, say something you like about it and offer suggestions.", + "guidelines.shareheader": "Share.", + "guidelines.sharebody": "You are free to remix projects, ideas, images, or anything else you find on Scratch – and anyone can use anything that you share. Be sure to give credit when you remix.", + "guidelines.privacyheader": "Keep personal info private.", + "guidelines.privacybody": "For safety reasons, don't use real names or post contact info like phone numbers or addresses.", + "guidelines.honestyheader": "Be honest.", + "guidelines.honestybody": "Don’t try to impersonate other Scratchers, spread rumors, or otherwise try to trick the community.", + "guidelines.friendlyheader": "Help keep the site friendly.", + "guidelines.friendlybody": "If you think a project or comment is mean, insulting, too violent, or otherwise inappropriate, click “Report” to let us know about it.", + "guidelines.footer": "Scratch welcomes people of all ages, races, ethnicities, religions, sexual orientations, and gender identities." +} From 09775ad4a5bdf055d10f7bf01b69b2a5aeff7bb0 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 29 Apr 2016 17:15:26 -0400 Subject: [PATCH 3/6] Squash and Merge --- src/views/guidelines/guidelines.jsx | 5 +++-- src/views/guidelines/guidelines.scss | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx index 00665c430..e210c1715 100644 --- a/src/views/guidelines/guidelines.jsx +++ b/src/views/guidelines/guidelines.jsx @@ -29,8 +29,9 @@ var Guidelines = React.createClass({
-

- sprites +

+ sprites
diff --git a/src/views/guidelines/guidelines.scss b/src/views/guidelines/guidelines.scss index d6a9fcc07..d9f894f7b 100644 --- a/src/views/guidelines/guidelines.scss +++ b/src/views/guidelines/guidelines.scss @@ -1,11 +1,16 @@ @import "../../colors"; @import "../../typography"; -.view { +#view { .guidelines-footer { text-align: center; - img { - margin: 0 auto; + margin-top: 1.5rem; + text-align: center; + } + + dl { + dt { + margin-top: 1.5rem; } } } From aaf4ee5b4954a75961b177260bee09e9be3b4127 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 29 Apr 2016 17:18:09 -0400 Subject: [PATCH 4/6] oops lol Gotta love those duplicate lines! --- src/views/guidelines/guidelines.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/guidelines/guidelines.scss b/src/views/guidelines/guidelines.scss index d9f894f7b..2eb0f33dc 100644 --- a/src/views/guidelines/guidelines.scss +++ b/src/views/guidelines/guidelines.scss @@ -5,7 +5,6 @@ .guidelines-footer { text-align: center; margin-top: 1.5rem; - text-align: center; } dl { From 64143704d561cfe03626de07242ce932a080ad74 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 29 Apr 2016 17:22:49 -0400 Subject: [PATCH 5/6] Thanks Travis Got rid of a trailing space --- src/views/guidelines/guidelines.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx index e210c1715..7b581e233 100644 --- a/src/views/guidelines/guidelines.jsx +++ b/src/views/guidelines/guidelines.jsx @@ -30,7 +30,7 @@ var Guidelines = React.createClass({

- sprites
From 20dcf8eb4fdb46bb0a9265326cd9e54be9ac2db1 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 29 Apr 2016 17:27:39 -0400 Subject: [PATCH 6/6] switch --- src/views/guidelines/guidelines.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/guidelines/guidelines.scss b/src/views/guidelines/guidelines.scss index 2eb0f33dc..ec6b10fe5 100644 --- a/src/views/guidelines/guidelines.scss +++ b/src/views/guidelines/guidelines.scss @@ -3,8 +3,8 @@ #view { .guidelines-footer { - text-align: center; margin-top: 1.5rem; + text-align: center; } dl {