From d9370c77ae3ae9341aaa31a7437288e1d76b5da4 Mon Sep 17 00:00:00 2001 From: procload Date: Wed, 7 Jan 2015 11:02:10 -0500 Subject: [PATCH 1/3] Begin to translate codeguide for F52 --- _config.yml | 4 ++-- _includes/footer.html | 22 +++------------------- _includes/header.html | 5 ++--- _includes/js.html | 15 --------------- _layouts/default.html | 12 +----------- index.html | 25 ++++++++++++++++++++++++- 6 files changed, 32 insertions(+), 51 deletions(-) delete mode 100644 _includes/js.html diff --git a/_config.yml b/_config.yml index f313f10e..b1905a96 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ -name: Code Guide by @mdo -description: Standards for developing flexible, durable, and sustainable HTML and CSS. +name: Code Guide by Food52 +description: Standards for developing flexible, durable, and sustainable HTML, CSS and SCSS. url: http://codeguide.co markdown: rdiscount diff --git a/_includes/footer.html b/_includes/footer.html index 8f1858ca..48c4e444 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,22 +1,6 @@ diff --git a/_includes/header.html b/_includes/header.html index 20bfdc24..a136b77a 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -5,14 +5,13 @@

{{ site.name }}

{{ site.description }}

- + - +

- diff --git a/_includes/js.html b/_includes/js.html deleted file mode 100644 index 531643e3..00000000 --- a/_includes/js.html +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/_layouts/default.html b/_layouts/default.html index c6466296..a2ee1b16 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -12,15 +12,7 @@ - - + @@ -30,7 +22,5 @@ {% include footer.html %} - {% include js.html %} - diff --git a/index.html b/index.html index efa6b0b9..8872d2f7 100644 --- a/index.html +++ b/index.html @@ -40,13 +40,30 @@

CSS

  • Organization
    • +
    +

    SCSS

    + +

    Golden rule

    -

    Enforce these, or your own, agreed upon guidelines at all times. Small or large, call out what's incorrect. For additions or contributions to this Code Guide, please open an issue on GitHub.

    +

    Enforce these, or your own, agreed upon guidelines at all times. Small or large, call out what's incorrect.

    @@ -394,6 +411,10 @@

    Organization

    +
    +

    SCSS

    +
    +

    Editor preferences

    @@ -407,3 +428,5 @@

    Editor preferences

    Consider documenting and applying these preferences to your project's .editorconfig file. For an example, see the one in Bootstrap. Learn more about EditorConfig.

    + + From 734867758ce79d6f0dd35b93b2c9bb013b3ef4eb Mon Sep 17 00:00:00 2001 From: procload Date: Wed, 7 Jan 2015 11:10:21 -0500 Subject: [PATCH 2/3] Adds SCSS example --- _includes/scss/nesting.scss | 26 ++++++++++++++++++++++++++ index.html | 18 ++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 _includes/scss/nesting.scss diff --git a/_includes/scss/nesting.scss b/_includes/scss/nesting.scss new file mode 100644 index 00000000..51de205e --- /dev/null +++ b/_includes/scss/nesting.scss @@ -0,0 +1,26 @@ +// Bad example +.component { + color: #333; + + .component-piece { + background: #fff; + + .component-subpiece { + border: 5px solid #555; + } + } +} + + +// Good example +.component { + color: #333; + + .component-piece { + background: #fff; + } + + .component-subpiece { + border: 5px solid #555; + } +} diff --git a/index.html b/index.html index 8872d2f7..10fe186c 100644 --- a/index.html +++ b/index.html @@ -415,6 +415,24 @@

    Organization

    SCSS

    +
    +
    +

    Nesting

    +
      +
    • Avoid nesting selectors greater than 3 levels deep
      • +
    +

    Additional reading:

    + +
    +
    + {% highlight scss %}{% include scss/nesting.scss %}{% endhighlight %} +
    +
    + +

    Editor preferences

    From b7da9e97977ffc56a4ce8cd624d031af7aa11742 Mon Sep 17 00:00:00 2001 From: procload Date: Wed, 7 Jan 2015 11:11:21 -0500 Subject: [PATCH 3/3] Updates navigation for SCSS --- index.html | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/index.html b/index.html index 10fe186c..55e14d1d 100644 --- a/index.html +++ b/index.html @@ -43,18 +43,7 @@

    CSS

    SCSS

    @@ -421,11 +410,6 @@

    Nesting

    • Avoid nesting selectors greater than 3 levels deep
    -

    Additional reading:

    -
    {% highlight scss %}{% include scss/nesting.scss %}{% endhighlight %}