upgrade from Bower to NPM for all web dependencies

rse · Dec 20, 2017 · 77a641a · 77a641a
1 parent 334173a
commit 77a641a
Show file tree

Hide file tree

Showing 135 changed files with 189 additions and 171 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -26,48 +26,38 @@
 module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-contrib-clean");
     grunt.loadNpmTasks("grunt-contrib-copy");
-    grunt.loadNpmTasks("grunt-bower-install-simple");
 
     grunt.initConfig({
         pkg: grunt.file.readJSON("package.json"),
-        "bower-install-simple": {
-            "main": {
-                options: {
-                    color:       true,
-                    production:  true,
-                    directory:   "bower_components"
-                }
-            }
-        },
         copy: {
             "normalize": {
-                src: [ "bower_components/normalize.css/normalize.css" ],
+                src: [ "node_modules/normalize.css/normalize.css" ],
                 dest: "lib/normalize/normalize.css"
             },
             "director": {
-                src: [ "bower_components/director/build/director.min.js" ],
+                src: [ "node_modules/director/build/director.min.js" ],
                 dest: "lib/director/director.js"
             },
             "jquery": {
-                src: [ "bower_components/jquery/dist/jquery.min.js" ],
+                src: [ "node_modules/jquery/dist/jquery.min.js" ],
                 dest: "lib/jquery/jquery.js"
             },
             "mousetrap": {
-                src: [ "bower_components/mousetrap/mousetrap.min.js" ],
+                src: [ "node_modules/mousetrap/mousetrap.min.js" ],
                 dest: "lib/mousetrap/mousetrap.js"
             },
             "typopro": {
                 files: [
-                    { expand: true, flatten: false, cwd: "bower_components/typopro-web/web",
+                    { expand: true, flatten: false, cwd: "node_modules/typopro-web/web",
                       src: "TypoPRO-OpenSans/**", dest: "lib/typopro/" },
-                    { expand: true, flatten: false, cwd: "bower_components/typopro-web/web",
+                    { expand: true, flatten: false, cwd: "node_modules/typopro-web/web",
                       src: "TypoPRO-DejaVu/**", dest: "lib/typopro/" },
-                    { expand: true, flatten: false, cwd: "bower_components/typopro-web/web",
+                    { expand: true, flatten: false, cwd: "node_modules/typopro-web/web",
                       src: "TypoPRO-Journal/**", dest: "lib/typopro/" }
                 ]
             },
             "font-awesome-css": {
-                src: [ "bower_components/fontawesome/css/font-awesome.css" ],
+                src: [ "node_modules/font-awesome/css/font-awesome.css" ],
                 dest: "lib/fontawesome/fontawesome.css",
                 options: {
                     process: function (content, srcpath) {
@@ -77,7 +67,7 @@ module.exports = function (grunt) {
             },
             "font-awesome-fonts": {
                 files: [{
-                    expand: true, flatten: false, cwd: "bower_components/fontawesome/fonts",
+                    expand: true, flatten: false, cwd: "node_modules/font-awesome/fonts",
                     src: "fontawesome-webfont.*", dest: "lib/fontawesome/",
                     rename: function (src, dest) {
                         return src + dest.replace(/fontawesome-webfont/, "fontawesome");
@@ -91,6 +81,6 @@ module.exports = function (grunt) {
         }
     });
 
-    grunt.registerTask("default", [ "bower-install-simple", "copy" ]);
+    grunt.registerTask("default", [ "copy" ]);
 };
 
diff --git a/lib/mousetrap/mousetrap.js b/lib/mousetrap/mousetrap.js
diff --git a/lib/normalize/normalize.css b/lib/normalize/normalize.css
@@ -1,4 +1,4 @@
-/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
    ========================================================================== */
@@ -18,6 +18,14 @@ html {
 /* Sections
    ========================================================================== */
 
+/**
+ * Remove the margin in all browsers (opinionated).
+ */
+
+body {
+  margin: 0;
+}
+
 /**
  * Add the correct display in IE 9-.
  */
@@ -225,15 +233,19 @@ svg:not(:root) {
    ========================================================================== */
 
 /**
- * Remove the margin in Firefox and Safari.
+ * 1. Change the font styles in all browsers (opinionated).
+ * 2. Remove the margin in Firefox and Safari.
  */
 
 button,
 input,
 optgroup,
 select,
 textarea {
-  margin: 0;
+  font-family: sans-serif; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
 }
 
 /**
@@ -292,6 +304,14 @@ button:-moz-focusring,
   outline: 1px dotted ButtonText;
 }
 
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
 /**
  * 1. Correct the text wrapping in Edge and IE.
  * 2. Correct the color inheritance from `fieldset` elements in IE.

diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVu.txt b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVu.txt
@@ -1,6 +1,7 @@
 Name:       DejaVu
 Homepage:   http://dejavu-fonts.org/
 Download:   http://dejavu-fonts.org/wiki/Download
+Download:   https://github.com/dejavu-fonts/dejavu-fonts
 Version:    2.37 (2016-07)
 License:    Bitstream Vera Fonts Copyright, Arev Fonts Copyright, Public Domain
 Publisher:  DejaVu Project

diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Bold.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Bold.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Bold.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Bold.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Bold.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Bold.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-BoldOblique.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-BoldOblique.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-BoldOblique.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-BoldOblique.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-BoldOblique.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-BoldOblique.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-ExtraLight.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-ExtraLight.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-ExtraLight.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-ExtraLight.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-ExtraLight.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-ExtraLight.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Oblique.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Oblique.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Oblique.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Oblique.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Oblique.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Oblique.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Regular.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Regular.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Regular.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Regular.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Regular.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSans-Regular.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Bold.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Bold.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Bold.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Bold.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Bold.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Bold.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-BoldOblique.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-BoldOblique.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-BoldOblique.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-BoldOblique.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-BoldOblique.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-BoldOblique.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Oblique.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Oblique.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Oblique.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Oblique.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Oblique.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Oblique.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Regular.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Regular.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Regular.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Regular.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Regular.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansCondensed-Regular.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Bold.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Bold.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Bold.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Bold.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Bold.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Bold.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-BoldOblique.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-BoldOblique.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-BoldOblique.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-BoldOblique.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-BoldOblique.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-BoldOblique.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Oblique.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Oblique.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Oblique.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Oblique.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Oblique.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Oblique.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Regular.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Regular.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Regular.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Regular.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Regular.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSansMono-Regular.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Bold.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Bold.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Bold.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Bold.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Bold.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Bold.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-BoldItalic.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-BoldItalic.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-BoldItalic.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-BoldItalic.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-BoldItalic.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-BoldItalic.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Italic.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Italic.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Italic.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Italic.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Italic.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Italic.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Regular.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Regular.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Regular.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Regular.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Regular.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerif-Regular.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Bold.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Bold.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Bold.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Bold.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Bold.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Bold.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-BoldItalic.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-BoldItalic.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-BoldItalic.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-BoldItalic.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-BoldItalic.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-BoldItalic.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Italic.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Italic.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Italic.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Italic.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Italic.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Italic.woff
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Regular.eot b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Regular.eot
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Regular.ttf b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Regular.ttf
diff --git a/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Regular.woff b/lib/typopro/TypoPRO-DejaVu/TypoPRO-DejaVuSerifCondensed-Regular.woff
diff --git a/lib/typopro/TypoPRO-Journal/TypoPRO-Journal-Regular.eot b/lib/typopro/TypoPRO-Journal/TypoPRO-Journal-Regular.eot
diff --git a/lib/typopro/TypoPRO-Journal/TypoPRO-Journal-Regular.ttf b/lib/typopro/TypoPRO-Journal/TypoPRO-Journal-Regular.ttf
diff --git a/lib/typopro/TypoPRO-Journal/TypoPRO-Journal-Regular.woff b/lib/typopro/TypoPRO-Journal/TypoPRO-Journal-Regular.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Bold.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Bold.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Bold.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Bold.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Bold.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Bold.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-BoldItalic.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-BoldItalic.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-BoldItalic.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-BoldItalic.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-BoldItalic.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-BoldItalic.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondBold.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondBold.css
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondBold.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondBold.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondBold.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondBold.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondBold.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondBold.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLight.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLight.css
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLight.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLight.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLight.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLight.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLight.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLight.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLightItalic.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLightItalic.css
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLightItalic.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-CondLightItalic.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBold.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBold.css
@@ -1,5 +1,5 @@
 
-/* TypoPRO Open Sans Extrabold */
+/* TypoPRO Open Sans ExtraBold */
 @font-face {
     font-family:  'TypoPRO Open Sans';
     src:          url('TypoPRO-OpenSans-ExtraBold.eot');

diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBold.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBold.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBold.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBold.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBold.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBold.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBoldItalic.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBoldItalic.css
@@ -1,5 +1,5 @@
 
-/* TypoPRO Open Sans Extrabold Italic */
+/* TypoPRO Open Sans ExtraBold Italic */
 @font-face {
     font-family:  'TypoPRO Open Sans';
     src:          url('TypoPRO-OpenSans-ExtraBoldItalic.eot');

diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBoldItalic.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBoldItalic.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBoldItalic.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBoldItalic.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBoldItalic.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-ExtraBoldItalic.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Italic.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Italic.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Italic.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Italic.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Italic.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Italic.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Light.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Light.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Light.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Light.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Light.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Light.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-LightItalic.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-LightItalic.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-LightItalic.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-LightItalic.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-LightItalic.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-LightItalic.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Regular.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Regular.css
@@ -1,5 +1,5 @@
 
-/* TypoPRO Open Sans */
+/* TypoPRO Open Sans Regular */
 @font-face {
     font-family:  'TypoPRO Open Sans';
     src:          url('TypoPRO-OpenSans-Regular.eot');

diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Regular.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Regular.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Regular.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Regular.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Regular.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Regular.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBold.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBold.css
@@ -0,0 +1,15 @@
+
+/* TypoPRO Open Sans SemiBold */
+@font-face {
+    font-family:  'TypoPRO Open Sans';
+    src:          url('TypoPRO-OpenSans-SemiBold.eot');
+    src:          local('*'),
+                  url('TypoPRO-OpenSans-SemiBold.eot?#iefix') format('embedded-opentype'),
+                  url('TypoPRO-OpenSans-SemiBold.woff') format('woff'),
+                  url('TypoPRO-OpenSans-SemiBold.ttf') format('truetype');
+    font-style:   normal;
+    font-weight:  600;
+    font-stretch: normal;
+    font-variant: normal;
+}
+
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBold.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBold.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBold.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBold.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBold.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBold.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBoldItalic.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBoldItalic.css
@@ -0,0 +1,15 @@
+
+/* TypoPRO Open Sans SemiBold Italic */
+@font-face {
+    font-family:  'TypoPRO Open Sans';
+    src:          url('TypoPRO-OpenSans-SemiBoldItalic.eot');
+    src:          local('*'),
+                  url('TypoPRO-OpenSans-SemiBoldItalic.eot?#iefix') format('embedded-opentype'),
+                  url('TypoPRO-OpenSans-SemiBoldItalic.woff') format('woff'),
+                  url('TypoPRO-OpenSans-SemiBoldItalic.ttf') format('truetype');
+    font-style:   italic;
+    font-weight:  600;
+    font-stretch: normal;
+    font-variant: normal;
+}
+
diff --git a/...nSans/TypoPRO-OpenSans-SemiboldItalic.eot → ...nSans/TypoPRO-OpenSans-SemiBoldItalic.eot b/...nSans/TypoPRO-OpenSans-SemiboldItalic.eot → ...nSans/TypoPRO-OpenSans-SemiBoldItalic.eot
diff --git a/...nSans/TypoPRO-OpenSans-SemiboldItalic.ttf → ...nSans/TypoPRO-OpenSans-SemiBoldItalic.ttf b/...nSans/TypoPRO-OpenSans-SemiboldItalic.ttf → ...nSans/TypoPRO-OpenSans-SemiBoldItalic.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBoldItalic.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiBoldItalic.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Semibold.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Semibold.css
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Semibold.eot b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Semibold.eot
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Semibold.ttf b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Semibold.ttf
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Semibold.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-Semibold.woff
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiboldItalic.css b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiboldItalic.css
diff --git a/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiboldItalic.woff b/lib/typopro/TypoPRO-OpenSans/TypoPRO-OpenSans-SemiboldItalic.woff