From d83cdfb667967f930207d4638a2c67fe15d18c00 Mon Sep 17 00:00:00 2001
From: Heiko Kernbach <heiko@arangodb.com>
Date: Fri, 16 Aug 2013 08:47:58 +0200
Subject: [PATCH] small css changes dashboard/aql editor

---
 html/admin/css/dashboardView.css          | 58 ++++++++++++-----------
 html/admin/css/queryView.css              |  3 +-
 html/admin/js/templates/dashboardView.ejs | 19 +-------
 html/admin/js/views/dashboardView.js      |  2 +-
 4 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/html/admin/css/dashboardView.css b/html/admin/css/dashboardView.css
index 2f0634dce2..6c14e01190 100644
--- a/html/admin/css/dashboardView.css
+++ b/html/admin/css/dashboardView.css
@@ -10,12 +10,10 @@
   border: 8px solid #FFFFFF;
 }
 */
-
-#dashboardContent {
-  padding-left: 0px !important;
-  padding-top: 5px !important;
-  padding-bottom: 5px !important;
-  padding-right: 0px !important;
+.dashboardContent {
+  padding-bottom: 20px !important;
+  padding-top: 10px !important;
+  margin-bottom: 10px !important;
 }
 
 .dbNotVisible {
@@ -79,12 +77,15 @@
 
 .statSingleClient {
   height: 400px;
-  width: 100% !important;
+  width: auto !important;
   margin-top: 11px;
-  margin-left: 10px !important;
-  margin-right: 11px !important;
+  margin-left: 5px !important;
+  margin-right: 5px !important;
   margin-bottom: -10px !important;
-  border: 1px solid #C1BDBA !important;
+  border-top: 1px solid #888888 !important;
+  border-left: 1px solid #E5E5E5 !important;
+  border-right: 1px solid #E5E5E5 !important;
+  border-bottom: 1px solid #E5E5E5 !important;
   background-color: #FFFFFF !important;
 }
 
@@ -192,13 +193,9 @@ li:hover h6, li.hover h6 {
   padding-right: 5px;
   padding-left: 5px;
   background-color: #686766;
-  border-bottom: 1px solid #A0A0A0;
-  border-top: 1px solid #A0A0A0;
   color: #FFFFFF;
   height: 36px;
-  margin-bottom: 0px !important;
-  margin-top: 20px !important;
-  position: relative;
+  margin-top: 5px !important;
 }
 
 #dashboardHeader .btn-group {
@@ -243,17 +240,16 @@ li:hover h6, li.hover h6 {
 }
 
 /*Dashboard Checkbox*/
-#dashboardHeader input[type=checkbox].css-checkbox, #transparentHeader input[type=checkbox].css-checkbox, #collectionsDropdown input[type=checkbox].css-checkbox {
+#dashboardDropdownOut input[type=checkbox].css-checkbox, #transparentHeader input[type=checkbox].css-checkbox, #collectionsDropdown input[type=checkbox].css-checkbox {
   display:none;
 }
 
-#dashboardHeader input[type=checkbox].css-checkbox + label.css-label, #transparentHeader input[type=checkbox].css-checkbox + label.css-label, #collectionsDropdown input[type=checkbox].css-checkbox + label.css-label {
+#dashboardDropdownOut input[type=checkbox].css-checkbox + label.css-label, #transparentHeader input[type=checkbox].css-checkbox + label.css-label, #collectionsDropdown input[type=checkbox].css-checkbox + label.css-label {
   padding-left:20px;
   margin-top: 0px;
   margin-bottom: -0px;
   height:15px; 
   display:inline-block;
-  line-height:15px;
   background-repeat:no-repeat;
   background-position: 0 0;
   font-size:15px;
@@ -261,7 +257,7 @@ li:hover h6, li.hover h6 {
   cursor:pointer;
 }
 
-#dashboardHeader input[type=checkbox].css-checkbox:checked + label.css-label, #transparentHeader input[type=checkbox].css-checkbox:checked + label.css-label, #collectionsDropdown input[type=checkbox].css-checkbox:checked + label.css-label {
+#dashboardDropdownOut input[type=checkbox].css-checkbox:checked + label.css-label, #transparentHeader input[type=checkbox].css-checkbox:checked + label.css-label, #collectionsDropdown input[type=checkbox].css-checkbox:checked + label.css-label {
   background-position: 0 -15px;
 }
 
@@ -275,17 +271,17 @@ li:hover h6, li.hover h6 {
   margin-left: -21px;
 }
 
-#dashboardHeader input[type="radio"], #transparentHeader input[type="radio"] {
+#dashboardDropdownOut input[type="radio"], #transparentHeader input[type="radio"] {
   display:none;
 }
 
