Add to footer

sass · Aug 26, 2014 · d98f552 · d98f552
1 parent e0acbc6
commit d98f552
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 68 deletions.
diff --git a/source/community-guidelines.html.haml b/source/community-guidelines.html.haml
@@ -2,63 +2,6 @@
 title: "Community Guidelines"
 ---
 
-- content_for :complementary do
-  %h3 License
-
-  %p
-    Our friends at
-    = link_to "Ubuntu", "http://www.ubuntu.com/about/about-ubuntu/conduct"
-    and
-    = link_to "Drupal", "https://www.drupal.org/dcoc"
-    have already worked hard to develop their
-    own community guidelines, and we borrow heavily from them. However, we
-    have made modifications for our specific needs as a community.
-
-  %p
-    The Sass Community Guidelines are licensed under the
-    = succeed "." do
-      = link_to "Creative Commons Attribution-Share Alike 3.0 license", "https://creativecommons.org/licenses/by-sa/3.0/us/"
-    You may re-use it for your own project, and modify it as you wish, just
-    please allow others to use your modifications and give credit to Sass,
-    = succeed "," do
-      = link_to "Ubuntu", "http://www.ubuntu.com/about/about-ubuntu/conduct"
-    and
-    = succeed "." do
-      = link_to "Drupal", "https://www.drupal.org/dcoc"
-
-  %h3 Adherence to these Community&nbsp;Guidelines
-
-  %p
-    We ask that all in-person and virtual gatherings of the Sass Community
-    adhere to this code of conduct and take appropriate steps to create a safe
-    space for all attendees. This should include the publication of a Code of
-    Conduct that includes clear anti-harassment procedures. Please consult
-    with us if you feel the need to significant deviate from these guidelines
-    by sending an email to
-    :javascript
-      //<![CDATA[
-        <!--
-          var x="function f(x){var i,o=\"\",ol=x.length,l=ol;while(x.charCodeAt(l/13)!" +
-          "=92){try{x+=x;l+=l;}catch(e){}}for(i=l-1;i>=0;i--){o+=x.charAt(i);}return o" +
-          ".substr(0,ol);}f(\")65,\\\"#'-<6-s>,ban\\\"\\\\ldhd*uvepBxt720\\\\320\\\\t\\"+
-          "\\620\\\\720\\\\620\\\\330\\\\IT)700\\\\100\\\\720\\\\520\\\\120\\\\n\\\\20" +
-          "0\\\\M520\\\\730\\\\300\\\\700\\\\530\\\\n\\\\310\\\\n\\\\700\\\\C120\\\\22" +
-          "0\\\\100\\\\410\\\\~84/z516;020\\\\v710\\\\o4<;'9li620\\\\&$+#r\\\\d630\\\\" +
-          ";5)QKPQTy130\\\\KDWfo610\\\\FRUELX_420\\\\GF410\\\\@n\\\\200\\\\n\\\\600\\\\"+
-          "D330\\\\420\\\\700\\\\620\\\\$230\\\\620\\\\010\\\\610\\\\*3038`6,;?49q610\\"+
-          "\\l6*<%l*vk`)* 0*06nKPXQNYV\\\\\\\\\\\"(f};o nruter};))++y(^)i(tAedoCrahc.x" +
-          "(edoCrahCmorf.gnirtS=+o;721=%y;i=+y)65==i(fi{)++i;l<i;0=i(rof;htgnel.x=l,\\" +
-          "\"\\\"=o,i rav{)y,x(f noitcnuf\")"                                           ;
-          while(x=eval(x));
-        //-->
-      //]]>
-
-  %p
-    We understand and acknowledge that the "Sass Community" is a loosely
-    defined group of people who identify as Sass enthusiasts. We have no power
-    to actively remove someone from the community. Ultimately, we can only use
-    our voice to publicly declare that we do not agree with or endorse people
-    or organizations who don't act in the spirit of these&nbsp;guidelines.
 
 
 %p.introduction
@@ -149,3 +92,64 @@ title: "Community Guidelines"
   so in a way that minimizes disruption to the projects using their published
   work. They should tell people they are leaving and take the proper steps to
   ensure that others can pick up where they left off.
