ascribe fonts

first cut layout spinner
2024-12-22 09:23:13 +01:00 · 2015-10-08 11:12:15 +02:00 · 2015-10-08 11:12:15 +02:00 · 71988d502d
commit 71988d502d
parent 9d871c2d37
16 changed files with 482 additions and 68 deletions
--- a/fonts/ascribe-logo-v2.eot
+++ b/fonts/ascribe-logo-v2.eot
--- a/fonts/ascribe-logo-v2.svg
+++ b/fonts/ascribe-logo-v2.svg
@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="ascribe-logo-v2" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe800;" glyph-name="ascribe-logo" horiz-adv-x="4195" d="M499.718 326.19c0 109.528-24.641 157.448-61.607 198.517-38.336 41.077-95.832 71.191-191.673 71.191-95.832 0-171.135-36.957-212.212-64.34l27.382-52.031c13.695 10.954 88.998 54.764 187.571 54.764 99.943 0 177.978-57.505 177.978-173.876v-34.225l-173.876-6.843c-171.135-6.852-253.281-82.146-253.281-191.673s88.989-191.674 212.212-191.674c123.214 0 191.674 75.294 214.944 102.676v-88.989h72.562v376.503zM427.156 113.978c-30.114-47.92-98.573-116.371-201.258-116.371-102.676 0-154.707 61.607-154.707 130.066 0 68.45 42.448 125.955 175.246 132.798l180.719 10.955v-157.448zM1063.784 123.562c0 120.482-119.12 161.551-198.525 188.933-78.035 27.382-146.494 56.134-146.494 121.853s50.661 101.314 121.853 101.314c71.191 0 115.001-24.641 158.819-72.561l43.809 43.809c-49.291 56.134-106.795 88.989-199.887 88.989-93.1 0-193.044-54.764-193.044-169.765s119.112-156.078 173.876-175.246c54.764-19.168 168.394-47.92 168.394-130.066s-69.821-120.482-149.226-120.482c-79.413 0-142.391 39.707-183.46 99.952l-50.661-41.077c39.707-65.718 113.639-123.215 231.38-123.215s223.166 68.451 223.166 187.562v0zM1679.873 93.44c0 0-68.451-93.1-212.212-93.1-143.753 0-242.326 113.639-242.326 271.087s112.268 260.132 239.594 260.132c125.955 0 180.719-61.616 208.101-93.1l45.18 47.912c-13.687 17.798-82.146 109.528-250.548 109.528-167.024 0-317.628-132.798-317.628-328.583 0-194.406 139.65-331.315 310.785-331.315s236.853 82.146 260.133 109.528l-41.077 47.912zM2142.607 586.323c0 0-27.382 9.576-68.45 9.576-68.459 0-138.28-43.81-161.551-130.058v119.112h-71.2v-635.266h71.2v342.278c0 109.528 34.225 162.921 45.18 177.978 10.946 15.066 47.912 57.505 109.528 57.505 34.225 0 53.394-5.473 68.451-10.955l6.843 69.83zM2353.432 810.851c0 32.855-26.012 58.875-58.867 58.875-32.863 0-58.875-26.020-58.875-58.875s26.011-58.875 58.875-58.875c32.855 0 58.867 26.020 58.867 58.875v0zM2330.161 584.953h-71.191v-635.266h71.191v635.266zM3144.767 267.315c0 188.941-123.223 328.583-312.155 328.583-91.73 0-177.987-36.957-239.594-132.798v431.267h-71.191v-944.68h71.191v120.482c53.394-93.1 141.012-134.169 236.853-134.169 191.673 0 314.896 143.753 314.896 331.315v0zM3069.464 267.315c0-146.494-86.257-266.976-239.594-266.976-154.707 0-239.594 120.482-239.594 266.976 0 147.864 84.887 266.976 239.594 266.976 153.337 0 239.594-119.112 239.594-266.976v0zM3836.158 298.808c0 171.135-120.482 297.090-287.514 297.090-168.402 0-308.044-132.798-308.044-328.583 0-194.406 119.112-331.315 303.933-331.315 184.83 0 264.244 95.833 264.244 95.833l-34.234 50.661c0 0-79.405-82.154-223.158-82.154-143.761 0-228.64 99.952-235.491 250.548h516.154c0 0 4.111 27.382 4.111 47.92v0zM3318.633 312.495c4.111 88.998 68.459 221.796 225.899 221.796 157.449 0 219.065-139.65 219.065-221.796h-444.963zM4027.755 897.194h-26.663l-88.15-217.077h31.998l22.269 56.468h92.852l22.277-56.468h33.874l-88.457 217.077zM3975.68 761.989l37.96 97.245 37.951-97.245h-75.91zM4195.326 778.878c0 101.246-79.876 181.122-181.121 181.122s-181.122-79.876-181.122-181.122c0-101.245 79.876-181.122 181.122-181.122s181.121 79.876 181.121 181.122v0zM4173.452 778.878c0-87.002-72.254-159.247-159.247-159.247-87.002 0-159.246 72.245-159.246 159.247s72.244 159.247 159.246 159.247c86.993 0 159.247-72.245 159.247-159.247v0z" />
+</font></defs></svg>
--- a/fonts/ascribe-logo-v2.ttf
+++ b/fonts/ascribe-logo-v2.ttf
--- a/fonts/ascribe-logo-v2.woff
+++ b/fonts/ascribe-logo-v2.woff
--- a/index.html
+++ b/index.html
@ -41,6 +41,12 @@
            <% DEBUG && print('window.DEBUG = true'); %>
            <% DEBUG && print('window.CREDENTIALS = \'' + CREDENTIALS + '\''); %>
        </script>
