You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/09/03 06:37:32 UTC
[25/50] [abbrv] kylin git commit: minor remove googleapi fonts from
dependency
minor remove googleapi fonts from dependency
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/27426aef
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/27426aef
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/27426aef
Branch: refs/heads/1.5.x-HBase1.x
Commit: 27426aef28f57813db90c6713ea7fd21f0151cbe
Parents: fdad2d8
Author: Jason <ji...@163.com>
Authored: Tue Aug 30 11:32:19 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Tue Aug 30 11:32:19 2016 +0800
----------------------------------------------------------------------
pom.xml | 1 +
webapp/app/css/messenger-theme-ice.css | 125 ++++++++++++++++++++++++++++
webapp/app/index.html | 2 +-
webapp/grunt.json | 2 +-
4 files changed, 128 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/27426aef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ea29958..d5925b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1186,6 +1186,7 @@
<!-- MIT license -->
<exclude>webapp/app/css/AdminLTE.css</exclude>
+ <exclude>webapp/app/css/messenger-theme-ice.css</exclude>
<exclude>webapp/app/js/directives/kylin_abn_tree_directive.js</exclude>
<exclude>webapp/app/js/directives/angular-tree-control.js</exclude>
<exclude>webapp/app/js/directives/datetimepicker.js</exclude>
http://git-wip-us.apache.org/repos/asf/kylin/blob/27426aef/webapp/app/css/messenger-theme-ice.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/messenger-theme-ice.css b/webapp/app/css/messenger-theme-ice.css
new file mode 100644
index 0000000..faf5f66
--- /dev/null
+++ b/webapp/app/css/messenger-theme-ice.css
@@ -0,0 +1,125 @@
+/*!
+Copyright (c) 2013 HubSpot, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+/* line 12, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice {
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ -o-user-select: none;
+ user-select: none;
+ font-family: "Raleway", sans-serif;
+}
+/* line 16, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message {
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ -ms-border-radius: 5px;
+ -o-border-radius: 5px;
+ border-radius: 5px;
+ -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.14), 0 4px #aaaaaa, 0 5px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.14), 0 4px #aaaaaa, 0 5px rgba(0, 0, 0, 0.05);
+ box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.14), 0 4px #aaaaaa, 0 5px rgba(0, 0, 0, 0.05);
+ border: 0px;
+ background-color: #f6f6f6;
+ position: relative;
+ margin-bottom: 1.5em;
+ font-size: 13px;
+ color: #666666;
+ font-weight: 500;
+ padding: 12px 22px;
+}
+/* line 28, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-close {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ color: #888888;
+ opacity: 1;
+ font-weight: bold;
+ display: block;
+ font-size: 20px;
+ line-height: 20px;
+ padding: 8px 10px 7px 7px;
+ cursor: pointer;
+ background: transparent;
+ border: 0;
+ -webkit-appearance: none;
+}
+/* line 44, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-close:hover {
+ color: #444444;
+}
+/* line 47, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-close:active {
+ color: #222222;
+}
+/* line 50, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-actions {
+ float: none;
+ margin-top: 10px;
+}
+/* line 54, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-actions a {
+ -webkit-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.05);
+ -moz-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.05);
+ box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.05);
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ -ms-border-radius: 4px;
+ -o-border-radius: 4px;
+ border-radius: 4px;
+ position: relative;
+ text-decoration: none;
+ display: inline-block;
+ padding: 10px;
+ color: #888888;
+ margin-right: 10px;
+ padding: 3px 10px 5px;
+ text-transform: capitalize;
+}
+/* line 66, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-actions a:hover, ul.messenger-theme-ice .messenger-message .messenger-actions a:active {
+ -webkit-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.15), 0 2px #aaaaaa;
+ -moz-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.15), 0 2px #aaaaaa;
+ box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.15), 0 2px #aaaaaa;
+ color: #444444;
+}
+/* line 70, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-actions a:active {
+ -webkit-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.15), 0 1px #aaaaaa;
+ -moz-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.15), 0 1px #aaaaaa;
+ box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), inset 0px 1px rgba(255, 255, 255, 0.15), 0 1px #aaaaaa;
+ top: 1px;
+}
+/* line 74, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-actions .messenger-phrase {
+ display: none;
+}
+/* line 77, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message .messenger-message-inner:before {
+ display: block;
+ z-index: 20;
+ font-weight: bold;
+ margin-bottom: 2px;
+}
+/* line 84, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message.alert-success .messenger-message-inner:before {
+ content: "Success";
+}
+/* line 88, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message.alert-error .messenger-message-inner:before {
+ content: "Error";
+}
+/* line 92, ../../src/sass/messenger-theme-ice.sass */
+ul.messenger-theme-ice .messenger-message.alert-info .messenger-message-inner:before {
+ content: "Information";
+}
+
http://git-wip-us.apache.org/repos/asf/kylin/blob/27426aef/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index 282567c..8fb2cb9 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -34,7 +34,7 @@
<link rel="stylesheet" type="text/css" href="components/angular-tree-control/css/tree-control.css">
<link rel="stylesheet" type="text/css" href="components/angular-tree-control/css/tree-control-attribute.css">
<link rel="stylesheet" type="text/css" href="components/messenger/build/css/messenger.css">
- <link rel="stylesheet" type="text/css" href="components/messenger/build/css/messenger-theme-ice.css">
+ <link rel="stylesheet" type="text/css" href="css/messenger-theme-ice.css">
<link rel="stylesheet" type="text/css" href="components/ng-grid/ng-grid.css">
<link rel="stylesheet" type="text/css" href="components/angular-ui-grid/ui-grid.min.css">
<link rel="stylesheet" type="text/css" href="components/chosen/chosen.css">
http://git-wip-us.apache.org/repos/asf/kylin/blob/27426aef/webapp/grunt.json
----------------------------------------------------------------------
diff --git a/webapp/grunt.json b/webapp/grunt.json
index 3c2cbf8..d0ee545 100755
--- a/webapp/grunt.json
+++ b/webapp/grunt.json
@@ -62,7 +62,7 @@
"app/components/angular-ui-grid/ui-grid.min.css",
"app/components/animate.css/animate.min.css",
"app/components/messenger/build/css/messenger.css",
- "app/components/messenger/build/css/messenger-theme-ice.css",
+ "app/css/messenger-theme-ice.css",
"app/components/chosen/chosen.css",
"app/components/angular-chosen-localytics/chosen-spinner.css",
"app/components/nvd3/nv.d3.min.css",