Merge branch 'master' into docs

Author: justinbmeyer

prettify-variables.less

@@ -0,0 +1,61 @@
+/**
+ * @stylesheet prettify-variables.less Prettify Variables
+ * @parent bit-docs/theme
+ *
+ * @description Variables to customize code highlighting.
+ * 
+ * @body
+ *
+ * Copy these variables into your theme's variables.less to modify.
+ */
+
+/**
+ * @styles color-palette Color Palette
+ *
+ * @description
+ * Variables used to define the site's color palette.
+ * @iframe demos/color-palette.html 630
+ */
+@darkSkies: #484848;
+@haze: #cccccc;
+@fog: #eae9e9;
+@clear: #ffffff;
+@sunrise: #f7f8c3;
+
+
+// Variables used to define color on text elements.
+
+@colorCode: @sunrise;
+
+
+// Variables used to set the color on code syntax.
+
+@str-color: #dd1144;
+@kwd-color: #333333;
+@com-color: #999988;
+@type-color: #445588;
+@lit-color: #445588;
+@pun-color: #333333;
+@opn-color: #333333;
+@clo-color: #333333;
+@tag-color: #navy;
+@atn-color: #teal;
+@atv-color: #dd1144;
+@dec-color: #333333;
+@var-color: #teal;
+@fun-color: #990000;
+
+
+// Variables used to set the color for print or projection.
+
+@str-color-pp: #006600;
+@kwd-color-pp: #006;
+@com-color-pp: #600;
+@typ-color-pp: #404;
+@lit-color-pp: #004444;
+@pun-color-pp: #444400;
+@opn-color-pp: #444400;
+@clo-color-pp: #444400;
+@tag-color-pp: #006;
+@atn-color-pp:  #440044;
+@atv-color-pp: #006600;

prettify.js

