You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/15 07:21:45 UTC
[16/52] [abbrv] incubator-kylin git commit: reset default call-out
style in new adminLte version
reset default call-out style in new adminLte version
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/e6b0715d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/e6b0715d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/e6b0715d
Branch: refs/heads/0.8.0
Commit: e6b0715de2ed85a996bfb592d110d13d47febe91
Parents: fb405eb
Author: jiazhong <ji...@ebay.com>
Authored: Tue Mar 17 17:52:31 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri May 15 11:35:49 2015 +0800
----------------------------------------------------------------------
webapp/app/index.html | 22 ++++++++++++++++++++--
webapp/app/less/component.less | 32 ++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e6b0715d/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index c8698ac..8c6bb2d 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -184,11 +184,11 @@
<!--template-->
<!-- static template for cube save/update result notification -->
<script type="text/ng-template" id="cubeResultError.html">
- <div class="callout callout-danger">
+ <div class="callout">
<h4>Error Message</h4>
<p>{{text}}</p>
</div>
- <div class="callout callout-info">
+ <div class="callout callout-danger">
<h4>Cube Schema</h4>
<pre>{{schema}}</pre>
</div>
@@ -200,6 +200,24 @@
</div>
</script>
+<!--template-->
+<!-- static template for cube save/update result notification -->
+<script type="text/ng-template" id=" modelResultError.html">
+ <div class="callout callout-info">
+ <h4>Error Message</h4>
+ <p>{{text}}</p>
+ </div>
+ <div class="callout callout-danger">
+ <h4>Model Schema</h4>
+ <pre>{{schema}}</pre>
+ </div>
+</script>
+
+<script type="text/ng-template" id="modelResultSuccess.html">
+ <div class="callout callout-info">
+ <p>{{text}}</p>
+ </div>
+</script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e6b0715d/webapp/app/less/component.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/component.less b/webapp/app/less/component.less
index 18a0cd2..0289bc4 100644
--- a/webapp/app/less/component.less
+++ b/webapp/app/less/component.less
@@ -861,3 +861,35 @@ span.input-icon {
-moz-box-shadow: 0 0 8px rgba(82, 168, 236, .6);
box-shadow: 0 0 8px rgba(82, 168, 236, .6)
}
+
+
+//override callout info in AdinLTE.css
+.callout {
+ margin: 0 0 20px 0 !important;
+ padding: 15px 30px 15px 15px !important;
+ border-left: 5px solid #eee !important;
+ color: black !important;
+ }
+
+.callout.callout-info {
+ background-color: #f0f7fd !important;
+ border-color: #d0e3f0 !important;
+ color: black !important;
+}
+
+.callout.callout-danger {
+ background-color: #fcf2f2 !important;
+ border-color: #dFb5b4 !important;
+ color: black !important;
+}
+
+ul.messenger-theme-ice .messenger-message{
+ color:#666667 !important;
+}
+.messenger-message.alert{
+ background-color: #f6f6f6 !important;
+}
+
+.model-dimension-edit .chosen-container{
+ width:100% !important;
+}