zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject incubator-zeppelin git commit: Fix ZEPPELIN-151
Date Sun, 12 Jul 2015 16:18:33 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 201ce8dee -> 3341bf0dc


Fix ZEPPELIN-151

Move the Font Imports to another file so it is not in the middle of minified css

Author: Damien Corneau <corneadoug@gmail.com>

Closes #145 from corneadoug/fix/fontImport and squashes the following commits:

61d95ed [Damien Corneau] Set old cssmin version
03aae98 [Damien Corneau] Add licence in new css file
a7a3c59 [Damien Corneau] Fix ZEPPELIN-151


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

Branch: refs/heads/master
Commit: 3341bf0dcf19584aeac58df872a2013490311778
Parents: 201ce8d
Author: Damien Corneau <corneadoug@gmail.com>
Authored: Wed Jul 8 11:26:00 2015 +0900
Committer: Lee moon soo <moon@apache.org>
Committed: Sun Jul 12 09:18:29 2015 -0700

----------------------------------------------------------------------
 zeppelin-web/Gruntfile.js                     |  2 +-
 zeppelin-web/src/app/home/home.css            |  3 ---
 zeppelin-web/src/assets/styles/fontImport.css | 17 +++++++++++++++++
 zeppelin-web/src/index.html                   |  1 +
 4 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/3341bf0d/zeppelin-web/Gruntfile.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js
index dc2a33e..eabe0fb 100644
--- a/zeppelin-web/Gruntfile.js
+++ b/zeppelin-web/Gruntfile.js
@@ -246,7 +246,7 @@ module.exports = function (grunt) {
       dist: {
         files: {
           '<%= yeoman.dist %>/styles/main.css': [
-            '.tmp/styles/{,*/}*.css'
+            '.tmp/styles/*.css'
           ]
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/3341bf0d/zeppelin-web/src/app/home/home.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/home/home.css b/zeppelin-web/src/app/home/home.css
index 5058cb8..1becd4f 100644
--- a/zeppelin-web/src/app/home/home.css
+++ b/zeppelin-web/src/app/home/home.css
@@ -11,9 +11,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import url(//fonts.googleapis.com/css?family=Patua+One);
-@import url(//fonts.googleapis.com/css?family=Roboto);
-@import url(//fonts.googleapis.com/css?family=Source+Code+Pro);
 
 body {
   padding-top: 60px;

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/3341bf0d/zeppelin-web/src/assets/styles/fontImport.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/assets/styles/fontImport.css b/zeppelin-web/src/assets/styles/fontImport.css
new file mode 100644
index 0000000..3c88dfb
--- /dev/null
+++ b/zeppelin-web/src/assets/styles/fontImport.css
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+
+@import url(//fonts.googleapis.com/css?family=Patua+One);
+@import url(//fonts.googleapis.com/css?family=Roboto);
+@import url(//fonts.googleapis.com/css?family=Source+Code+Pro);

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/3341bf0d/zeppelin-web/src/index.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 9d6905c..a647ae2 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -48,6 +48,7 @@ limitations under the License.
     <link rel="stylesheet" href="fonts/custom-font.css">
     <!-- endbuild -->
     <link rel="stylesheet" ng-href="assets/styles/looknfeel/{{looknfeel}}.css">
+    <link rel="stylesheet" href="assets/styles/fontImport.css" />
   </head>
   <body ng-class="{'bodyAsIframe': asIframe}" >
     <!--[if lt IE 7]>


Mime
View raw message