[Kimchi-devel] [PATCH] [Wok] Remove Open Sans font requirement

Aline Manera posted 1 patch 87 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/kimchi tags/patchew/20170404171857.31394-1-alinefm@linux.vnet.ibm.com
COPYING                                |   4 --
IBM-license-blacklist                  |   1 -
configure.ac                           |   1 -
contrib/DEBIAN/control.in              |   3 +-
contrib/wok.spec.fedora.in             |   1 -
contrib/wok.spec.suse.in               |   1 -
docs/fedora-deps.md                    |   4 +-
docs/opensuse-deps.md                  |   3 +-
docs/ubuntu-deps.md                    |   3 +-
src/wok/config.py.in                   |  18 +-----
tests/test_config.py.in                |  70 -----------------------
ui/css/Makefile.am                     |   2 +-
ui/css/bootstrap.custom.css            |  22 ++++----
ui/css/opensans/Makefile.am            |  21 -------
ui/css/opensans/opensans.css           | 100 ---------------------------------
ui/css/src/modules/_wok-variables.scss |   4 +-
ui/css/wok.css                         |  14 ++---
ui/pages/login.html.tmpl               |   1 -
ui/pages/wok-ui.html.tmpl              |   3 +-
19 files changed, 28 insertions(+), 248 deletions(-)
delete mode 100644 ui/css/opensans/Makefile.am
delete mode 100644 ui/css/opensans/opensans.css

[Kimchi-devel] [PATCH] [Wok] Remove Open Sans font requirement

Posted by Aline Manera 87 weeks ago
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com>
---
 COPYING                                |   4 --
 IBM-license-blacklist                  |   1 -
 configure.ac                           |   1 -
 contrib/DEBIAN/control.in              |   3 +-
 contrib/wok.spec.fedora.in             |   1 -
 contrib/wok.spec.suse.in               |   1 -
 docs/fedora-deps.md                    |   4 +-
 docs/opensuse-deps.md                  |   3 +-
 docs/ubuntu-deps.md                    |   3 +-
 src/wok/config.py.in                   |  18 +-----
 tests/test_config.py.in                |  70 -----------------------
 ui/css/Makefile.am                     |   2 +-
 ui/css/bootstrap.custom.css            |  22 ++++----
 ui/css/opensans/Makefile.am            |  21 -------
 ui/css/opensans/opensans.css           | 100 ---------------------------------
 ui/css/src/modules/_wok-variables.scss |   4 +-
 ui/css/wok.css                         |  14 ++---
 ui/pages/login.html.tmpl               |   1 -
 ui/pages/wok-ui.html.tmpl              |   3 +-
 19 files changed, 28 insertions(+), 248 deletions(-)
 delete mode 100644 ui/css/opensans/Makefile.am
 delete mode 100644 ui/css/opensans/opensans.css

diff --git a/COPYING b/COPYING
index a163007..980d024 100644
--- a/COPYING
+++ b/COPYING
@@ -12,10 +12,6 @@ Files: ui/css/fontawesome/fontawesome.css
 Source: http://fontawesome.io
 License: MIT
 
