Merge pull request #57 from uclaacm/dev

styleguide v3.0 !!!!!
uclaacm · Nov 14, 2020 · ca4d25b · ca4d25b
2 parents dbe31c2 + 8f0a76e
commit ca4d25b
Show file tree

Hide file tree

Showing 296 changed files with 7,180 additions and 1,210 deletions.
diff --git a/.eleventy.js b/.eleventy.js
@@ -31,10 +31,10 @@ module.exports = function (eleventyConfig) {
     let options = {
         html:true, 
         breaks: true,
-        linkify: true
+        linkify: true,
     };
 
-    let md_lib = md_it(options).use(md_attr);
+    let md_lib = md_it(options).use(md_attr).disable('code');
     eleventyConfig.setLibrary("md", md_lib);
 
     eleventyConfig.addFilter('jsonify', function (variable) {

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
-node_modules
+.DS_Store
 _site
-package-lock.json
+css/
+css/master.css
+node_modules/
+package-lock.json
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "assets/WestwoodSans"]
+	path = assets/WestwoodSans
+	url = https://github.com/uclaacm/Westwood_Sans.git