diff --git a/srcd/superset/assets/src/uast/codemirror_override.less b/srcd/superset/assets/src/uast/codemirror_override.less new file mode 100644 index 00000000..05580d1e --- /dev/null +++ b/srcd/superset/assets/src/uast/codemirror_override.less @@ -0,0 +1,318 @@ +@import "../../stylesheets/less/cosmo/variables.less"; + +/* +Solarized theme for code-mirror +http://ethanschoonover.com/solarized +*/ + +/* +Solarized color palette +http://ethanschoonover.com/solarized/img/solarized-palette.png +*/ + +@font-face { + font-family: "Source Code Pro"; + src: url("../../stylesheets/fonts/SourceCodePro-Medium.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-Black.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-Bold.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-LightIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-Semibold.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-BoldIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-It.otf.woff2") format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-BlackIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-MediumIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-ExtraLight.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-ExtraLightIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-Light.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceCodePro-Regular.otf.woff2") + format("woff2"); +} + +.CodeMirror * { + font-family: "Source Code Pro", Monaco, Consolas, "Courier New", monospace; +} + +.solarized.base03 { + color: #002b36; +} +.solarized.base02 { + color: #073642; +} +.solarized.base01 { + color: #586e75; +} +.solarized.base00 { + color: #657b83; +} +.solarized.base0 { + color: #839496; +} +.solarized.base1 { + color: #93a1a1; +} +.solarized.base2 { + color: #eee8d5; +} +.solarized.base3 { + color: #fdf6e3; +} +.solarized.solar-yellow { + color: #b58900; +} +.solarized.solar-orange { + color: #cb4b16; +} +.solarized.solar-red { + color: #dc322f; +} +.solarized.solar-magenta { + color: #d33682; +} +.solarized.solar-violet { + color: #6c71c4; +} +.solarized.solar-blue { + color: #268bd2; +} +.solarized.solar-cyan { + color: #2aa198; +} +.solarized.solar-green { + color: #859900; +} + +/* Color scheme for code-mirror */ + +.cm-s-solarized { + line-height: 1.45em; + color-profile: sRGB; + rendering-intent: auto; +} +.cm-s-solarized.cm-s-dark { + color: #839496; + background-color: #002b36; + text-shadow: #002b36 0 1px; +} +.cm-s-solarized.cm-s-light { + background-color: #fdf6e3; + color: #657b83; + text-shadow: #eee8d5 0 1px; +} + +.cm-s-solarized .CodeMirror-widget { + text-shadow: none; +} + +.cm-s-solarized .cm-header { + color: #586e75; +} +.cm-s-solarized .cm-quote { + color: #93a1a1; +} + +.cm-s-solarized .cm-keyword { + color: #cb4b16; +} +.cm-s-solarized .cm-atom { + color: #d33682; +} +.cm-s-solarized .cm-number { + color: #d33682; +} +.cm-s-solarized .cm-def { + color: #2aa198; +} + +.cm-s-solarized .cm-variable { + color: #839496; +} +.cm-s-solarized .cm-variable-2 { + color: #b58900; +} +.cm-s-solarized .cm-variable-3, +.cm-s-solarized .cm-type { + color: #6c71c4; +} + +.cm-s-solarized .cm-property { + color: #2aa198; +} +.cm-s-solarized .cm-operator { + color: #6c71c4; +} + +.cm-s-solarized .cm-comment { + color: #586e75; + font-style: italic; +} + +.cm-s-solarized .cm-string { + color: #859900; +} +.cm-s-solarized .cm-string-2 { + color: #b58900; +} + +.cm-s-solarized .cm-meta { + color: #859900; +} +.cm-s-solarized .cm-qualifier { + color: #b58900; +} +.cm-s-solarized .cm-builtin { + color: #d33682; +} +.cm-s-solarized .cm-bracket { + color: #cb4b16; +} +.cm-s-solarized .CodeMirror-matchingbracket { + color: #859900; +} +.cm-s-solarized .CodeMirror-nonmatchingbracket { + color: #dc322f; +} +.cm-s-solarized .cm-tag { + color: #93a1a1; +} +.cm-s-solarized .cm-attribute { + color: #2aa198; +} +.cm-s-solarized .cm-hr { + color: transparent; + border-top: 1px solid #586e75; + display: block; +} +.cm-s-solarized .cm-link { + color: #93a1a1; + cursor: pointer; +} +.cm-s-solarized .cm-special { + color: #6c71c4; +} +.cm-s-solarized .cm-em { + color: #999; + text-decoration: underline; + text-decoration-style: dotted; +} +.cm-s-solarized .cm-error, +.cm-s-solarized .cm-invalidchar { + color: #586e75; + border-bottom: 1px dotted #dc322f; +} + +.cm-s-solarized.cm-s-dark div.CodeMirror-selected { + background: #073642; +} +.cm-s-solarized.cm-s-dark.CodeMirror ::selection { + background: rgba(7, 54, 66, 0.99); +} +.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, +.cm-s-dark .CodeMirror-line > span::-moz-selection, +.cm-s-dark .CodeMirror-line > span > span::-moz-selection { + background: rgba(7, 54, 66, 0.99); +} + +.cm-s-solarized.cm-s-light div.CodeMirror-selected { + background: #eee8d5; +} +.cm-s-solarized.cm-s-light .CodeMirror-line::selection, +.cm-s-light .CodeMirror-line > span::selection, +.cm-s-light .CodeMirror-line > span > span::selection { + background: #eee8d5; +} +.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, +.cm-s-ligh .CodeMirror-line > span::-moz-selection, +.cm-s-ligh .CodeMirror-line > span > span::-moz-selection { + background: #eee8d5; +} + +/* Editor styling */ + +/* Little shadow on the view-port of the buffer view */ +.cm-s-solarized.CodeMirror { + -moz-box-shadow: inset 7px 0 12px -6px #000; + -webkit-box-shadow: inset 7px 0 12px -6px #000; + box-shadow: inset 7px 0 12px -6px #000; +} + +/* Remove gutter border */ +.cm-s-solarized .CodeMirror-gutters { + border-right: 0; +} + +/* Gutter colors and line number styling based of color scheme (dark / light) */ + +/* Dark */ +.cm-s-solarized.cm-s-dark .CodeMirror-gutters { + background-color: #073642; +} + +.cm-s-solarized.cm-s-dark .CodeMirror-linenumber { + color: #586e75; + text-shadow: #021014 0 -1px; +} + +/* Light */ +.cm-s-solarized.cm-s-light .CodeMirror-gutters { + background-color: #eee8d5; +} + +.cm-s-solarized.cm-s-light .CodeMirror-linenumber { + color: #839496; +} + +/* Common */ +.cm-s-solarized .CodeMirror-linenumber { + padding: 0 5px; +} +.cm-s-solarized .CodeMirror-guttermarker-subtle { + color: #586e75; +} +.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { + color: #ddd; +} +.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { + color: #cb4b16; +} + +.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text { + color: #586e75; +} + +/* Cursor */ +.cm-s-solarized .CodeMirror-cursor { + border-left: 1px solid #819090; +} + +/* Fat cursor */ +.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { + background: #77ee77; +} +.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { + background-color: #77ee77; +} +.cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { + background: #586e75; +} +.cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { + background-color: #586e75; +} + +/* Active line */ +.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background { + background: rgba(255, 255, 255, 0.06); +} +.cm-s-solarized.cm-s-light .CodeMirror-activeline-background { + background: rgba(0, 0, 0, 0.06); +} diff --git a/srcd/superset/assets/src/uast/override.less b/srcd/superset/assets/src/uast/override.less index 95d2a94f..e9ed3f6e 100644 --- a/srcd/superset/assets/src/uast/override.less +++ b/srcd/superset/assets/src/uast/override.less @@ -1,4 +1,5 @@ -@import '../../stylesheets/less/cosmo/variables.less'; +@import "../../stylesheets/less/cosmo/variables.less"; +@import "codemirror_override.less"; body, html { @@ -29,3 +30,70 @@ html { .bblfsh-options__label { padding-top: 8px; } + +//== Typography +// +//## Font, line-height, and color for body text, headings, and more. + +@font-face { + font-family: "Source Sans Pro"; + src: url("../../stylesheets/fonts/SourceSansPro-Black.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-BlackIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-Bold.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-BoldIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-ExtraLight.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-ExtraLightIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-It.otf.woff2") format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-Light.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-LightIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-Semibold.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-SemiboldIt.otf.woff2") + format("woff2"); + src: url("../../stylesheets/fonts/SourceSansPro-Regular.otf.woff2") + format("woff2"); +} + +@font-family-sans-serif: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif; + +@font-family-serif: Georgia, "Times New Roman", Times, serif; +//** Default monospace fonts for ``, ``, and `
`.
+@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base: @font-family-sans-serif;
+
+@font-size-base: 16px;
+@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5: @font-size-base;
+@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base: 1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the ``.
+@headings-font-family: @font-family-base;
+@headings-font-weight: 300;
+@headings-line-height: 1.1;
+@headings-color: inherit;
+
+//== Typography overwrite
+
+body {
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+  font-size: 16px;
+}
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Black.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Black.otf.woff2
new file mode 100755
index 00000000..3d9d7a4e
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Black.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-BlackIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-BlackIt.otf.woff2
new file mode 100755
index 00000000..eee002b7
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-BlackIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Bold.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Bold.otf.woff2
new file mode 100755
index 00000000..45ee40a2
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Bold.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-BoldIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-BoldIt.otf.woff2
new file mode 100755
index 00000000..604e17d1
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-BoldIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-ExtraLight.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-ExtraLight.otf.woff2
new file mode 100755
index 00000000..1c2a3929
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-ExtraLight.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-ExtraLightIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-ExtraLightIt.otf.woff2
new file mode 100755
index 00000000..6405cf97
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-ExtraLightIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-It.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-It.otf.woff2
new file mode 100755
index 00000000..5702eba7
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-It.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Light.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Light.otf.woff2
new file mode 100755
index 00000000..8f784908
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Light.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-LightIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-LightIt.otf.woff2
new file mode 100755
index 00000000..45bbd58e
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-LightIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Medium.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Medium.otf.woff2
new file mode 100755
index 00000000..7dfd91c5
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Medium.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-MediumIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-MediumIt.otf.woff2
new file mode 100755
index 00000000..2ff7a0b2
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-MediumIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Regular.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Regular.otf.woff2
new file mode 100755
index 00000000..c10f38d3
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Regular.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Semibold.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Semibold.otf.woff2
new file mode 100755
index 00000000..b2b00d64
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-Semibold.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceCodePro-SemiboldIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-SemiboldIt.otf.woff2
new file mode 100755
index 00000000..a5d866e0
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceCodePro-SemiboldIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Black.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Black.otf.woff2
new file mode 100755
index 00000000..d6f4b60e
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Black.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-BlackIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-BlackIt.otf.woff2
new file mode 100755
index 00000000..c52b3c80
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-BlackIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Bold.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Bold.otf.woff2
new file mode 100755
index 00000000..7d7f34b9
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Bold.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-BoldIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-BoldIt.otf.woff2
new file mode 100755
index 00000000..4d14ef7f
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-BoldIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-ExtraLight.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-ExtraLight.otf.woff2
new file mode 100755
index 00000000..bdb21cb4
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-ExtraLight.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-ExtraLightIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-ExtraLightIt.otf.woff2
new file mode 100755
index 00000000..aee47e35
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-ExtraLightIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-It.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-It.otf.woff2
new file mode 100755
index 00000000..00e212c5
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-It.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Light.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Light.otf.woff2
new file mode 100755
index 00000000..2dd7ca3b
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Light.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-LightIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-LightIt.otf.woff2
new file mode 100755
index 00000000..5ee08bea
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-LightIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Regular.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Regular.otf.woff2
new file mode 100755
index 00000000..d76e3909
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Regular.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Semibold.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Semibold.otf.woff2
new file mode 100755
index 00000000..8c27c184
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-Semibold.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/fonts/SourceSansPro-SemiboldIt.otf.woff2 b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-SemiboldIt.otf.woff2
new file mode 100755
index 00000000..f963d781
Binary files /dev/null and b/srcd/superset/assets/stylesheets/fonts/SourceSansPro-SemiboldIt.otf.woff2 differ
diff --git a/srcd/superset/assets/stylesheets/less/custom-brand.less b/srcd/superset/assets/stylesheets/less/custom-brand.less
index cdcf6eaa..adb4ad81 100644
--- a/srcd/superset/assets/stylesheets/less/custom-brand.less
+++ b/srcd/superset/assets/stylesheets/less/custom-brand.less
@@ -18,37 +18,373 @@
  */
 // Forked Cosmo 3.3.7
 
-@brand-primary:         #00b491;
-@brand-secondary:       #8719cb;
-@brand-tertiary:       	#f89c30;
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
 
+@gray-base: #000;
+@gray-darker: lighten(@gray-base, 13.5%);
+@gray-dark: lighten(@gray-base, 20%);
+@gray: lighten(@gray-base, 33.5%);
+@gray-light: lighten(@gray-base, 70%);
+@gray-lighter: lighten(@gray-base, 95%);
+@brand-light-grey: #c9c9c9;
 
-.nav.navbar-nav .fa {
-	color: @brand-tertiary;
+@brand-primary: #00a699;
+@brand-success: #4ac15f;
+@brand-info: lighten(#2ab7ca, 15%);
+@brand-warning: #fed766;
+@brand-danger: #fe4a49;
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for ``.
+@body-bg: #f5f5f5;
+//** Global text color on ``.
+@text-color: @gray-dark;
+
+//** Global textual link color.
+@link-color: @brand-primary;
+//** Link hover color set via `darken()` function.
+@link-hover-color: darken(@link-color, 15%);
+//** Link hover decoration.
+@link-hover-decoration: underline;
+
+//== Soft-Branding
+
+@brand-primary: #00b491;
+@brand-secondary: #8719cb;
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+@font-face {
+  font-family: "Source Sans Pro";
+  src: url("../fonts/SourceSansPro-Black.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-BlackIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-Bold.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-BoldIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-ExtraLight.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-ExtraLightIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-It.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-Light.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-LightIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-Semibold.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-SemiboldIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceSansPro-Regular.otf.woff2") format("woff2");
+}
+
+@font-face {
+  font-family: "Source Code Pro";
+  src: url("../fonts/SourceCodePro-Medium.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-Black.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-Bold.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-LightIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-Semibold.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-BoldIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-It.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-BlackIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-MediumIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-ExtraLight.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-ExtraLightIt.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-Light.otf.woff2") format("woff2");
+  src: url("../fonts/SourceCodePro-Regular.otf.woff2") format("woff2");
+}
+
+@font-family-sans-serif: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+
+@font-family-serif: Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for ``, ``, and `
`.
+@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base: @font-family-sans-serif;
+
+@font-size-base: 16px;
+@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5: @font-size-base;
+@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base: 1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the ``.
+@headings-font-family: @font-family-base;
+@headings-font-weight: 300;
+@headings-line-height: 1.1;
+@headings-color: inherit;
+
+//== Typography overwrite
+
+body {
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+  font-size: 16px;
+}
+
+.table-condensed,
+.filterable-table-container * {
+  font-size: 14px !important;
+}
+
+h2 {
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+  font-size: @font-size-h2;
+  font-weight: 600;
+}
+
+h3 {
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+  font-size: @font-size-h3;
+  font-weight: 300;
+  position: relative;
+  margin-bottom: 22px;
+}
+
+.panel-default .panel-title {
+  border: none;
+  position: relative;
+}
+
+h3.panel-title {
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+  font-size: @font-size-h2;
+  font-weight: 600;
+  border: none !important;
+  width: auto;
+  margin-bottom: 42px;
+  padding-left: 8px;
+  padding-left: 0;
+}
+
+h4,
+h4.panel-title {
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+  font-size: @font-size-h2;
+  font-weight: 600;
+  border: none !important;
+  padding-left: 8px;
+  position: relative;
+  width: 90%;
+}
+
+.dashboard-component-header {
+  position: relative;
+  padding: 26px 0;
+
+  .fave-unfave-icon .fa-star,
+  .fave-unfave-icon .fa-star-o,
+  .fave-unfave-icon .fa-star-o:active,
+  .fave-unfave-icon .fa-star-o:hover,
+  .fave-unfave-icon .fa-star:active,
+  .fave-unfave-icon .fa-star:hover {
+    color: @brand-primary;
+  }
+}
+
+.dashboard-header {
+  padding-top: 24px;
+}
+
+.chart-header .header .editable-title input[type="button"] {
+  font-size: 22px;
+  font-weight: 100;
+}
+
+.chart-header span.editable-title {
+  font-size: 26px;
+  font-weight: 600;
+}
+
+.dashboard-header .dashboard-component-header {
+  font-weight: 600 !important;
+}
+
+.ace_editor {
+  font: 14px "Source Code Pro", Monaco, Consolas, "Courier New", monospace !important;
+  font-family: "Source Code Pro", Monaco, Consolas, "Courier New", monospace;
+  font-size: 14px !important;
+}
+
+.dropdown-menu {
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+  font-size: 16px;
+  background-color: #fff;
+  background-clip: padding-box;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 0.25rem;
+  min-width: 10rem;
+  padding: 1.25rem 0.75rem;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+
+  li {
+    padding-bottom: 0.35rem;
+  }
+}
+
+.btn-primary,
+.btn-default,
+.form-control,
+.select2-container .select2-choice,
+.select2-container-multi .select2-choices .select2-search-field input,
+.button-container button,
+.button-container .menu li a,
+.form-actions-container button,
+.form-actions-container .menu li a,
+.dropdown-menu li a,
+.dashboard .chart-header .dropdown-menu li a,
+.dashboard .dashboard-header .dropdown-menu li a {
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+  font-size: 16px !important;
+  font-weight: 300;
+  letter-spacing: 0 !important;
+}
+
+.panel.panel-primary .panel-title {
+  margin-bottom: 32px;
+}
+
+.label,
+.label[style] {
+  font-size: 16px !important;
+}
+
+.dashboard .chart-header .dropdown-menu li a span,
+.dashboard .dashboard-header .dropdown-menu li a span {
+  letter-spacing: 0 !important;
+}
+
+//==Nav Bar
+
+.nav.navbar-nav .caret:before {
+  content: "\f0d7";
+  font-size: 14px;
+}
+
+.navbar-inverse .navbar-nav > li > a {
+  color: #000;
+
+  .fa {
+    color: @brand-light-grey;
+  }
+}
+
+.navbar b.caret {
+  vertical-align: -1px;
+}
+
+.navbar .f16 .flag {
+  vertical-align: -3px;
+}
+
+.dashboard .dashboard-header #save-dash-split-button {
+  height: 36px !important;
+  width: 34px !important;
+}
+
+.dashboard .dashboard-header #save-dash-split-button .caret {
+  padding-top: 4px;
+}
+
+.navbar-header {
+  padding: 6px 9px;
+}
+
+.navbar-collapse.collapse {
+  padding: 6px 9px;
 }
 
 .nav.navbar-nav.navbar-right .btn-primary .fa {
-	color: #fff;
+  color: #fff;
+}
+
+.navbar-inverse .navbar-nav > li.dropdown > a,
+.navbar-inverse .navbar-nav > li > a {
+  margin-bottom: -16px;
+  padding-bottom: 23px;
+}
+
+.navbar-inverse .navbar-nav > li.active > a,
+.navbar-inverse .navbar-nav > li.active > a:hover {
+  border-bottom: 3px solid @brand-secondary;
+  margin-bottom: -16px;
+  padding-bottom: 23px;
+
+  i {
+    color: @brand-secondary;
+  }
 }
 
-.navbar-inverse .navbar-nav > li > a:focus,
-.navbar-inverse .navbar-nav > li.active > a {
+.navbar-inverse .navbar-nav > li > a:hover,
+.navbar-inverse .navbar-nav > li > a:focus {
+  border-bottom: 3px solid @brand-primary;
+  margin-bottom: -16px;
+  padding-bottom: 24px;
+
+  i {
+    color: @brand-primary;
+  }
+}
+
+.navbar-inverse .navbar-nav > li > a.dropdown-toggle {
+  padding-bottom: 23px;
+}
+
+.navbar-inverse .navbar-nav > li.dropdown > a:focus {
+  border-bottom: 3px solid @brand-primary;
+  margin-bottom: -16px;
+  padding-bottom: 23px;
+}
+
+.navbar-inverse .navbar-nav > li.dropdown-menu.active > a.dropdown-toggle,
+.navbar-inverse .navbar-nav > li.dropdown.active > a.dropdown-toggle,
+.navbar-inverse .navbar-nav > li.dropdown-menu.active > a.dropdown-toggle:hover,
+.navbar-inverse .navbar-nav > li.dropdown.active > a.dropdown-toggle:hover,
+.navbar-inverse .navbar-nav > li.dropdown-menu.active > a.dropdown-toggle:focus,
+.navbar-inverse .navbar-nav > li.dropdown.active > a.dropdown-toggle:focus {
   border-bottom: 3px solid @brand-secondary;
- }
+  margin-bottom: -16px;
+  padding-bottom: 24px;
+
+  i {
+    color: @brand-secondary;
+  }
+}
 
 .nav.navbar-nav.navbar-right .btn-primary,
 .nav.navbar-nav.navbar-right .btn.btn-primary {
-  background-color: @brand-tertiary !important;
-  border-color: @brand-tertiary;
+  background-color: @brand-primary;
+  color: #fff;
+  border: none;
+  text-transform: uppercase;
+  padding: 0.35rem 4rem 0.35rem 2.25rem;
+  font-weight: 600;
+  font-size: 14px !important;
+
+  i:before {
+    content: "\F0D7";
+    font-size: 14px;
+    color: #fff;
+    position: relative;
+    left: 45px;
+  }
 }
 
 .nav.navbar-nav.navbar-right .btn-primary:hover,
 .nav.navbar-nav.navbar-right .btn.btn-primary:hover {
-  background-color: darken(@brand-tertiary, 5%);
+  background-color: darken(@brand-primary, 3%);
 }
 
-
-.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
-  border-top: 3px solid @brand-secondary;
+.table th a {
+  display: inline-block;
+  margin-right: 20px;
 }
- 
\ No newline at end of file