-#dashboardHeader input[type="radio"] + label, #transparentHeader input[type="radio"] + label {
+#dashboardDropdownOut input[type="radio"] + label, #transparentHeader input[type="radio"] + label {
   /*color:#f2f2f2;*/
   /*font-family:Arial, sans-serif;
   font-size:14px;*/
 }
 
-#dashboardHeader input[type="radio"] + label span, #transparentHeader input[type="radio"] + label span {
+#dashboardDropdownOut input[type="radio"] + label span, #transparentHeader input[type="radio"] + label span {
   display:inline-block;
   width:19px;
   height:19px;
@@ -295,7 +291,7 @@ li:hover h6, li.hover h6 {
   cursor:pointer;
 }
 
-#dashboardHeader input[type="radio"]:checked + label span, #transparentHeader input[type="radio"]:checked + label span {
+#dashboardDropdownOut input[type="radio"]:checked + label span, #transparentHeader input[type="radio"]:checked + label span {
   background:url(../img/check_radio_sheet.png) -57px top no-repeat;
 }
 
@@ -433,7 +429,7 @@ li:hover h6, li.hover h6 {
 }
 
 #shortcutDiv {
-  padding-top: 5px;
+  padding-top: 10px;
   font-size: 12px;
   font-weight: 200;
 }
@@ -459,16 +455,24 @@ li:hover h6, li.hover h6 {
 }
 
 #detailGraphPadding {
-  padding-right: 31px !important;
-  margin-left: -2px !important;
   margin-top: -12px !important;
 }
 
+.dashboardContent .arangoTab {
+  border-bottom: 0 !important;
+}
+
 #statSwitch {
-  margin-right: -40px;
+  margin-right: 15px;
+}
+
+#dashboardDropdownOut {
+  padding-bottom: 5px;
+  background-color: transparent !important;
 }
 
 #dashboardDropdown {
+  background-color: rgba(0,0,0,0.1) !important;
   min-height: 230px !important;
 }
 
diff --git a/html/admin/css/queryView.css b/html/admin/css/queryView.css
index ae91f0d3ec..4c9d8a629e 100644
--- a/html/admin/css/queryView.css
+++ b/html/admin/css/queryView.css
@@ -46,7 +46,7 @@
   height: 10px !important;
   margin-right: 5px;
   margin-left: 5px;
-  top: 3px;
+  top: 2px;
 }
 
 
@@ -118,6 +118,7 @@
 #submitQueryButton {
   float: right;
   margin-bottom: 5px;
+  margin-top: 5px;
 }
 
 .querynavbar {
diff --git a/html/admin/js/templates/dashboardView.ejs b/html/admin/js/templates/dashboardView.ejs
index 940d49a964..78b0fa4fab 100644
--- a/html/admin/js/templates/dashboardView.ejs
+++ b/html/admin/js/templates/dashboardView.ejs
@@ -7,24 +7,6 @@
     <div class="pagination pagination-small pull-right btn-group">
       <ul><li class="enabled"><a id="dashboardToggle"><span class="glyphicon glyphicon-cog" title="Settings"></span></a></li></ul>
     </div>
-
-    <!-- /btn-group -->
-    <div class="btn-group pull-right">
-      <button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle">Filter <span class="caret"></span></button>
-
-
-      <!--<div id="menuGroups" class="dropdown-menu" role="menu">
-      </div>--!>
-    </div>
-    <!-- /btn-group -->
-
-    <!-- /btn-group update interval-->
-    <div class="btn-group pull-right">
-      <button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle">Interval <span class="caret"></span></button>
-
-    </div>
-    <!-- /btn-group -->
-
   </div>
 
   <div id="dashboardDropdownOut">
@@ -41,6 +23,7 @@
   </div>
 
 </ul>
+
 <div class="containerdivNewLine"/>
 <ul class="thumbnails dashboardContent">
 
diff --git a/html/admin/js/views/dashboardView.js b/html/admin/js/views/dashboardView.js
index de1e4ac453..49a98b97b9 100644
--- a/html/admin/js/views/dashboardView.js
+++ b/html/admin/js/views/dashboardView.js
@@ -73,7 +73,7 @@ var dashboardView = Backbone.View.extend({
 
   events: {
     "click .dashboard-dropdown li" : "checkEnabled",
-    "click .interval-dropdown li"  : "checkInterval",
+    "click .dashboard-dropdown li" : "checkInterval",
     "click .db-zoom"               : "renderDetailChart",
     "click .db-minimize"           : "checkDetailChart",
     "click .db-hide"               : "hideChart",