You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/05/23 09:04:03 UTC
[incubator-streampipes] branch dev updated: [STREAMPIPES-137]
Update LICENSE file, load fonts externally
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 85c8f04 [STREAMPIPES-137] Update LICENSE file, load fonts externally
85c8f04 is described below
commit 85c8f0416ccb1d5e16ee3a18a06b95f4e5d7a575
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat May 23 11:03:52 2020 +0200
[STREAMPIPES-137] Update LICENSE file, load fonts externally
---
LICENSE | 8 ++------
ui/angular.json | 1 -
ui/package.json | 1 +
ui/src/assets/fonts/Roboto-Regular.css | 27 ---------------------------
ui/src/assets/fonts/Roboto-Regular.ttf | Bin 171272 -> 0 bytes
ui/src/scss/main.scss | 2 +-
6 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/LICENSE b/LICENSE
index 477a9c3..9f9907b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -206,17 +206,13 @@ This project includes some sources that are also licensed under the Apache
License Version 2.0:
All SVG files in ui/src/assets/img/svg (https://github.com/google/material-design-icons)
-MaterialIcons-Regular.eot (https://github.com/google/material-design-icons/tree/master/iconfont)
-MaterialIcons-Regular.ttf (https://github.com/google/material-design-icons/tree/master/iconfont)
-MaterialIcons-Regular.woff (https://github.com/google/material-design-icons/tree/master/iconfont)
-MaterialIcons-Regular.woff2 (https://github.com/google/material-design-icons/tree/master/iconfont)
-Roboto-Regular.ttf (https://github.com/google/roboto/)
+
===============================================================
This project includes some sources that are are licensed under the 3-clause BSD license:
-All files in streampipes-measurement-units/src/main/java/com.github.jqudt (https://github.com/egonw/jqudt),
+All files in streampipes-measurement-units/src/main/java/com/github/jqudt (https://github.com/egonw/jqudt),
Copyright (C) 2012 Egon Willighagen <eg...@users.sf.net>
diff --git a/ui/angular.json b/ui/angular.json
index 60fb1b5..8138aff 100644
--- a/ui/angular.json
+++ b/ui/angular.json
@@ -27,7 +27,6 @@
],
"styles": [
"src/scss/main.scss",
- "src/assets/fonts/Roboto-Regular.css"
],
"scripts": [
"node_modules/systemjs/dist/system.js",
diff --git a/ui/package.json b/ui/package.json
index 0a69271..8a666ce 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -97,6 +97,7 @@
"ngx-color-picker": "9.0.0",
"plotly.js": "1.52.2",
"prismjs": "1.16.0",
+ "roboto-fontface": "0.10.0",
"rxjs": "6.3.3",
"rxjs-compat": "6.3.3",
"shepherd.js": "2.4.0",
diff --git a/ui/src/assets/fonts/Roboto-Regular.css b/ui/src/assets/fonts/Roboto-Regular.css
deleted file mode 100644
index d1d7664..0000000
--- a/ui/src/assets/fonts/Roboto-Regular.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/* latin */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 700;
- src: local('Roboto'),
- local('Roboto'),
- url(assets/fonts/Roboto-Regular.ttf) format('ttf');
-}
diff --git a/ui/src/assets/fonts/Roboto-Regular.ttf b/ui/src/assets/fonts/Roboto-Regular.ttf
deleted file mode 100644
index 2b6392f..0000000
Binary files a/ui/src/assets/fonts/Roboto-Regular.ttf and /dev/null differ
diff --git a/ui/src/scss/main.scss b/ui/src/scss/main.scss
index e7b2b33..78f3c63 100644
--- a/ui/src/scss/main.scss
+++ b/ui/src/scss/main.scss
@@ -39,7 +39,7 @@
@import '~leaflet/dist/leaflet.css';
@import '~material-design-icons/iconfont/material-icons.css';
-@import '../assets/fonts/Roboto-Regular.css';
+@import '~roboto-fontface/css/roboto/roboto-fontface.css';
@import './sp/shepherd-new';