-Files: ui/css/opensans/opensans.css
-Source: https://fonts.google.com/specimen/Open+Sans
-License: Apache-2.0
-
 Files: ui/css/src/bootstrap.custom.scss
        ui/css/src/vendor/bootstrap-sass/bootstrap/*
 Source: https://github.com/twbs/bootstrap
diff --git a/IBM-license-blacklist b/IBM-license-blacklist
index 6ff1e29..ba5050a 100644
--- a/IBM-license-blacklist
+++ b/IBM-license-blacklist
@@ -42,7 +42,6 @@ src/wok/plugins/sample/ui/pages/help/en_US/.*.html
 ui/base64/README.md
 ui/base64/jquery.base64.js
 ui/css/fontawesome/fontawesome.css
-ui/css/opensans/opensans.css
 ui/css/src/vendor/bootstrap-sass/LICENSE
 ui/css/src/vendor/bootstrap-sass/bootstrap/.*.scss
 ui/css/src/vendor/bootstrap-sass/bootstrap/mixins/.*.scss
diff --git a/configure.ac b/configure.ac
index 2f8d13a..2803dfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,6 @@ AC_CONFIG_FILES([
     ui/base64/Makefile
     ui/css/Makefile
     ui/css/fontawesome/Makefile
-    ui/css/opensans/Makefile
     ui/images/Makefile
     ui/images/theme-default/Makefile
     ui/js/Makefile
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index e825368..1254688 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -16,8 +16,7 @@ Depends: python-cherrypy3 (>= 3.2.0),
          fonts-font-awesome,
          logrotate,
          openssl,
-         websockify,
-         texlive-fonts-extra
+         websockify
 Build-Depends: xsltproc,
                gettext,
                python-lxml,
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index 7514376..df06e83 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -18,7 +18,6 @@ Requires:	nginx
 Requires:	python-ldap
 Requires:	python-psutil >= 0.6.0
 Requires:	fontawesome-fonts
-Requires:	open-sans-fonts
 Requires:	logrotate
 Requires:	openssl
 Requires:	python-websockify
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
index cca3186..956fb26 100644
--- a/contrib/wok.spec.suse.in
+++ b/contrib/wok.spec.suse.in
@@ -19,7 +19,6 @@ Requires:	python-xml
 Requires:	nginx
 Requires:	python-psutil >= 0.6.0
 Requires:	fontawesome-fonts
-Requires:	google-opensans-fonts
 Requires:	logrotate
 Requires:	openssl
 Requires:	python-websockify
diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md
index 484f409..f4d63fe 100644
--- a/docs/fedora-deps.md
+++ b/docs/fedora-deps.md
@@ -27,8 +27,8 @@ Runtime Dependencies
 
     $ sudo yum install python-cherrypy python-cheetah PyPAM m2crypto \
                         python-jsonschema python-psutil python-ldap \
-                        python-lxml nginx openssl open-sans-fonts \
-                        fontawesome-fonts logrotate python-websockify
+                        python-lxml nginx openssl python-websockify \
+                        fontawesome-fonts logrotate
 
     # For RHEL systems, install the additional packages:
     $ sudo yum install python-ordereddict
diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md
index eee39f9..71a1af9 100644
--- a/docs/opensuse-deps.md
+++ b/docs/opensuse-deps.md
@@ -18,8 +18,7 @@ Runtime Dependencies
     $ sudo zypper install python-CherryPy python-Cheetah python-pam \
                           python-M2Crypto python-jsonschema python-psutil \
                           python-ldap python-lxml python-xml nginx openssl \
-                          google-opensans-fonts fontawesome-fonts logrotate \
-                          python-websockify
+                          fontawesome-fonts logrotate python-websockify
 
 Packages required for UI development
 ------------------------------------
diff --git a/docs/ubuntu-deps.md b/docs/ubuntu-deps.md
index 3607998..4577348 100644
--- a/docs/ubuntu-deps.md
+++ b/docs/ubuntu-deps.md
@@ -18,8 +18,7 @@ Runtime Dependencies
     $ sudo apt-get install python-cherrypy3 python-cheetah python-pam \
                             python-m2crypto python-jsonschema \
                             python-psutil python-ldap python-lxml nginx \
-                            openssl fonts-font-awesome texlive-fonts-extra \
-                            websockify
+                            openssl fonts-font-awesome websockify
 
 Packages required for UI development
 ------------------------------------
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index c2bcc28..8349d58 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -30,17 +30,7 @@ __release__ = "@wokrelease@"
 CACHEEXPIRES = 31536000     # expires is one year.
 DEFAULT_LOG_LEVEL = "info"
 
-FONT_FILES = {'fontawesome': ['fontawesome-webfont.ttf'],
-              'opensans': ['OpenSans-ExtraBoldItalic.ttf',
-                           'OpenSans-ExtraBold.ttf',
-                           'OpenSans-LightItalic.ttf',
-                           'OpenSans-Light.ttf',
-                           'OpenSans-SemiboldItalic.ttf',
-                           'OpenSans-BoldItalic.ttf',
-                           'OpenSans-Italic.ttf',
-                           'OpenSans-Bold.ttf',
-                           'OpenSans-Semibold.ttf',
-                           'OpenSans-Regular.ttf']}
+FONT_FILES = {'fontawesome': ['fontawesome-webfont.ttf']}
 
 FONTS_PATH = {
     'fontawesome': [
@@ -48,12 +38,6 @@ FONTS_PATH = {
         '/usr/share/fonts/truetype/font-awesome',
         '/usr/share/fonts/truetype',
         '/usr/share/fonts/TTF'
-    ],
-    'opensans': [
-        '/usr/share/fonts/open-sans',
-        '/usr/share/fonts/truetype/',
-        '/usr/share/texlive/texmf-dist/fonts/truetype/public/opensans',
-        '/usr/share/fonts/TTF'
     ]
 }
 
diff --git a/tests/test_config.py.in b/tests/test_config.py.in
index a4d65bb..7b7e656 100644
--- a/tests/test_config.py.in
+++ b/tests/test_config.py.in
@@ -155,76 +155,6 @@ class ConfigTests(unittest.TestCase):
                 'tools.staticfile.on': True,
                 'tools.staticfile.filename':
                 '%s/fontawesome-webfont.ttf' % paths.fontawesome_dir
-            },
-            '/fonts/OpenSans-LightItalic.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-LightItalic.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-Bold.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-Bold.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-Italic.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-Italic.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-Semibold.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-Semibold.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-Light.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-Light.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-SemiboldItalic.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-SemiboldItalic.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-ExtraBold.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-ExtraBold.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-BoldItalic.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-BoldItalic.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-ExtraBoldItalic.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-ExtraBoldItalic.ttf' % paths.opensans_dir
-            },
-            '/fonts/OpenSans-Regular.ttf': {
-                'tools.wokauth.on': False,
-                'tools.nocache.on': False,
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename':
-                '%s/OpenSans-Regular.ttf' % paths.opensans_dir
             }
         }
 
diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
index 1a75e6d..afa6609 100644
--- a/ui/css/Makefile.am
+++ b/ui/css/Makefile.am
@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = fontawesome opensans
+SUBDIRS = fontawesome
 
 EXTRA_DIST = theme-default
 
diff --git a/ui/css/bootstrap.custom.css b/ui/css/bootstrap.custom.css
index 76a6367..d2c2a32 100644
--- a/ui/css/bootstrap.custom.css
+++ b/ui/css/bootstrap.custom.css
@@ -2,7 +2,7 @@
 /*
  * Project Wok
  *
- * Copyright IBM Corp, 2015-2016
+ * Copyright IBM Corp, 2015-2017
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -330,7 +330,7 @@ html {
 }
 
 body {
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-size: 14px;
   line-height: 1.42857;
   color: #222;
@@ -3901,7 +3901,7 @@ tbody.collapse.in {
   height: 55px;
   background: transparent url("../images/wok-logo.png") no-repeat 4px 5px;
   color: #fff;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-weight: 700;
   font-size: 1.571em;
   line-height: 55px;
@@ -4157,7 +4157,7 @@ tbody.collapse.in {
   display: block;
   vertical-align: middle;
   color: #fff;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-size: 13pt;
   font-weight: normal;
   line-height: 24px;
@@ -4320,7 +4320,7 @@ tbody.collapse.in {
   padding-right: 10px;
   margin: 0;
   font-size: 12pt;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-weight: 700;
   color: #fff;
   text-decoration: none;
@@ -4370,7 +4370,7 @@ tbody.collapse.in {
 
 .navbar-default .navbar-nav > .hostname .host-location {
   display: inline-block;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   color: #fff;
   font-size: 8.5pt;
   font-weight: 300;
@@ -6033,7 +6033,7 @@ button.close {
   margin: 0;
   line-height: 23px;
   font-size: 27px;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-weight: 300 !important;
 }
 
@@ -6127,7 +6127,7 @@ button.close {
 .modal label {
   color: #222;
   font-weight: 400;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-size: 20px;
 }
 
@@ -6162,7 +6162,7 @@ button.close {
 .modal-body .nav-tabs > li > a {
   font-size: 17px;
   font-weight: 300;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   border: 0;
   border-bottom: 5px solid #eee;
   text-align: center;
@@ -6178,7 +6178,7 @@ button.close {
   position: absolute;
   z-index: 1070;
   display: block;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-style: normal;
   font-weight: normal;
   letter-spacing: normal;
@@ -6312,7 +6312,7 @@ button.close {
   display: none;
   max-width: 276px;
   padding: 1px;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-style: normal;
   font-weight: normal;
   letter-spacing: normal;
diff --git a/ui/css/opensans/Makefile.am b/ui/css/opensans/Makefile.am
deleted file mode 100644
index a01c208..0000000
--- a/ui/css/opensans/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Project Wok
-#
-# Copyright IBM Corp, 2015-2016
-#
-# Code derived from Project Kimchi
-#
-# Licensed 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.
-
-opensanscssdir = $(datadir)/wok/ui/css/opensans
-dist_opensanscss_DATA = opensans.css
diff --git a/ui/css/opensans/opensans.css b/ui/css/opensans/opensans.css
deleted file mode 100644
index 57a6533..0000000
--- a/ui/css/opensans/opensans.css
+++ /dev/null
@@ -1,100 +0,0 @@
-@charset "UTF-8";
-/*
-*  Font license info
-*
-*  Open Sans font family is licensed under the Apache License, Version 2.0:
-*
-*  Licensed 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.
-*/
-
-/* This file was modified according to Kimchi proposals */
-
-/* BEGIN Light */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Light.ttf") format("truetype");
-  font-weight: 300;
-  font-style: normal; }
-/* END Light */
-
-/* BEGIN Light Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-LightItalic.ttf") format("truetype");
-  font-weight: 300;
-  font-style: italic; }
-/* END Light Italic */
-
-/* BEGIN Regular */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Regular.ttf") format("truetype");
-  font-weight: normal;
-  font-style: normal; }
-/* END Regular */
-
-/* BEGIN Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Italic.ttf") format("truetype");
-  font-weight: normal;
-  font-style: italic; }
-/* END Italic */
-
-/* BEGIN Semibold */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Semibold.ttf") format("truetype");
-  font-weight: 600;
-  font-style: normal; }
-/* END Semibold */
-
-/* BEGIN Semibold Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-SemiboldItalic.ttf") format("truetype");
-  font-weight: 600;
-  font-style: italic; }
-/* END Semibold Italic */
-
-/* BEGIN Bold */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Bold.ttf") format("truetype");
-  font-weight: bold;
-  font-style: normal; }
-/* END Bold */
-
-/* BEGIN Bold Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-BoldItalic.ttf") format("truetype");
-  font-weight: bold;
-  font-style: italic; }
-/* END Bold Italic */
-
-/* BEGIN Extrabold */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-ExtraBold.ttf") format("truetype");
-  font-weight: 800;
-  font-style: normal; }
-/* END Extrabold */
-
-/* BEGIN Extrabold Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-ExtraBoldItalic.ttf") format("truetype");
-  font-weight: 800;
-  font-style: italic; }
-/* END Extrabold Italic */
diff --git a/ui/css/src/modules/_wok-variables.scss b/ui/css/src/modules/_wok-variables.scss
index 5b4b2d8..25037c6 100644
--- a/ui/css/src/modules/_wok-variables.scss
+++ b/ui/css/src/modules/_wok-variables.scss
@@ -1,7 +1,7 @@
 //
 // Project Wok
 //
