Moved solid docs to /docs directory (#411)

Author: samthurman

.gitignore

@@ -5,8 +5,7 @@
 .sass-cache/
 
 # ignore generated site
-_site/
-_deploy/
+_docs/.tmp/
 
 # ignore node modules
 node_modules/

.scss-lint.yml

@@ -9,7 +9,7 @@ Coming soon!
 
 ## Getting Started
 
-### 1. Set Up 
+### 1. Set Up
 
 You must have an account with [Github](https://github.com/) and [git](https://help.github.com/articles/set-up-git/) must be installed on your computer.
 
@@ -20,15 +20,15 @@ Before you can access any BuzzFeed repos, you will need to [generate an SSH key]
 
 ### 2. Fork the Repo Locally
 
-Visit <https://github.com/buzzfeed/solid> and click the fork button. 
+Visit <https://github.com/buzzfeed/solid> and click the fork button.
 
 Next, clone this fork down to your local PC.
 
-### 3. Check Out a New Branch 
+### 3. Check Out a New Branch
 
-Each time you address a new feature or bug fix, it is best to create a new branch with a descriptive name. That way, it's easy to pause one task and switch to another. 
+Each time you address a new feature or bug fix, it is best to create a new branch with a descriptive name. That way, it's easy to pause one task and switch to another.
 
-This also simplifies our process of tracking contributions to the master code base. 
+This also simplifies our process of tracking contributions to the master code base.
 
 ```
 $ git branch my-feature-or-bug-branch
@@ -64,7 +64,7 @@ The first step is to create a [“remote”](https://help.github.com/articles/ad
 $ git remote add origin git://github.com/buzzfeed/solid.git
 ````
 
-Fetch and merge updates: 
+Fetch and merge updates:
 
 `IS THIS CORRECT? ⤵`
 
@@ -83,7 +83,7 @@ $ git push origin my-feature-or-bug-branch
 
 ### 8. Submit a Pull Request
 
-Once you're ready to submit your feature or bug, go to your fork on the web (<https://github.com/YOUR_GITHUB_USERNAME/solid>), and click the **Pull Requests** nav item at the top right. 
+Once you're ready to submit your feature or bug, go to your fork on the web (<https://github.com/YOUR_GITHUB_USERNAME/solid>), and click the **Pull Requests** nav item at the top right.
 
 Next, click the green **New pull request** button and select the following from the dropdowns:
 
@@ -98,7 +98,7 @@ You should add a concise descriptive comment about what is in this merge, and th
 
 ### 9. A Note on Merging
 
-Because of Github permissioning on BuzzFeed repos, it *might* be possible for you to merge your own Pull Request. **Please don't do this!** Always reach out to someone in #solid-prs to merge your PR into develop.
+Because of Github permissions on BuzzFeed repos, it *might* be possible for you to merge your own Pull Request. **Please don't do this!** Always reach out to someone in #solid-prs to merge your PR into develop.
 
 # Deprecating Code
 
@@ -110,4 +110,4 @@ To deprecate SCSS, move the old classes to the very bottom of the SCSS file. Use
 .deprecated-class {
     color: #000;
 }
-````
+````

CONTRIBUTING.md

@@ -35,14 +35,6 @@ Open the site in your web browser:
 
 <http://localhost:9000/>
 
-## Linting
-
-We use scss lint to keep our scss clean and consistent.
-
-To run scss_lint:
-
-`scss-lint scss/`
-
 ## Code Snippets
 
 To add code snippets/highlighted syntax to pages in solid, wrap your markup inside <%= ' ' %>

DEVELOPING.md

@@ -13,7 +13,8 @@ module.exports = function(grunt) {
     sass: {
       lib: {
         options: {
-          sourceMap: false
+          sourceMap: false,
+          includePaths: ['_lib']
         },
         files: [
           {
@@ -47,6 +48,17 @@ module.exports = function(grunt) {
              cwd: '_lib/',
              expand: true
          }]
+      },
+      build: {
+         options: {
+             archive: 'docs/_dist/solid-docs.zip',
+             mode: 'zip'
+         },
+         files: [{
+             src: ['**/*'],
+             cwd: 'docs/.tmp/_site/',
+             expand: true
+         }]
       }
     },
     copy: {
@@ -73,6 +85,7 @@ grunt.loadNpmTasks('grunt-contrib-copy');
 grunt.registerTask('compile_lib', ['sass:lib']);
 grunt.registerTask('minify_lib', ['cssnano:lib']);
 grunt.registerTask('latest_solid', ['copy:latest']);
+grunt.registerTask('zip_build', ['compress:build']);
 grunt.registerTask('zip_lib', ['compress:lib']);
 
 }

Gruntfile.js

@@ -19,8 +19,15 @@ modules: ruby_gems node_modules
 ruby_gems:
 	bundle install --path=$(BUNDLE_PATH) --clean $(BUNDLE_ARGS)
 
-# deploy site to s3 bucket
-deploy: build_deploy s3
+# compile binaries for download
+# * executed on build
+# * not re-run by jekyll serve
+dist: build
+	grunt zip_build
+	grunt compile_lib
+	grunt minify_lib
+	grunt latest_solid
+	grunt zip_lib
 
 # clean out generated files
 clean:
@@ -29,28 +36,15 @@ clean:
 
 # run the jekyll server
 run:
-	bundle exec jekyll serve
+	(cd docs/ && bundle exec jekyll serve)
 
 # build static site into _site
 build:
-	bundle exec jekyll build
+	(cd docs/ && bundle exec jekyll build)
 
 # build static site into _deploy
 build_deploy:
-	bundle exec jekyll build --destination _deploy
-
-# compile binaries for download
-# * executed on build
-# * not re-run by jekyll serve
-dist:
-	grunt compile_lib
-	grunt minify_lib
-	grunt latest_solid
-	grunt zip_lib
-
-# deploy to s3 bucket
-s3:
-	rsync -crvze ssh --delete _deploy/ solid.buzzfeed.com:/var/www/solid.buzzfeed.com/
+	(cd docs/ && bundle exec jekyll build --destination .tmp/_deploy)
 
 # install node modules from npm-shrinkwrap.json
 node_modules: