chukwa-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject chukwa git commit: CHUKWA-806. Replace gridster with gridstack. (Eric Yang)
Date Sun, 01 May 2016 15:31:33 GMT
Repository: chukwa
Updated Branches:
  refs/heads/master 6f6e4399e -> 6f04f07cd


CHUKWA-806. Replace gridster with gridstack.  (Eric Yang)


Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo
Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/6f04f07c
Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/6f04f07c
Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/6f04f07c

Branch: refs/heads/master
Commit: 6f04f07cd061ff94d212d9b35400d9a036af5d50
Parents: 6f6e439
Author: Eric Yang <eyang@apache.org>
Authored: Sat Apr 30 21:00:33 2016 -0700
Committer: Eric Yang <eyang@apache.org>
Committed: Sun May 1 08:31:26 2016 -0700

----------------------------------------------------------------------
 pom.xml                              |  4 ++
 src/main/web/hicc/WEB-INF/vm/tile.vm | 75 +++++++++++++------------------
 2 files changed, 34 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/chukwa/blob/6f04f07c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fedb59a..9a66922 100644
--- a/pom.xml
+++ b/pom.xml
@@ -911,6 +911,9 @@
                     <exclude>src/main/web/hicc/home/js/select2.min.js</exclude>
                     <exclude>src/main/web/hicc/css/font-awesome.min.css</exclude>
                     <exclude>src/main/web/hicc/fonts/glyphicons-halflings-regular.*</exclude>
+                    <exclude>src/main/web/hicc/home/css/gridstack.min.css</exclude>
+                    <exclude>src/main/web/hicc/home/js/gridstack.min.*</exclude>
+                    <exclude>src/main/web/hicc/home/js/jquery-ui.js</exclude>
 
   			            <!-- Creative Commons licensed files -->
   			            <exclude>src/main/web/hicc/js/autoHeight.js</exclude>
@@ -921,6 +924,7 @@
   			            <exclude>src/main/web/hicc/js/json.js</exclude>
   			            <exclude>src/main/web/hicc/home/fonts/codropsicons/*</exclude>
   			            <exclude>src/main/web/hicc/home/fonts/ecoicons/*</exclude>
+                                    <exclude>src/main/web/hicc/home/js/lodash.min.js</exclude>
 
                     <!-- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December
2004 -->
                     <exclude>src/main/web/hicc/css/chartist.css</exclude>

http://git-wip-us.apache.org/repos/asf/chukwa/blob/6f04f07c/src/main/web/hicc/WEB-INF/vm/tile.vm
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/WEB-INF/vm/tile.vm b/src/main/web/hicc/WEB-INF/vm/tile.vm
index edb157d..a187509 100644
--- a/src/main/web/hicc/WEB-INF/vm/tile.vm
+++ b/src/main/web/hicc/WEB-INF/vm/tile.vm
@@ -24,82 +24,67 @@
     <script src="/hicc/js/jquery.js" type="text/javascript"></script>
     <script src="/hicc/js/bootstrap.min.js" type="text/javascript"></script>
     <style>
+      html, body,.container {
+        height: 100%;
+      }
       .tile {
         color: #ffffff;
         background-color: #5bc0de;
       }
       .container {
         width: 100%;
+        height: 100%;
+        display:table;
+        padding: 0 0 0 0; /*set left/right padding according to needs*/
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
       }
       .row {
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
-        display:         flex;
+        display: table-row;
+        height: 100%;
       }
 
-      .jumbotron.vertical-center {
-        margin-bottom: 0; /* Remove the default bottom margin of .jumbotron */
+      .col-md-5 {
+        display: table-cell;
+        float: none;
+        font-size: 20px;
       }
 
-      .vertical-center {
-        min-height: 100%;  /* Fallback for vh unit */
-        min-height: 100vh; /* You might also want to use
-                              'height' property instead.
-
-                               Note that for percentage values of
-                              'height' or 'min-height' properties,
-                               the 'height' of the parent element
-                               should be specified explicitly.
- 
-                               In this case the parent of '.vertical-center'
-                               is the <body> element */
-
-        /* Make it a flex container */
-        display: -webkit-box;
-        display: -moz-box;
-        display: -ms-flexbox;
-        display: -webkit-flex;
-        display: flex;
- 
-        /* Align the bootstrap's container vertically */
-          -webkit-box-align : center;
-        -webkit-align-items : center;
-             -moz-box-align : center;
-             -ms-flex-align : center;
-                align-items : center;
-
-        /* In legacy web browsers such as Firefox 9
-           we need to specify the width of the flex container */
-        width: 100%;
+      .col-xs-5 {
+        display: table-cell;
+        float: none;
+        font-size: 9px;
+      }
 
-        /* Also 'margin: 0 auto' doesn't have any effect on flex items in such web browsers
-           hence the bootstrap's container won't be aligned to the center anymore.
+      .col-md-7 {
+        display: table-cell;
+        float: none;
+        font-size: 20px;
+      }
 
-           Therefore, we should use the following declarations to get it centered again */
-               -webkit-box-pack : center;
-                  -moz-box-pack : center;
-                  -ms-flex-pack : center;
-        -webkit-justify-content : center;
-                justify-content : center;
+      .col-xs-7 {
+        display: table-cell;
+        float: none;
+        font-size: 9px;
       }
 
     </style>
   </head>
   <body onResize="resize()">
-    <div class="vertical-center">
     <div class="container">
       <div class="row">
-        <div class="col-xs-5 col-md-5 text-center tile">
+        <div class="col-md-5 col-xs-5 text-center tile no-float">
             <h2><span class="glyphicon $chart.getIcon()" aria-hidden="true"></span></h2>
             $chart.getBannerText()
         </div>
-        <div class="col-xs-7 col-md-7 text-center">
+        <div class="col-md-7 col-xs-7 text-center no-float">
           <p><h1 id="value"></h1> $chart.getSuffixText()</p>
         </div>
       </div>
     </div>
-    </div>
 
     <script src="/hicc/js/jquery.js"></script>
     <script>


Mime
View raw message