+
+
+
+- content_for :complementary do
+  %h3 License
+
+  %p
+    Our friends at
+    = link_to "Ubuntu", "http://www.ubuntu.com/about/about-ubuntu/conduct"
+    and
+    = link_to "Drupal", "https://www.drupal.org/dcoc"
+    have already worked hard to develop their
+    own community guidelines, and we borrow heavily from them. However, we
+    have made modifications for our specific needs as a community.
+
+  %p
+    The Sass Community Guidelines are licensed under the
+    = succeed "." do
+      = link_to "Creative Commons Attribution-Share Alike 3.0 license", "https://creativecommons.org/licenses/by-sa/3.0/us/"
+    You may re-use it for your own project, and modify it as you wish, just
+    please allow others to use your modifications and give credit to Sass,
+    = succeed "," do
+      = link_to "Ubuntu", "http://www.ubuntu.com/about/about-ubuntu/conduct"
+    and
+    = succeed "." do
+      = link_to "Drupal", "https://www.drupal.org/dcoc"
+
+  %h3 Adherence to these Community&nbsp;Guidelines
+
+  %p
+    We ask that all in-person and virtual gatherings of the Sass Community
+    adhere to this code of conduct and take appropriate steps to create a safe
+    space for all attendees. This should include the publication of a Code of
+    Conduct that includes clear anti-harassment procedures. Please consult
+    with us if you feel the need to significant deviate from these guidelines
+    by sending an email to
+    :javascript
+      //<![CDATA[
+        <!--
+          var x="function f(x){var i,o=\"\",ol=x.length,l=ol;while(x.charCodeAt(l/13)!" +
+          "=92){try{x+=x;l+=l;}catch(e){}}for(i=l-1;i>=0;i--){o+=x.charAt(i);}return o" +
+          ".substr(0,ol);}f(\")65,\\\"#'-<6-s>,ban\\\"\\\\ldhd*uvepBxt720\\\\320\\\\t\\"+
+          "\\620\\\\720\\\\620\\\\330\\\\IT)700\\\\100\\\\720\\\\520\\\\120\\\\n\\\\20" +
+          "0\\\\M520\\\\730\\\\300\\\\700\\\\530\\\\n\\\\310\\\\n\\\\700\\\\C120\\\\22" +
+          "0\\\\100\\\\410\\\\~84/z516;020\\\\v710\\\\o4<;'9li620\\\\&$+#r\\\\d630\\\\" +
+          ";5)QKPQTy130\\\\KDWfo610\\\\FRUELX_420\\\\GF410\\\\@n\\\\200\\\\n\\\\600\\\\"+
+          "D330\\\\420\\\\700\\\\620\\\\$230\\\\620\\\\010\\\\610\\\\*3038`6,;?49q610\\"+
+          "\\l6*<%l*vk`)* 0*06nKPXQNYV\\\\\\\\\\\"(f};o nruter};))++y(^)i(tAedoCrahc.x" +
+          "(edoCrahCmorf.gnirtS=+o;721=%y;i=+y)65==i(fi{)++i;l<i;0=i(rof;htgnel.x=l,\\" +
+          "\"\\\"=o,i rav{)y,x(f noitcnuf\")"                                           ;
+          while(x=eval(x));
+        //-->
+      //]]>
+
+  %p
+    We understand and acknowledge that the "Sass Community" is a loosely
+    defined group of people who identify as Sass enthusiasts. We have no power
+    to actively remove someone from the community. Ultimately, we can only use
+    our voice to publicly declare that we do not agree with or endorse people
+    or organizations who don't act in the spirit of these&nbsp;guidelines.
+
diff --git a/source/community.html.haml b/source/community.html.haml
@@ -24,14 +24,18 @@ title: "#teamSass"
       The Sass community is amazing. There are a number of
       [frameworks](#Frameworks) that make using Sass simple. Want try Sass in
       Node, Python, or another framework? Check out the
-      [libSass resources](/libsass).
+      [libSass&nbsp;resources](/libsass).
 
-  %li
-    :markdown
       Thinking of __contributing__  to Sass itself? We rely on everyone to
       keep Sass as stable as it is. Feel free to
       [submit a patch via pull request](#Contribute) to the Sass project.
 
+  %li
+    :markdown
+      __Everyone is welcome in the Sass community, except those who are
+      welcoming__. Please read and follow our
+      [community&nbsp;guidelines](/community-guidelines).
+
 
 %hr/
 

diff --git a/source/layouts/regions/_contentinfo.haml b/source/layouts/regions/_contentinfo.haml
@@ -14,9 +14,10 @@
 
         %li.contentinfo-tools
           %ul
-            %li= link_to "Sass Repo",    "https://github.com/sass/sass"
-            %li= link_to "Website Repo", "https://github.com/sass/sass-site"
-            %li= link_to "Style Guide",  "/styleguide"
+            %li= link_to "Sass Repo",            "https://github.com/sass/sass"
+            %li= link_to "Website Repo",         "https://github.com/sass/sass-site"
+            %li= link_to "Style Guide",          "/styleguide"
+            %li= link_to "Community Guidelines", "/community-guidelines"
 
         %li.contentinfo-social
           %a.twitter-follow-button(href="https://twitter.com/SassCSS" data-show-count="false" data-size="large") Follow @SassCSS

diff --git a/source/styleguide/brand.html.haml b/source/styleguide/brand.html.haml
@@ -2,18 +2,50 @@
 title: Brand Guidelines
 ---
 
-%h2 Logo Usage
+%h2 Brand Usage
 
-:markdown
-  * Do not stretch or distort the logo. Use the "seal" version of the logo
+%ul
+  %li
+    Do not stretch or distort the logo. Use the "seal" version of the logo
     when needing to use a square image (like avatars).
 
-  * Do not alter the color of the logo. The official logo color is `$hopbush`
+  %li
+    Do not alter the color of the logo. The official logo color is `$hopbush`
     (`#c69`).
 
-  * If you have to put the logo on a busy/colorful background, then you can
+  %li
+    If you have to put the logo on a busy/colorful background, then you can
     use one of the reversed (on white) logos, provided here.
 
+  %li
+    %p
+      When using the Sass brand and identity in your presentations, articles,
+      videos, or any other media, please be respectful. The Sass brand is
+      feminine and we love that. But our brand must never be used alongside
+      to sexist imagery. If you have questions about the images you want to
+      use, please feel free to contact us at:
+      = succeed "." do
+        :javascript
+          //<![CDATA[
+            <!--
+              var x="function f(x){var i,o=\"\",ol=x.length,l=ol;while(x.charCodeAt(l/13)!" +
+              "=92){try{x+=x;l+=l;}catch(e){}}for(i=l-1;i>=0;i--){o+=x.charAt(i);}return o" +
+              ".substr(0,ol);}f(\")65,\\\"#'-<6-s>,ban\\\"\\\\ldhd*uvepBxt720\\\\320\\\\t\\"+
+              "\\620\\\\720\\\\620\\\\330\\\\IT)700\\\\100\\\\720\\\\520\\\\120\\\\n\\\\20" +
+              "0\\\\M520\\\\730\\\\300\\\\700\\\\530\\\\n\\\\310\\\\n\\\\700\\\\C120\\\\22" +
+              "0\\\\100\\\\410\\\\~84/z516;020\\\\v710\\\\o4<;'9li620\\\\&$+#r\\\\d630\\\\" +
+              ";5)QKPQTy130\\\\KDWfo610\\\\FRUELX_420\\\\GF410\\\\@n\\\\200\\\\n\\\\600\\\\"+
+              "D330\\\\420\\\\700\\\\620\\\\$230\\\\620\\\\010\\\\610\\\\*3038`6,;?49q610\\"+
+              "\\l6*<%l*vk`)* 0*06nKPXQNYV\\\\\\\\\\\"(f};o nruter};))++y(^)i(tAedoCrahc.x" +
+              "(edoCrahCmorf.gnirtS=+o;721=%y;i=+y)65==i(fi{)++i;l<i;0=i(rof;htgnel.x=l,\\" +
+              "\"\\\"=o,i rav{)y,x(f noitcnuf\")"                                           ;
+              while(x=eval(x));
+            //-->
+          //]]>
+      Read our
+      = link_to "community&nbsp;guidelines", "/community-guidelines"
+      for more information.
+
 %p= link_to "Download vector logos", "/assets/img/styleguide/sass-logo.zip", class: "button primary"
 %p= partial "/styleguide/brand_license"