Merge branch 'self-hosted-fonts' into develop

.gitignore

@@ -5,5 +5,6 @@
 .idea
 
 release.tgz
-bootstrap-*/
+bootstrap-*
 /target*/
+nb-configuration.xml

Makefile

@@ -0,0 +1,16 @@
+BOOTSTRAP_VERSION=3.3.7
+STYLE_VERSION=0.3.0
+
+all: build maven
+
+build:
+	BOOTSTRAP_VER=${BOOTSTRAP_VERSION} STYLE_VERSION=${STYLE_VERSION} sh -x ./build.sh
+
+maven:
+	mvn clean
+	mvn package -Dstyle.version=${STYLE_VERSION} -Dbootstrap.version=${BOOTSTRAP_VERSION} -Pcss-with-bootstrap
+	mvn package -Dstyle.version=${STYLE_VERSION} -Dbootstrap.version=${BOOTSTRAP_VERSION} -Pless-with-bootstrap
+	mvn package -Dstyle.version=${STYLE_VERSION} -Dbootstrap.version=${BOOTSTRAP_VERSION} -Pless-without-bootstrap
+
+deploy:
+	BOOTSTRAP_VER=${BOOTSTRAP_VERSION} STYLE_VERSION=${STYLE_VERSION} sh -c "./src/main/script/maven-deploy.sh --settings .maven-settings.xml"

pom.xml

@@ -76,10 +76,27 @@
                                         <include>variables.less</include>
                                         <include>clarin-additions.less</include>
                                         <include>clarin-bootstrap.less</include>
+                                        <include>clarin-fonts.less</include>
                                     </includes>
                                 </resource>
                             </resources>              
-                        </configuration>            
+                        </configuration>     
+                    </execution>
+                    <execution>
+                        <id>copy-fonts</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/${project.build.finalName}/fonts</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <!-- Our variables.less file, to be mixed with Bootstrap LESS sources -->
+                                    <directory>src/main/fonts</directory>
+                                </resource>
+                            </resources>              
+                        </configuration>     
                     </execution>
                 </executions>
             </plugin>

src/main/less/clarin-additions.less

@@ -13,7 +13,6 @@
 // 'clarin-bootstrap.less'
 //////////////////////////////////////////////////////////////////////////////////////////
 
-
 // Custom classes
 
 //example:

src/main/less/clarin-bootstrap.less

@@ -14,9 +14,13 @@
 // for that purpose instead.
 //////////////////////////////////////////////////////////////////////////////////////////
 
-
+
+
 // Original bootstrap root file
 @import "bootstrap.less";
 
+// CLARIN specific fonts
+@import "clarin-fonts.less";
+
 // CLARIN specific additions
 @import "clarin-additions.less";

src/main/less/clarin-fonts.less

