kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject [04/30] incubator-kylin git commit: KYLIN-999 fix for google fonts license
Date Wed, 18 Nov 2015 02:38:58 GMT
KYLIN-999 fix for google fonts license

Signed-off-by: shaofengshi <shaofengshi@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/efd234ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/efd234ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/efd234ec

Branch: refs/heads/1.x-HBase1.1.3
Commit: efd234ec15e74b7247ee3a0c4ef8bcf171b02d0f
Parents: 4c889cd
Author: Luke Han <lukehan@apache.org>
Authored: Wed Nov 4 10:16:23 2015 +0800
Committer: shaofengshi <shaofengshi@apache.org>
Committed: Thu Nov 5 11:16:21 2015 +0800

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 webapp/app/css/AdminLTE-fonts.css               |  23 -------------------
 webapp/app/css/AdminLTE.css                     |   4 ++--
 ...1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 | Bin 11400 -> 0 bytes
 ...t5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 | Bin 11044 -> 0 bytes
 5 files changed, 3 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/efd234ec/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index b016aa2..9a27b8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ tmp/
 *.bak
 *.swp
 *~.nib
+*.versionsBackup
 local.properties
 release.properties
 .loadpath

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/efd234ec/webapp/app/css/AdminLTE-fonts.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE-fonts.css b/webapp/app/css/AdminLTE-fonts.css
deleted file mode 100644
index a8e0244..0000000
--- a/webapp/app/css/AdminLTE-fonts.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- *   AdminLTE v1.2
- *   Author: AlmsaeedStudio.com
- *   License: Open source - MIT
- *           Please visit http://opensource.org/licenses/MIT for more information
-!*/
-
-/* latin */
-@font-face {
-    font-family: 'Source Sans Pro';
-    font-style: normal;
-    font-weight: 400;
-    src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(../fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2)
format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F,
U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
-/* latin */
-@font-face {
-    font-family: 'Source Sans Pro';
-    font-style: normal;
-    font-weight: 700;
-    src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(../fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2)
format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F,
U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/efd234ec/webapp/app/css/AdminLTE.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE.css b/webapp/app/css/AdminLTE.css
index e91795e..d86593d 100644
--- a/webapp/app/css/AdminLTE.css
+++ b/webapp/app/css/AdminLTE.css
@@ -21,7 +21,7 @@ body {
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
   font-weight: 400;
   overflow-x: hidden;
   overflow-y: auto;
@@ -151,7 +151,7 @@ h6,
 .h4,
 .h5,
 .h6 {
-  font-family: 'Source Sans Pro', sans-serif;
+  font-family: sans-serif;
 }
 /* General Links */
 a {

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/efd234ec/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2
----------------------------------------------------------------------
diff --git a/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 b/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2
deleted file mode 100644
index da49c62..0000000
Binary files a/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 and /dev/null
differ

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/efd234ec/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
----------------------------------------------------------------------
diff --git a/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
b/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
deleted file mode 100644
index 2486c1d..0000000
Binary files a/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
and /dev/null differ


Mime
View raw message