Merge branch 'gh-pages-staging' into gh-pages

GSA · Aug 19, 2016 · 7effc0c · 7effc0c
2 parents 9ee52ee + 1b9041d
commit 7effc0c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/_site-assets/css/styleguide.scss b/_site-assets/css/styleguide.scss
@@ -1085,6 +1085,24 @@ code {
 code[class*="language-"],
 pre[class*="language-"] {
   color: $color-base;
+  background-color: transparent;
+}
+
+.usa-accordion-content {
+  &.usa-code-sample {
+    padding: 1em;
+  }
+  pre, code
+  {
+    background: none;
+    font-size: 1.2rem;
+    padding: 0;
+  }
+  pre {
+    [class*="language-"] {
+      margin-top: 0;
+         }
+       }
 }
 // scss-lint:enable QualifyingElement
 

diff --git a/_site-assets/js/start.js b/_site-assets/js/start.js
@@ -1,5 +1,6 @@
 'use strict';
 
+require('./vendor/prismjs/prism.js');
 require('./vendor/uswds/start.js');
 
 var $ = require('jquery');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "samwds",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Open source UI components and visual style guide for the System for Award Management environment.",
   "main": "src/js/start.js",
   "scripts": {