@@ -0,0 +1,113 @@
+/*!
+ * CLARIN specific fonts
+ *
+ * Generated with https://google-webfonts-helper.herokuapp.com/fonts/source-code-pro?subsets=latin,latin-ext
+ */
+
+/* source-sans-pro-regular - vietnamese_latin-ext_latin */
+@font-face {
+    font-family: 'Source Sans Pro';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-regular.eot'); /* IE9 Compat Modes */
+    src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'),
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-regular.svg#SourceSansPro') format('svg'); /* Legacy iOS */
+}
+/* source-sans-pro-italic - vietnamese_latin-ext_latin */
+@font-face {
+    font-family: 'Source Sans Pro';
+    font-style: italic;
+    font-weight: 400;
+    src: url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-italic.eot'); /* IE9 Compat Modes */
+    src: local('Source Sans Pro Italic'), local('SourceSansPro-Italic'),
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-italic.woff') format('woff'), /* Modern Browsers */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-italic.svg#SourceSansPro') format('svg'); /* Legacy iOS */
+}
+/* source-sans-pro-700 - vietnamese_latin-ext_latin */
+@font-face {
+    font-family: 'Source Sans Pro';
+    font-style: normal;
+    font-weight: 700;
+    src: url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700.eot'); /* IE9 Compat Modes */
+    src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'),
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700.woff') format('woff'), /* Modern Browsers */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700.svg#SourceSansPro') format('svg'); /* Legacy iOS */
+}
+/* source-sans-pro-700italic - vietnamese_latin-ext_latin */
+@font-face {
+    font-family: 'Source Sans Pro';
+    font-style: italic;
+    font-weight: 700;
+    src: url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700italic.eot'); /* IE9 Compat Modes */
+    src: local('Source Sans Pro Bold Italic'), local('SourceSansPro-BoldItalic'),
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700italic.woff') format('woff'), /* Modern Browsers */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../fonts/source-sans-pro-v11-vietnamese_latin-ext_latin-700italic.svg#SourceSansPro') format('svg'); /* Legacy iOS */
+}
+
+
+/* roboto-slab-regular - vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek */
+@font-face {
+  font-family: 'Roboto Slab';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-regular.eot'); /* IE9 Compat Modes */
+  src: local('Roboto Slab Regular'), local('RobotoSlab-Regular'),
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-regular.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-regular.svg#RobotoSlab') format('svg'); /* Legacy iOS */
+}
+/* roboto-slab-700 - vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek */
+@font-face {
+  font-family: 'Roboto Slab';
+  font-style: normal;
+  font-weight: 700;
+  src: url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-700.eot'); /* IE9 Compat Modes */
+  src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'),
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-700.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-700.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-700.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../fonts/roboto-slab-v7-vietnamese_cyrillic_latin-ext_greek-ext_cyrillic-ext_latin_greek-700.svg#RobotoSlab') format('svg'); /* Legacy iOS */
+}
+
+/* source-code-pro-regular - latin-ext_latin */
+@font-face {
+  font-family: 'Source Code Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/source-code-pro-v7-latin-ext_latin-regular.eot'); /* IE9 Compat Modes */
+  src: local('Source Code Pro'), local('SourceCodePro-Regular'),
+       url('../fonts/source-code-pro-v7-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../fonts/source-code-pro-v7-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/source-code-pro-v7-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/source-code-pro-v7-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../fonts/source-code-pro-v7-latin-ext_latin-regular.svg#SourceCodePro') format('svg'); /* Legacy iOS */
+}
+/* source-code-pro-700 - latin-ext_latin */
+@font-face {
+  font-family: 'Source Code Pro';
+  font-style: normal;
+  font-weight: 700;
+  src: url('../fonts/source-code-pro-v7-latin-ext_latin-700.eot'); /* IE9 Compat Modes */
+  src: local('Source Code Pro Bold'), local('SourceCodePro-Bold'),
+       url('../fonts/source-code-pro-v7-latin-ext_latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../fonts/source-code-pro-v7-latin-ext_latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/source-code-pro-v7-latin-ext_latin-700.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/source-code-pro-v7-latin-ext_latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../fonts/source-code-pro-v7-latin-ext_latin-700.svg#SourceCodePro') format('svg'); /* Legacy iOS */
+}

src/main/package.js

@@ -0,0 +1,28 @@
+// package metadata file for Meteor.js
+
+/* jshint strict:false */
+/* global Package:true */
+
+Package.describe({
+  name: 'twbs:bootstrap',  // http://atmospherejs.com/twbs/bootstrap
+  summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.',
+  version: '3.3.7',
+  git: 'https://github.com/twbs/bootstrap.git'
+});
+
+Package.onUse(function (api) {
+  api.versionsFrom('[email protected]');
+  api.use('jquery', 'client');
+  var assets = [
+    'dist/fonts/*'
+  ];
+  if (api.addAssets) {
+    api.addAssets(assets, 'client');
+  } else {
+    api.addFiles(assets, 'client', { isAsset: true });
+  }
+  api.addFiles([
+    'dist/css/bootstrap.css',
+    'dist/js/bootstrap.js'
+  ], 'client');
+});

src/main/script/build.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 #gcp can be installed on MacOS via brew. Run "brew install coreutils" to do so.
@@ -19,9 +19,14 @@ curl --fail --location --proto '=https' --silent --show-error --tlsv1 \
 ## Apply CLARIN base style.
 echo "Applying CLARIN flavour..."
 cd -- "bootstrap-${BOOTSTRAP_VER}/"
+### CLARIN fonts
+${CP} -r -f -- "../src/main/fonts" '.'
+${CP} -f -- '../src/main/package.js' 'package.js'
+
 ### Put CLARIN root wrapper in place
 ${CP} -f -- '../src/main/less/clarin-bootstrap.less' 'less/clarin-bootstrap.less'
 ### CLARIN customisations
+${CP} -f -- '../src/main/less/clarin-fonts.less' 'less/clarin-fonts.less'
 ${CP} -f -- '../src/main/less/clarin-additions.less' 'less/clarin-additions.less'
 ${CP} -f -- '../src/main/less/variables.less' 'less/variables.less'