+        <!-- Typekit gibson font -->
+        <script src="https://use.typekit.net/gma2yhj.js"></script>;
+        <script>
+            try {Typekit.load({ async: true });}
+            catch(e){}
+        </script>
    </head>
    <body>
        <div id="main"></div>
--- a/js/components/ascribe_spinner.js
+++ b/js/components/ascribe_spinner.js
@ -0,0 +1,29 @@
+'use strict';
+
+import React from 'react';
+import classNames from 'classnames';
+
+let AscribeSpinner = React.createClass({
+    propTypes: {
+        size: React.PropTypes.oneOf(['sm', 'md', 'lg']),
+        color: React.PropTypes.oneOf(['blue', 'dark-blue', 'light-blue', 'pink', 'black', 'loop'])
+    },
+
+    getDefaultProps() {
+        return {
+            size: 'sm',
+            color: 'loop'
+        };
+    },
+
+    render() {
+        return (
+            <div className={classNames('spinner-wrapper-' + this.props.size, 'spinner-wrapper-' + this.props.color)}>
+                <div className={classNames('spinner-circle')}></div>
+                <div className={classNames('spinner-inner')}>A</div>
+            </div>
+        );
+    }
+});
+
+export default AscribeSpinner;
--- a/js/components/header.js
+++ b/js/components/header.js
@ -64,13 +64,13 @@ let Header = React.createClass({
    },

    getLogo(){
-        if (this.state.whitelabel && this.state.whitelabel.logo){
-            return <img className="img-brand" src={this.state.whitelabel.logo} />;
+        let { whitelabel } = this.state;
+        if (whitelabel && whitelabel.logo){
+            return <img className="img-brand" src={whitelabel.logo} />;
        }
        return (
            <span>
-                <span>ascribe </span>
-                <span className="glyph-ascribe-spool-chunked ascribe-color"></span>
+                <span className="icon-ascribe-logo"></span>
            </span>
        );
    },
--- a/js/components/piece_list.js
+++ b/js/components/piece_list.js
@ -20,6 +20,8 @@ import PieceListFilterDisplay from './piece_list_filter_display';
 import PieceListBulkModal from './ascribe_piece_list_bulk_modal/piece_list_bulk_modal';
 import PieceListToolbar from './ascribe_piece_list_toolbar/piece_list_toolbar';

+import AscribeSpinner from './ascribe_spinner';
+
 import AppConstants from '../constants/application_constants';

 import { mergeOptions } from '../utils/general_utils';
@ -149,7 +151,8 @@ let PieceList = React.createClass({
    },

    render() {
-        let loadingElement = (<img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />);
+        //let loadingElement = (<img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />);
+        let loadingElement = <AscribeSpinner />;
        let AccordionListItemType = this.props.accordionListItemType;

        return (
--- a/sass/ascribe-fonts/ascribe-fonts.scss
+++ b/sass/ascribe-fonts/ascribe-fonts.scss
@ -1,15 +1,15 @@
-    @font-face {
+@font-face {
  font-family: 'ascribe';
-        src:url('#{$BASE_URL}static/fonts/ascribe.eot?-oi6ttk');
-        src:url('#{$BASE_URL}static/fonts/ascribe.eot?#iefix-oi6ttk') format('embedded-opentype'),
+  src: url('#{$BASE_URL}static/fonts/ascribe.eot?-oi6ttk');
+  src: url('#{$BASE_URL}static/fonts/ascribe.eot?#iefix-oi6ttk') format('embedded-opentype'),
  url('#{$BASE_URL}static/fonts/ascribe.woff?-oi6ttk') format('woff'),
  url('#{$BASE_URL}static/fonts/ascribe.ttf?-oi6ttk') format('truetype'),
  url('#{$BASE_URL}static/fonts/ascribe.svg?-oi6ttk#ascribe') format('svg');
  font-weight: normal;
  font-style: normal;
-    }
+}

-    [class^="glyph-ascribe-"], [class*=" glyph-ascribe-"] {
+[class^="glyph-ascribe-"], [class*=" glyph-ascribe-"] {
  font-family: 'ascribe';
  speak: none;
  font-style: normal;
@ -21,35 +21,218 @@
  /* Better Font Rendering =========== */
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
-    }
+}

-    .glyph-ascribe-logo-spool:before {
+@font-face {
+	font-family: 'ascribe-logo-v2';
+	src:url('#{$BASE_URL}static/fonts/ascribe-logo-v2.eot?8e00ie');
+	src:url('#{$BASE_URL}static/fonts/ascribe-logo-v2.eot?8e00ie#iefix') format('embedded-opentype'),
+		url('#{$BASE_URL}static/fonts/ascribe-logo-v2.ttf?8e00ie') format('truetype'),
+		url('#{$BASE_URL}static/fonts/ascribe-logo-v2.woff?8e00ie') format('woff'),
+		url('#{$BASE_URL}static/fonts/ascribe-logo-v2.svg?8e00ie#ascribe-logo-v2') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+	font-family: 'ascribe-logo-v2';
+	speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+
+	/* Better Font Rendering =========== */
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-ascribe-logo:before {
+	content: "\e800";
+}
+
+
+.glyph-ascribe-logo-spool:before {
  content: "\e600";
-    }
+}

-    .glyph-ascribe-spool:before {
+.glyph-ascribe-spool:before {
  content: "\e601";
-    }
+}

-    .glyph-ascribe-logo-spool-chunked:before {
+.glyph-ascribe-logo-spool-chunked:before {
  content: "\e602";
-    }
+}

-    .glyph-ascribe-spool-chunked:before {
+.glyph-ascribe-spool-chunked:before {
  content: "\e603";
-    }
+}

-    @font-face {
+.glyph-ascribe-home:before {
+  content: "\e900";
+}
+
+.glyph-ascribe-home2:before {
+  content: "\e901";
+}
+
+.glyph-ascribe-home3:before {
+  content: "\e902";
+}
+
+.glyph-ascribe-pencil:before {
+  content: "\e905";
+}
+
+.glyph-ascribe-pencil2:before {
+  content: "\e906";
+}
+
+.glyph-ascribe-quill:before {
+  content: "\e907";
+}
+
+.glyph-ascribe-image:before {
+  content: "\e90d";
+}
+
+.glyph-ascribe-camera:before {
+  content: "\e90f";
+}
+
+.glyph-ascribe-music:before {
+  content: "\e911";
+}
+
+.glyph-ascribe-play:before {
+  content: "\e912";
+}
+
+.glyph-ascribe-film:before {
+  content: "\e913";
+}
+
+.glyph-ascribe-credit-card:before {
+  content: "\e93f";
+}
+
+.glyph-ascribe-pushpin:before {
+  content: "\e946";
+}
+
+.glyph-ascribe-undo2:before {
+  content: "\e967";
+}
+
+.glyph-ascribe-redo2:before {
+  content: "\e968";
+}
+
+.glyph-ascribe-enlarge:before {
+  content: "\e989";
+}
+
+.glyph-ascribe-shrink:before {
+  content: "\e98a";
+}
+
+.glyph-ascribe-enlarge2:before {
+  content: "\e98b";
+}
+
+.glyph-ascribe-shrink2:before {
+  content: "\e98c";
+}
+
+.glyph-ascribe-share:before {
+  content: "\ea7d";
+}
+
+.glyph-ascribe-new-tab:before {
+  content: "\ea7e";
+}
+
+.glyph-ascribe-share2:before {
+  content: "\ea82";
+}
+
+.glyph-ascribe-google:before {
+  content: "\ea87";
+}
+
+.glyph-ascribe-google-plus:before {
+  content: "\ea88";
+}
+
+.glyph-ascribe-google-plus2:before {
+  content: "\ea89";
+}
+
+.glyph-ascribe-facebook:before {
+  content: "\ea8c";
+}
+
+.glyph-ascribe-facebook2:before {
+  content: "\ea8d";
+}
+
+.glyph-ascribe-twitter:before {
+  content: "\ea91";
+}
+
+.glyph-ascribe-twitter2:before {
+  content: "\ea92";
+}
+
+.glyph-ascribe-youtube3:before {
+  content: "\ea99";
+}
+
+.glyph-ascribe-dropbox:before {
+  content: "\eaaf";
+}
+
+.glyph-ascribe-file-pdf:before {
+  content: "\eada";
+}
+
+.glyph-ascribe-chrome:before {
+  content: "\eae5";
+}
+
+.glyph-ascribe-firefox:before {
+  content: "\eae6";
+}
+
+.glyph-ascribe-IE:before {
+  content: "\eae7";
+}
+
+.glyph-ascribe-opera:before {
+  content: "\eae8";
+}
+
+.glyph-ascribe-safari:before {
+  content: "\eae9";
+}
+
+.btn-glyph-ascribe {
+  font-size: 18px;
+  padding: 4px 12px 0 10px
+}
+
+@font-face {
  font-family: mercury_regular;
  src: url(Mercury_Regular.otf);
-    }
+}

-    @font-face {
+@font-face {
  font-family: mercury_medium;
  src: url(Mercury_Medium.otf);
-    }
+}

-    @font-face {
+@font-face {
  font-family: mercury_light;
  src: url(Mercury_Light.otf);
-    }
+}
--- a/sass/ascribe-fonts/ascribe-logo-v2.eot
+++ b/sass/ascribe-fonts/ascribe-logo-v2.eot
--- a/sass/ascribe-fonts/ascribe-logo-v2.svg
+++ b/sass/ascribe-fonts/ascribe-logo-v2.svg
@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="ascribe-logo-v2" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe800;" glyph-name="ascribe-logo" horiz-adv-x="4195" d="M499.718 326.19c0 109.528-24.641 157.448-61.607 198.517-38.336 41.077-95.832 71.191-191.673 71.191-95.832 0-171.135-36.957-212.212-64.34l27.382-52.031c13.695 10.954 88.998 54.764 187.571 54.764 99.943 0 177.978-57.505 177.978-173.876v-34.225l-173.876-6.843c-171.135-6.852-253.281-82.146-253.281-191.673s88.989-191.674 212.212-191.674c123.214 0 191.674 75.294 214.944 102.676v-88.989h72.562v376.503zM427.156 113.978c-30.114-47.92-98.573-116.371-201.258-116.371-102.676 0-154.707 61.607-154.707 130.066 0 68.45 42.448 125.955 175.246 132.798l180.719 10.955v-157.448zM1063.784 123.562c0 120.482-119.12 161.551-198.525 188.933-78.035 27.382-146.494 56.134-146.494 121.853s50.661 101.314 121.853 101.314c71.191 0 115.001-24.641 158.819-72.561l43.809 43.809c-49.291 56.134-106.795 88.989-199.887 88.989-93.1 0-193.044-54.764-193.044-169.765s119.112-156.078 173.876-175.246c54.764-19.168 168.394-47.92 168.394-130.066s-69.821-120.482-149.226-120.482c-79.413 0-142.391 39.707-183.46 99.952l-50.661-41.077c39.707-65.718 113.639-123.215 231.38-123.215s223.166 68.451 223.166 187.562v0zM1679.873 93.44c0 0-68.451-93.1-212.212-93.1-143.753 0-242.326 113.639-242.326 271.087s112.268 260.132 239.594 260.132c125.955 0 180.719-61.616 208.101-93.1l45.18 47.912c-13.687 17.798-82.146 109.528-250.548 109.528-167.024 0-317.628-132.798-317.628-328.583 0-194.406 139.65-331.315 310.785-331.315s236.853 82.146 260.133 109.528l-41.077 47.912zM2142.607 586.323c0 0-27.382 9.576-68.45 9.576-68.459 0-138.28-43.81-161.551-130.058v119.112h-71.2v-635.266h71.2v342.278c0 109.528 34.225 162.921 45.18 177.978 10.946 15.066 47.912 57.505 109.528 57.505 34.225 0 53.394-5.473 68.451-10.955l6.843 69.83zM2353.432 810.851c0 32.855-26.012 58.875-58.867 58.875-32.863 0-58.875-26.020-58.875-58.875s26.011-58.875 58.875-58.875c32.855 0 58.867 26.020 58.867 58.875v0zM2330.161 584.953h-71.191v-635.266h71.191v635.266zM3144.767 267.315c0 188.941-123.223 328.583-312.155 328.583-91.73 0-177.987-36.957-239.594-132.798v431.267h-71.191v-944.68h71.191v120.482c53.394-93.1 141.012-134.169 236.853-134.169 191.673 0 314.896 143.753 314.896 331.315v0zM3069.464 267.315c0-146.494-86.257-266.976-239.594-266.976-154.707 0-239.594 120.482-239.594 266.976 0 147.864 84.887 266.976 239.594 266.976 153.337 0 239.594-119.112 239.594-266.976v0zM3836.158 298.808c0 171.135-120.482 297.090-287.514 297.090-168.402 0-308.044-132.798-308.044-328.583 0-194.406 119.112-331.315 303.933-331.315 184.83 0 264.244 95.833 264.244 95.833l-34.234 50.661c0 0-79.405-82.154-223.158-82.154-143.761 0-228.64 99.952-235.491 250.548h516.154c0 0 4.111 27.382 4.111 47.92v0zM3318.633 312.495c4.111 88.998 68.459 221.796 225.899 221.796 157.449 0 219.065-139.65 219.065-221.796h-444.963zM4027.755 897.194h-26.663l-88.15-217.077h31.998l22.269 56.468h92.852l22.277-56.468h33.874l-88.457 217.077zM3975.68 761.989l37.96 97.245 37.951-97.245h-75.91zM4195.326 778.878c0 101.246-79.876 181.122-181.121 181.122s-181.122-79.876-181.122-181.122c0-101.245 79.876-181.122 181.122-181.122s181.121 79.876 181.121 181.122v0zM4173.452 778.878c0-87.002-72.254-159.247-159.247-159.247-87.002 0-159.246 72.245-159.246 159.247s72.244 159.247 159.246 159.247c86.993 0 159.247-72.245 159.247-159.247v0z" />
+</font></defs></svg>
--- a/sass/ascribe-fonts/ascribe-logo-v2.ttf
+++ b/sass/ascribe-fonts/ascribe-logo-v2.ttf
--- a/sass/ascribe-fonts/ascribe-logo-v2.woff
+++ b/sass/ascribe-fonts/ascribe-logo-v2.woff
--- a/sass/ascribe_custom_style.scss
+++ b/sass/ascribe_custom_style.scss
@ -1,42 +1,68 @@
-$ascribe--bg-color: #06c;
+$ascribe-black: #1E1E1E;
+$ascribe-dark-blue: #003C69;
+$ascribe-blue: #65CFE9;
+$ascribe-light-blue: #D3DEE4;
+$ascribe-pink: #D10074;
+
+$ascribe--fg-color: $ascribe-dark-blue;
+$ascribe--bg-color: $ascribe-blue;
+
+$ascribe--nav-fg-prim-color: $ascribe-light-blue;
+$ascribe--nav-fg-sec-color: $ascribe-pink;
+$ascribe--nav-bg-color: $ascribe-dark-blue;
 $ascribe--button-color: $ascribe--bg-color;
+$ascribe--font-weight: 300;
 $ascribe--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ikono_tv.png';
+$ascribe--font: 'canada-type-gibson';

-
+html,
 body {
-    font-family: 'Helvetica Neue', 'Helvetica', sans-serif;
+    //font-family: 'Helvetica Neue', 'Helvetica', sans-serif;
+    font-family: 'canada-type-gibson', sans-serif !important;
+    font-weight: $ascribe--font-weight !important;
+}
+h1, h3 {
+    font-family: 'canada-type-gibson', sans-serif !important;
+    font-weight: $ascribe--font-weight !important;
 }

+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
+    border-color: transparent;
+}

 .navbar-default {
-    background-color: $ascribe--bg-color;
+    background-color: $ascribe--nav-bg-color;

    .navbar-nav > li > a,
    .navbar-nav > li > .active a {
        text-transform: uppercase;
        border-bottom-color: transparent;
-        font-size: 14px;
-        font-weight: bold;
+        font-size: 12px;
+    }
+    .navbar-nav > li > a:hover {
+        color: $ascribe--nav-fg-sec-color;
    }

    .navbar-nav > li > a {
-        color: white;
+        color: $ascribe--nav-fg-prim-color;
    }

    .navbar-nav > .active a,
    .navbar-nav > .active a:hover,
    .navbar-nav > .active a:focus {
-        color: black;
-        borderjbottom-color: transparent;
-        background-color: transparent;
+        color: $ascribe--nav-fg-prim-color;
+        border-bottom-color: $ascribe--nav-fg-prim-color;
+        background-color: $ascribe--nav-bg-color;
    }

    .navbar-nav > .active {
-        background-color: white;
+        background-color: $ascribe--nav-bg-color;
    }

    .navbar-toggle .icon-bar {
-        background-color: white;
+        background-color: $ascribe--nav-bg-color;
    }

    .navbar-nav > .open > a,
@ -45,11 +71,25 @@ body {
    .dropdown-menu > .active > a,
    .dropdown-menu > .active > a:hover,
    .dropdown-menu > .active > a:focus {
-        color: white;
-        background-color: $ascribe--bg-color;
+        color:  $ascribe--nav-fg-prim-color;
+        background-color: $ascribe--nav-bg-color;
    }

-    .img-brand.navbar-brand {
+    .dropdown-menu > li > a {
+        color:  $ascribe--nav-fg-prim-color;
+        font-weight: $ascribe--font-weight !important;
+    }
+
+    .dropdown-menu > li > a:hover,
+    .dropdown-menu > li > a:focus {
+        color:  $ascribe--nav-fg-prim-color;
+        background-color: $ascribe--nav-bg-color;
+    }
+
+    .navbar-brand {
+        color: $ascribe--nav-fg-prim-color;
+    }
+    .img-brand .navbar-brand {
        width: 0;
        height: 0;
        padding-right: 120px;
@ -66,7 +106,7 @@ body {

    .navbar-toggle:hover,
    .navbar-toggle:focus {
-        background-color: rgba(255, 255, 255, 0.1);
+        background-color: $ascribe--nav-bg-color;
    }
 }

--- a/sass/ascribe_spinner.scss
+++ b/sass/ascribe_spinner.scss
@ -0,0 +1,131 @@
+$ascribe-black: #1E1E1E;
+$ascribe-dark-blue: #003C69;
+$ascribe-blue: #65CFE9;
+$ascribe-light-blue: #D3DEE4;
+$ascribe-pink: #D10074;
+
+$ascribe--spinner-color: $ascribe-blue;
+
+$ascribe--spinner-size-md: 50px;
+$ascribe--spinner-size-sm: 30px;
+
+
+[class^="spinner-wrapper-"]{
+    margin: auto;
+}
+
+.spinner-wrapper-blue {
+    color: $ascribe-blue;
+    .spinner-circle {
+        border-color: $ascribe-blue;
+    }
+}
+
+.spinner-wrapper-dark-blue {
+    color: $ascribe-dark-blue;
+    .spinner-circle {
+        border-color: $ascribe-dark-blue;
+    }
+}
+
+.spinner-wrapper-pink {
+    color: $ascribe-pink;
+    .spinner-circle {
+        border-color: $ascribe-pink;
+    }
+}
+
+.spinner-wrapper-loop {
+    animation: spinner-color-loop 20s;
+    -moz-animation: spinner-color-loop 20s infinite;
+    -webkit-animation: spinner-color-loop 20s infinite;
+}
+
+.spinner-wrapper-black {
+    color: $ascribe-black;
+    .spinner-circle {
+        border-color: $ascribe-black;
+    }
+}
+
+.spinner-wrapper-md {
+    width: $ascribe--spinner-size-md;
+    height: $ascribe--spinner-size-md;
+}
+
+.spinner-wrapper-sm {
+    width: $ascribe--spinner-size-sm;
+    height: $ascribe--spinner-size-sm;
+}
+
+.spinner-circle {
+    -webkit-border-radius: 50%;
+       -moz-border-radius: 50%;
+            border-radius: 50%;
+
+    border-style: solid;
+
+    -webkit-animation: spin 1s infinite linear;
+       -moz-animation: spin 1s infinite linear;
+         -o-animation: spin 1s infinite linear;
+            animation: spin 1s infinite linear;
+}
+
+.spinner-wrapper-md .spinner-circle {
+    width: $ascribe--spinner-size-md;
+    height: $ascribe--spinner-size-md;
+    border-width: 1px 1px 1px 0;
+}
+
+.spinner-wrapper-sm .spinner-circle {
+    width: $ascribe--spinner-size-sm;
+    height: $ascribe--spinner-size-sm;
+    border-width: 1px 1px 1px 0;
+}
+
+.spinner-inner {
+    position: relative;
+    text-align: center;
+}
+
+.spinner-wrapper-md .spinner-inner {
+    font-size: $ascribe--spinner-size-md;
+    top: -64px;
+    height: $ascribe--spinner-size-md;
+    width: $ascribe--spinner-size-md;
+}
+
+.spinner-wrapper-sm .spinner-inner {
+    font-size: $ascribe--spinner-size-sm;
+    top: -38px;
+    height: $ascribe--spinner-size-sm;
+    width: $ascribe--spinner-size-sm;
+}
+
+@-webkit-keyframes spin {
+    from {-webkit-transform: rotate(0deg);}
+    to   {-webkit-transform: rotate(359deg);}
+}
+
+@-moz-keyframes spin {
+    from {-moz-transform: rotate(0deg);}
+    to   {-moz-transform: rotate(359deg);}
+}
+
+@-o-keyframes spin {
+    from {-o-transform: rotate(0deg);}
+    to   {-o-transform: rotate(359deg);}
+}
+
+@keyframes spin{
+    from {transform: rotate(0deg);}
+    to   {transform: rotate(359deg);}
+}
+
+@include keyframes(spinner-color-loop) {
+    0%  { color: $ascribe-black; }
+    20% { color: $ascribe-dark-blue; }
+    40% { color: $ascribe-blue; }
+    60% { color: $ascribe-light-blue; }
+    80% { color: $ascribe-pink; }
+}
--- a/sass/main.scss
+++ b/sass/main.scss
@ -11,7 +11,6 @@ $BASE_URL: '<%= BASE_URL %>';
@import '../node_modules/react-datepicker/dist/react-datepicker';
@import 'glyphicons-social';
@import 'ascribe_theme';
-@import './ascribe-fonts/style';
@import './ascribe-fonts/ascribe-fonts';
@import 'ascribe_login';
@import 'ascribe_table';
@ -35,6 +34,7 @@ $BASE_URL: '<%= BASE_URL %>';
@import 'ascribe_panel';
@import 'ascribe_collapsible';
@import 'ascribe_custom_style';
+@import 'ascribe_spinner';

@import 'whitelabel/index';