-// Copyright IBM Corp, 2015-2016
+// Copyright IBM Corp, 2015-2017
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ $link-hover-decoration: underline !default;
 //
 //## Font, line-height, and color for body text, headings, and more.
 
-$font-family-sans-serif:  'Open Sans', Helvetica, Arial, "Lucida Grande", sans-serif !default;
+$font-family-sans-serif:  Helvetica, Arial, "Lucida Grande", sans-serif !default;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
 $font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
diff --git a/ui/css/wok.css b/ui/css/wok.css
index ec269b5..b9b7c92 100644
--- a/ui/css/wok.css
+++ b/ui/css/wok.css
@@ -252,7 +252,7 @@ html.in-progress .disabled {
 
 .login-area .bootstrap-select,
 .login-area .selectpicker {
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-size: 13pt;
 }
 
@@ -292,7 +292,7 @@ html.in-progress .disabled {
 }
 
 .navbar-default.toolbar .navbar-right.tools > li > a {
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   display: inline-block;
   color: #fff;
   text-decoration: none;
@@ -323,7 +323,7 @@ html.in-progress .disabled {
 }
 
 .btn {
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-size: 13pt;
 }
 
@@ -484,7 +484,7 @@ fieldset[disabled] .btn-group > span > .btn.active {
   background: #4d4c4e !important;
   min-width: 160px;
   border: 0 !important;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-weight: 700;
   font-size: 13.5pt;
   text-align: left;
@@ -1056,7 +1056,7 @@ fieldset[disabled] .btn-group > span > .btn.active {
 }
 
 .wok-datagrid > .wok-datagrid-header > span {
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   font-weight: 300;
   font-size: 12.5pt;
   vertical-align: bottom;
@@ -1071,7 +1071,7 @@ fieldset[disabled] .btn-group > span > .btn.active {
 }
 
 .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span {
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
   line-height: 2.42857;
   vertical-align: top;
   font-size: 12.5pt;
@@ -1163,7 +1163,7 @@ fieldset[disabled] .btn-group > span > .btn.active {
 label {
   font-size: 1.143em;
   font-weight: 400;
-  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
 }
 
 .form-control-feedback {
diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl
index 6f967cf..13dbc51 100644
--- a/ui/pages/login.html.tmpl
+++ b/ui/pages/login.html.tmpl
@@ -65,7 +65,6 @@
     <link rel="stylesheet" href="$href('libs/bootstrap-select/dist/css/bootstrap-select.min.css')">
     <link rel="stylesheet" href="$href('libs/datatables/css/datatables.min.css')">
     <link rel="stylesheet" href="$href('css/fontawesome/fontawesome.css')">
-    <link rel="stylesheet" href="$href('css/opensans/opensans.css')">
     <link rel="stylesheet" href="$href('css/bootstrap-select.custom.css')">
     <link rel="stylesheet" href="$href('css/datatables.bootstrap.css')">
     <link rel="stylesheet" href="$href('css/wok.css')">
diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl
index 36a0492..8780e0b 100644
--- a/ui/pages/wok-ui.html.tmpl
+++ b/ui/pages/wok-ui.html.tmpl
@@ -1,7 +1,7 @@
 #*
  * Project Wok
  *
- * Copyright IBM Corp, 2015-2016
+ * Copyright IBM Corp, 2015-2017
  *
  * Code derived from Project Kimchi
  *
@@ -67,7 +67,6 @@
     <link rel="stylesheet" href="$href('libs/bootstrap-editable/dist/css/bootstrap-editable.css')">
     <link rel="stylesheet" href="$href('libs/datatables/css/datatables.min.css')">
     <link rel="stylesheet" href="$href('css/fontawesome/fontawesome.css')">
-    <link rel="stylesheet" href="$href('css/opensans/opensans.css')">
     <link rel="stylesheet" href="$href('css/bootstrap-select.custom.css')">
     <link rel="stylesheet" href="$href('css/datatables.bootstrap.css')">
     <link rel="stylesheet" href="$href('css/wok.css')">
-- 
2.9.3

_______________________________________________
Kimchi-devel mailing list
Kimchi-devel@ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel

Re: [Kimchi-devel] [PATCH] [Wok] Remove Open Sans font requirement

Posted by Daniel Henrique Barboza 87 weeks ago
Reviewed-by: Daniel Barboza <danielhb@linux.vnet.ibm.com>

On 04/04/2017 02:18 PM, Aline Manera wrote:
> Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com>
> ---
>   COPYING                                |   4 --
>   IBM-license-blacklist                  |   1 -
>   configure.ac                           |   1 -
>   contrib/DEBIAN/control.in              |   3 +-
>   contrib/wok.spec.fedora.in             |   1 -
>   contrib/wok.spec.suse.in               |   1 -
>   docs/fedora-deps.md                    |   4 +-
>   docs/opensuse-deps.md                  |   3 +-
>   docs/ubuntu-deps.md                    |   3 +-
>   src/wok/config.py.in                   |  18 +-----
>   tests/test_config.py.in                |  70 -----------------------
>   ui/css/Makefile.am                     |   2 +-
>   ui/css/bootstrap.custom.css            |  22 ++++----
>   ui/css/opensans/Makefile.am            |  21 -------
>   ui/css/opensans/opensans.css           | 100 ---------------------------------
>   ui/css/src/modules/_wok-variables.scss |   4 +-
>   ui/css/wok.css                         |  14 ++---
>   ui/pages/login.html.tmpl               |   1 -
>   ui/pages/wok-ui.html.tmpl              |   3 +-
>   19 files changed, 28 insertions(+), 248 deletions(-)
>   delete mode 100644 ui/css/opensans/Makefile.am
>   delete mode 100644 ui/css/opensans/opensans.css
>
> diff --git a/COPYING b/COPYING
> index a163007..980d024 100644
> --- a/COPYING
> +++ b/COPYING
> @@ -12,10 +12,6 @@ Files: ui/css/fontawesome/fontawesome.css
>   Source: http://fontawesome.io
>   License: MIT
>   
> -Files: ui/css/opensans/opensans.css
> -Source: https://fonts.google.com/specimen/Open+Sans
> -License: Apache-2.0
> -
>   Files: ui/css/src/bootstrap.custom.scss
>          ui/css/src/vendor/bootstrap-sass/bootstrap/*
>   Source: https://github.com/twbs/bootstrap
> diff --git a/IBM-license-blacklist b/IBM-license-blacklist
> index 6ff1e29..ba5050a 100644
> --- a/IBM-license-blacklist
> +++ b/IBM-license-blacklist
> @@ -42,7 +42,6 @@ src/wok/plugins/sample/ui/pages/help/en_US/.*.html
>   ui/base64/README.md
>   ui/base64/jquery.base64.js
>   ui/css/fontawesome/fontawesome.css
> -ui/css/opensans/opensans.css
>   ui/css/src/vendor/bootstrap-sass/LICENSE
>   ui/css/src/vendor/bootstrap-sass/bootstrap/.*.scss
>   ui/css/src/vendor/bootstrap-sass/bootstrap/mixins/.*.scss
> diff --git a/configure.ac b/configure.ac
> index 2f8d13a..2803dfb 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -79,7 +79,6 @@ AC_CONFIG_FILES([
>       ui/base64/Makefile
>       ui/css/Makefile
>       ui/css/fontawesome/Makefile
> -    ui/css/opensans/Makefile
>       ui/images/Makefile
>       ui/images/theme-default/Makefile
>       ui/js/Makefile
> diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
> index e825368..1254688 100644
> --- a/contrib/DEBIAN/control.in
> +++ b/contrib/DEBIAN/control.in
> @@ -16,8 +16,7 @@ Depends: python-cherrypy3 (>= 3.2.0),
>            fonts-font-awesome,
>            logrotate,
>            openssl,
> -         websockify,
> -         texlive-fonts-extra
> +         websockify
>   Build-Depends: xsltproc,
>                  gettext,
>                  python-lxml,
> diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
> index 7514376..df06e83 100644
> --- a/contrib/wok.spec.fedora.in
> +++ b/contrib/wok.spec.fedora.in
> @@ -18,7 +18,6 @@ Requires:	nginx
>   Requires:	python-ldap
>   Requires:	python-psutil >= 0.6.0
>   Requires:	fontawesome-fonts
> -Requires:	open-sans-fonts
>   Requires:	logrotate
>   Requires:	openssl
>   Requires:	python-websockify
> diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
> index cca3186..956fb26 100644
> --- a/contrib/wok.spec.suse.in
> +++ b/contrib/wok.spec.suse.in
> @@ -19,7 +19,6 @@ Requires:	python-xml
>   Requires:	nginx
>   Requires:	python-psutil >= 0.6.0
>   Requires:	fontawesome-fonts
> -Requires:	google-opensans-fonts
>   Requires:	logrotate
>   Requires:	openssl
>   Requires:	python-websockify
> diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md
> index 484f409..f4d63fe 100644
> --- a/docs/fedora-deps.md
> +++ b/docs/fedora-deps.md
> @@ -27,8 +27,8 @@ Runtime Dependencies
>   
>       $ sudo yum install python-cherrypy python-cheetah PyPAM m2crypto \
>                           python-jsonschema python-psutil python-ldap \
> -                        python-lxml nginx openssl open-sans-fonts \
> -                        fontawesome-fonts logrotate python-websockify
> +                        python-lxml nginx openssl python-websockify \
> +                        fontawesome-fonts logrotate
>   
>       # For RHEL systems, install the additional packages:
>       $ sudo yum install python-ordereddict
> diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md
> index eee39f9..71a1af9 100644
> --- a/docs/opensuse-deps.md
> +++ b/docs/opensuse-deps.md
> @@ -18,8 +18,7 @@ Runtime Dependencies
>       $ sudo zypper install python-CherryPy python-Cheetah python-pam \
>                             python-M2Crypto python-jsonschema python-psutil \
>                             python-ldap python-lxml python-xml nginx openssl \
> -                          google-opensans-fonts fontawesome-fonts logrotate \
> -                          python-websockify
> +                          fontawesome-fonts logrotate python-websockify
>   
>   Packages required for UI development
>   ------------------------------------
> diff --git a/docs/ubuntu-deps.md b/docs/ubuntu-deps.md
> index 3607998..4577348 100644
> --- a/docs/ubuntu-deps.md
> +++ b/docs/ubuntu-deps.md
> @@ -18,8 +18,7 @@ Runtime Dependencies
>       $ sudo apt-get install python-cherrypy3 python-cheetah python-pam \
>                               python-m2crypto python-jsonschema \
>                               python-psutil python-ldap python-lxml nginx \
> -                            openssl fonts-font-awesome texlive-fonts-extra \
> -                            websockify
> +                            openssl fonts-font-awesome websockify
>   
>   Packages required for UI development
>   ------------------------------------
> diff --git a/src/wok/config.py.in b/src/wok/config.py.in
> index c2bcc28..8349d58 100644
> --- a/src/wok/config.py.in
> +++ b/src/wok/config.py.in
> @@ -30,17 +30,7 @@ __release__ = "@wokrelease@"
>   CACHEEXPIRES = 31536000     # expires is one year.
>   DEFAULT_LOG_LEVEL = "info"
>   
> -FONT_FILES = {'fontawesome': ['fontawesome-webfont.ttf'],
> -              'opensans': ['OpenSans-ExtraBoldItalic.ttf',
> -                           'OpenSans-ExtraBold.ttf',
> -                           'OpenSans-LightItalic.ttf',
> -                           'OpenSans-Light.ttf',
> -                           'OpenSans-SemiboldItalic.ttf',
> -                           'OpenSans-BoldItalic.ttf',
> -                           'OpenSans-Italic.ttf',
> -                           'OpenSans-Bold.ttf',
> -                           'OpenSans-Semibold.ttf',
> -                           'OpenSans-Regular.ttf']}
> +FONT_FILES = {'fontawesome': ['fontawesome-webfont.ttf']}
>   
>   FONTS_PATH = {
>       'fontawesome': [
> @@ -48,12 +38,6 @@ FONTS_PATH = {
>           '/usr/share/fonts/truetype/font-awesome',
>           '/usr/share/fonts/truetype',
>           '/usr/share/fonts/TTF'
> -    ],
> -    'opensans': [
> -        '/usr/share/fonts/open-sans',
> -        '/usr/share/fonts/truetype/',
> -        '/usr/share/texlive/texmf-dist/fonts/truetype/public/opensans',
> -        '/usr/share/fonts/TTF'
>       ]
>   }
>   
> diff --git a/tests/test_config.py.in b/tests/test_config.py.in
> index a4d65bb..7b7e656 100644
> --- a/tests/test_config.py.in
> +++ b/tests/test_config.py.in
> @@ -155,76 +155,6 @@ class ConfigTests(unittest.TestCase):
>                   'tools.staticfile.on': True,
>                   'tools.staticfile.filename':
>                   '%s/fontawesome-webfont.ttf' % paths.fontawesome_dir
> -            },
> -            '/fonts/OpenSans-LightItalic.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-LightItalic.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-Bold.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-Bold.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-Italic.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-Italic.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-Semibold.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-Semibold.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-Light.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-Light.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-SemiboldItalic.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-SemiboldItalic.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-ExtraBold.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-ExtraBold.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-BoldItalic.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-BoldItalic.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-ExtraBoldItalic.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-ExtraBoldItalic.ttf' % paths.opensans_dir
> -            },
> -            '/fonts/OpenSans-Regular.ttf': {
> -                'tools.wokauth.on': False,
> -                'tools.nocache.on': False,
> -                'tools.staticfile.on': True,
> -                'tools.staticfile.filename':
> -                '%s/OpenSans-Regular.ttf' % paths.opensans_dir
>               }
>           }
>   
> diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
> index 1a75e6d..afa6609 100644
> --- a/ui/css/Makefile.am
> +++ b/ui/css/Makefile.am
> @@ -17,7 +17,7 @@
>   # See the License for the specific language governing permissions and
>   # limitations under the License.
>   
> -SUBDIRS = fontawesome opensans
> +SUBDIRS = fontawesome
>   
>   EXTRA_DIST = theme-default
>   
> diff --git a/ui/css/bootstrap.custom.css b/ui/css/bootstrap.custom.css
> index 76a6367..d2c2a32 100644
> --- a/ui/css/bootstrap.custom.css
> +++ b/ui/css/bootstrap.custom.css
> @@ -2,7 +2,7 @@
>   /*
>    * Project Wok
>    *
> - * Copyright IBM Corp, 2015-2016
> + * Copyright IBM Corp, 2015-2017
>    *
>    * Licensed under the Apache License, Version 2.0 (the "License");
>    * you may not use this file except in compliance with the License.
> @@ -330,7 +330,7 @@ html {
>   }
>   
>   body {
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-size: 14px;
>     line-height: 1.42857;
>     color: #222;
> @@ -3901,7 +3901,7 @@ tbody.collapse.in {
>     height: 55px;
>     background: transparent url("../images/wok-logo.png") no-repeat 4px 5px;
>     color: #fff;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-weight: 700;
>     font-size: 1.571em;
>     line-height: 55px;
> @@ -4157,7 +4157,7 @@ tbody.collapse.in {
>     display: block;
>     vertical-align: middle;
>     color: #fff;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-size: 13pt;
>     font-weight: normal;
>     line-height: 24px;
> @@ -4320,7 +4320,7 @@ tbody.collapse.in {
>     padding-right: 10px;
>     margin: 0;
>     font-size: 12pt;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-weight: 700;
>     color: #fff;
>     text-decoration: none;
> @@ -4370,7 +4370,7 @@ tbody.collapse.in {
>   
>   .navbar-default .navbar-nav > .hostname .host-location {
>     display: inline-block;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     color: #fff;
>     font-size: 8.5pt;
>     font-weight: 300;
> @@ -6033,7 +6033,7 @@ button.close {
>     margin: 0;
>     line-height: 23px;
>     font-size: 27px;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-weight: 300 !important;
>   }
>   
> @@ -6127,7 +6127,7 @@ button.close {
>   .modal label {
>     color: #222;
>     font-weight: 400;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-size: 20px;
>   }
>   
> @@ -6162,7 +6162,7 @@ button.close {
>   .modal-body .nav-tabs > li > a {
>     font-size: 17px;
>     font-weight: 300;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     border: 0;
>     border-bottom: 5px solid #eee;
>     text-align: center;
> @@ -6178,7 +6178,7 @@ button.close {
>     position: absolute;
>     z-index: 1070;
>     display: block;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-style: normal;
>     font-weight: normal;
>     letter-spacing: normal;
> @@ -6312,7 +6312,7 @@ button.close {
>     display: none;
>     max-width: 276px;
>     padding: 1px;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-style: normal;
>     font-weight: normal;
>     letter-spacing: normal;
> diff --git a/ui/css/opensans/Makefile.am b/ui/css/opensans/Makefile.am
> deleted file mode 100644
> index a01c208..0000000
> --- a/ui/css/opensans/Makefile.am
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -#
> -# Project Wok
> -#
> -# Copyright IBM Corp, 2015-2016
> -#
> -# Code derived from Project Kimchi
> -#
> -# Licensed 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.
> -
> -opensanscssdir = $(datadir)/wok/ui/css/opensans
> -dist_opensanscss_DATA = opensans.css
> diff --git a/ui/css/opensans/opensans.css b/ui/css/opensans/opensans.css
> deleted file mode 100644
> index 57a6533..0000000
> --- a/ui/css/opensans/opensans.css
> +++ /dev/null
> @@ -1,100 +0,0 @@
> -@charset "UTF-8";
> -/*
> -*  Font license info
> -*
> -*  Open Sans font family is licensed under the Apache License, Version 2.0:
> -*
> -*  Licensed 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.
> -*/
> -
> -/* This file was modified according to Kimchi proposals */
> -
> -/* BEGIN Light */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Light.ttf") format("truetype");
> -  font-weight: 300;
> -  font-style: normal; }
> -/* END Light */
> -
> -/* BEGIN Light Italic */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-LightItalic.ttf") format("truetype");
> -  font-weight: 300;
> -  font-style: italic; }
> -/* END Light Italic */
> -
> -/* BEGIN Regular */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Regular.ttf") format("truetype");
> -  font-weight: normal;
> -  font-style: normal; }
> -/* END Regular */
> -
> -/* BEGIN Italic */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Italic.ttf") format("truetype");
> -  font-weight: normal;
> -  font-style: italic; }
> -/* END Italic */
> -
> -/* BEGIN Semibold */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Semibold.ttf") format("truetype");
> -  font-weight: 600;
> -  font-style: normal; }
> -/* END Semibold */
> -
> -/* BEGIN Semibold Italic */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-SemiboldItalic.ttf") format("truetype");
> -  font-weight: 600;
> -  font-style: italic; }
> -/* END Semibold Italic */
> -
> -/* BEGIN Bold */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-Bold.ttf") format("truetype");
> -  font-weight: bold;
> -  font-style: normal; }
> -/* END Bold */
> -
> -/* BEGIN Bold Italic */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-BoldItalic.ttf") format("truetype");
> -  font-weight: bold;
> -  font-style: italic; }
> -/* END Bold Italic */
> -
> -/* BEGIN Extrabold */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-ExtraBold.ttf") format("truetype");
> -  font-weight: 800;
> -  font-style: normal; }
> -/* END Extrabold */
> -
> -/* BEGIN Extrabold Italic */
> -@font-face {
> -  font-family: 'Open Sans';
> -  src: local('Open Sans'), local('OpenSans'), url("/fonts/OpenSans-ExtraBoldItalic.ttf") format("truetype");
> -  font-weight: 800;
> -  font-style: italic; }
> -/* END Extrabold Italic */
> diff --git a/ui/css/src/modules/_wok-variables.scss b/ui/css/src/modules/_wok-variables.scss
> index 5b4b2d8..25037c6 100644
> --- a/ui/css/src/modules/_wok-variables.scss
> +++ b/ui/css/src/modules/_wok-variables.scss
> @@ -1,7 +1,7 @@
>   //
>   // Project Wok
>   //
> -// Copyright IBM Corp, 2015-2016
> +// Copyright IBM Corp, 2015-2017
>   //
>   // Licensed under the Apache License, Version 2.0 (the "License");
>   // you may not use this file except in compliance with the License.
> @@ -74,7 +74,7 @@ $link-hover-decoration: underline !default;
>   //
>   //## Font, line-height, and color for body text, headings, and more.
>   
> -$font-family-sans-serif:  'Open Sans', Helvetica, Arial, "Lucida Grande", sans-serif !default;
> +$font-family-sans-serif:  Helvetica, Arial, "Lucida Grande", sans-serif !default;
>   $font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
>   //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
>   $font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
> diff --git a/ui/css/wok.css b/ui/css/wok.css
> index ec269b5..b9b7c92 100644
> --- a/ui/css/wok.css
> +++ b/ui/css/wok.css
> @@ -252,7 +252,7 @@ html.in-progress .disabled {
>   
>   .login-area .bootstrap-select,
>   .login-area .selectpicker {
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-size: 13pt;
>   }
>   
> @@ -292,7 +292,7 @@ html.in-progress .disabled {
>   }
>   
>   .navbar-default.toolbar .navbar-right.tools > li > a {
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     display: inline-block;
>     color: #fff;
>     text-decoration: none;
> @@ -323,7 +323,7 @@ html.in-progress .disabled {
>   }
>   
>   .btn {
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-size: 13pt;
>   }
>   
> @@ -484,7 +484,7 @@ fieldset[disabled] .btn-group > span > .btn.active {
>     background: #4d4c4e !important;
>     min-width: 160px;
>     border: 0 !important;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-weight: 700;
>     font-size: 13.5pt;
>     text-align: left;
> @@ -1056,7 +1056,7 @@ fieldset[disabled] .btn-group > span > .btn.active {
>   }
>   
>   .wok-datagrid > .wok-datagrid-header > span {
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     font-weight: 300;
>     font-size: 12.5pt;
>     vertical-align: bottom;
> @@ -1071,7 +1071,7 @@ fieldset[disabled] .btn-group > span > .btn.active {
>   }
>   
>   .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span {
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>     line-height: 2.42857;
>     vertical-align: top;
>     font-size: 12.5pt;
> @@ -1163,7 +1163,7 @@ fieldset[disabled] .btn-group > span > .btn.active {
>   label {
>     font-size: 1.143em;
>     font-weight: 400;
> -  font-family: "Open Sans", Helvetica, Arial, "Lucida Grande", sans-serif;
> +  font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
>   }
>   
>   .form-control-feedback {
> diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl
> index 6f967cf..13dbc51 100644
> --- a/ui/pages/login.html.tmpl
> +++ b/ui/pages/login.html.tmpl
> @@ -65,7 +65,6 @@
>       <link rel="stylesheet" href="$href('libs/bootstrap-select/dist/css/bootstrap-select.min.css')">
>       <link rel="stylesheet" href="$href('libs/datatables/css/datatables.min.css')">
>       <link rel="stylesheet" href="$href('css/fontawesome/fontawesome.css')">
> -    <link rel="stylesheet" href="$href('css/opensans/opensans.css')">
>       <link rel="stylesheet" href="$href('css/bootstrap-select.custom.css')">
>       <link rel="stylesheet" href="$href('css/datatables.bootstrap.css')">
>       <link rel="stylesheet" href="$href('css/wok.css')">
> diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl
> index 36a0492..8780e0b 100644
> --- a/ui/pages/wok-ui.html.tmpl
> +++ b/ui/pages/wok-ui.html.tmpl
> @@ -1,7 +1,7 @@
>   #*
>    * Project Wok
>    *
> - * Copyright IBM Corp, 2015-2016
> + * Copyright IBM Corp, 2015-2017
>    *
>    * Code derived from Project Kimchi
>    *
> @@ -67,7 +67,6 @@
>       <link rel="stylesheet" href="$href('libs/bootstrap-editable/dist/css/bootstrap-editable.css')">
>       <link rel="stylesheet" href="$href('libs/datatables/css/datatables.min.css')">
>       <link rel="stylesheet" href="$href('css/fontawesome/fontawesome.css')">
> -    <link rel="stylesheet" href="$href('css/opensans/opensans.css')">
>       <link rel="stylesheet" href="$href('css/bootstrap-select.custom.css')">
>       <link rel="stylesheet" href="$href('css/datatables.bootstrap.css')">
>       <link rel="stylesheet" href="$href('css/wok.css')">

_______________________________________________
Kimchi-devel mailing list
Kimchi-devel@ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel

Re: [Kimchi-devel] [PATCH] [Wok] Remove Open Sans font requirement

Posted by Aline Manera 87 weeks ago
Applied. Thanks.

Regards,

Aline Manera

_______________________________________________
Kimchi-devel mailing list
Kimchi-devel@ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel