Merge branch 'master' of github.com:devopsdays/devopsdays-theme

Signed-off-by: Matt Stratton <[email protected]> # Conflicts: # config.codekit3
devopsdays · Jan 4, 2017 · 28ccdfd · 28ccdfd
2 parents c43dc34 + 1d7a87a
commit 28ccdfd
Show file tree

Hide file tree

Showing 8 changed files with 24,560 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ You will need to modify your watch command to use this new binary; use something
 Please submit your proposed changes as a Pull Request against this repository. If the PR will resolve an issue, please add `Fixes #123` to the PR.
 
 ## v3 Design
-The design and layout can be found in [here](https://drive.google.com/file/d/0BzljU_vIF4BoOHhLV2Yzd2xicEk/view?usp=sharing). A style guide will be added shortly.
+The design and layout can be found in [here](https://drive.google.com/file/d/0BzljU_vIF4BoOHhLV2Yzd2xicEk/view?usp=sharing). Please refer to the [Style Guide](https://github.com/devopsdays/devopsdays-theme/blob/master/STYLE.md) for all colors, fonts, and sizes of text elements, etc.
 
 ## Design Principles