@@ -19,7 +19,7 @@ module.exports = function(){
     for(var i = 0; i < codes.length; i ++){
         var code = codes[i];
         if(code.parentNode.nodeName.toUpperCase() === "PRE"){
-            code.className = code.className +" prettyprint";
+            code.parentNode.className = code.parentNode.className + " prettyprint";
         }
     }
     //turn off batching (https://github.com/google/code-prettify/blob/master/src/prettify.js#L142)

prettify.less

@@ -1,3 +1,6 @@
+@import "locate://bit-docs-prettify/prettify-variables.less";
+
+// allow user theme to override variables
 @import "locate://bit-docs-site/styles/variables.less";
 
 /**
@@ -61,132 +64,127 @@
  * ```
  */
 code {
-	background-color: @colorCode;
-  border-radius: 5px;
   padding: 0 5px;
+  border-radius: 5px;
+  background-color: @colorCode;
 }
+
 pre, code, pre *, code * {
-	font-family: "Courier New", Courier, mono;
-  font-style: normal;
   font-weight: 300;
+  font-style: normal;
+  font-family: "courier new", courier, mono;
 }
+
 pre {
-  background-color: @clear;
-  border: 1px solid @haze;
+  overflow: auto;
   border-radius: 5px;
-  margin: 0;
-  margin-bottom: 20px;
-  vertical-align: top;
-  overflow:auto;
   padding: 10px 20px;
+  vertical-align: top;
+  border: 1px solid @haze;
+  background-color: @clear;
 
-  code{
-  	font-size: 14px;
-  	line-height: 16px;
-  	letter-spacing: 0px;
-  	background-color: transparent;
+  code {
+    font-size: 14px;
+    line-height: 16px;
+    letter-spacing: 0px;
+    padding: 0 !important;
+    background-color: transparent;
   }
 
   ol {
-  	margin: 0 0 0 40px;
-  	padding: 0;
-
-  	li {
-  		text-indent: 0;
-  		color: @darkSkies;
-  		background-color: @clear;
-  		margin: 0;
-  		list-style: decimal;
-  	}
+    padding: 0;
+    font-size: 14px;
+    margin: 0 0 0 40px;
+
+    li {
+      margin: 0;
+      text-indent: 0;
+      color: @darkSkies;
+      list-style: decimal;
+      background-color: @clear;
+    }
   }
 }
 
-  /* Tomorrow Theme */
-  /* Original theme - https://github.com/chriskempson/tomorrow-theme */
-  /* Pretty printing styles. Used with prettify.js. */
-  /* SPAN elements with the classes below are added by prettyprint. */
-  /* plain text */
-
-code.prettyprint {
-    padding:0 !Important;
-}
+// Tomorrow Theme (https://github.com/chriskempson/tomorrow-theme)
 
 .pln {
   color: @darkSkies;
 }
 
 @media screen {
-  /* string content */
+  // string content
   .str {
-    color:@str-color;
+    color: @str-color;
   }
 
-  /* a keyword */
+  // a keyword
   .kwd {
-    color:@kwd-color;
+    color: @kwd-color;
   }
 
-  /* a comment */
+  // a comment
   .com {
     color: @com-color;
   }
 
-  /* a type name */
+  // a type name
   .typ {
     color: @type-color;
   }
 
-  /* a literal value */
+  // a literal value
   .lit {
     color: @lit-color;
   }
 
-  /* punctuation */
+  // punctuation
   .pun {
     color: @pun-color;
   }
 
-  /* lisp open bracket */
+  // lisp open bracket
   .opn {
     color: @opn-color;
   }
 
-  /* lisp close bracket */
+  // lisp close bracket
   .clo {
     color: @clo-color;
   }
 
-  /* a markup tag name */
+  // a markup tag name
   .tag {
     color: @tag-color;
   }
 
-  /* a markup attribute name */
+  // a markup attribute name
   .atn {
     color: @atn-color;
   }
 
-  /* a markup attribute value */
+  // a markup attribute value
   .atv {
     color: @atv-color;
   }
 
-  /* a declaration */
+  // a declaration
   .dec {
     color: @dec-color;
   }
 
-  /* a variable name */
+  // a variable name
   .var {
     color: @var-color;
   }
 
-  /* a function name */
+  // a function name
   .fun {
     color: @var-color;
   }
 }
-  /* Use higher contrast and text-weight for printable form. */
+
+// increase contrast and text-weight for print/projection
 @media print, projection {
   .str {
     color: @str-color-pp;
@@ -208,7 +206,7 @@ code.prettyprint {
   }
 
   .lit {
-    color:@lit-color-pp;
+    color: @lit-color-pp;
   }
 
   .pun, .opn, .clo {
@@ -228,45 +226,28 @@ code.prettyprint {
     color: @atv-color-pp;
   }
 }
-  /* Style */
-pre.prettyprint {
-  //background: @pp-bg;
-  font-family: Menlo, "Bitstream Vera Sans Mono", "DejaVu Sans Mono", Monaco, Consolas, monospace;
-  font-size: 14px;
-  border: 1px solid @haze;
-  padding: 10px;
-}
 
-pre.prettyprint ol {
-  font-size: 14px;
-  margin-bottom: 0px;
-}
-
-  /* Specify class=linenums on a pre to get line numbering */
+// specify class=linenums on a pre to get line numbering
 ol.linenums {
   margin-top: 0;
   margin-bottom: 0;
 }
 
-  /* IE indents via margin-left */
-li.L0,
-li.L1,
-li.L2,
-li.L3,
-li.L4,
-li.L5,
-li.L6,
-li.L7,
-li.L8,
-li.L9 {
-  /* */
-}
-
-  /* Alternate shading for lines */
-li.L1,
-li.L3,
-li.L5,
-li.L7,
-li.L9 {
-  /* */
-}
+// ie indents via margin-left
+li.l0,
+li.l1,
+li.l2,
+li.l3,
+li.l4,
+li.l5,
+li.l6,
+li.l7,
+li.l8,
+li.l9 {}
+
+// alternate shading for lines
+li.l1,
+li.l3,
+li.l5,
+li.l7,
+li.l9 {}