diff --git a/package.json b/package.json index 14dad04497d..440c3f9b3da 100755 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Elasticsearch BV" }, "name": "kibana", - "version": "3.0.0m3pre", + "version": "3.0.0m4pre", "devDependencies": { "rjs-build-analysis": "0.0.3", "grunt": "~0.4.0", diff --git a/src/app/panels/histogram/module.js b/src/app/panels/histogram/module.js index 1731cb22318..30738eee849 100755 --- a/src/app/panels/histogram/module.js +++ b/src/app/panels/histogram/module.js @@ -413,6 +413,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) { max: _.isUndefined(scope.range.to) ? null : scope.range.to.getTime(), timeformat: time_format(scope.panel.interval), label: "Datetime", + ticks: elem.width()/100 }, grid: { backgroundColor: null, diff --git a/src/css/main.css b/src/css/main.css deleted file mode 100755 index 5bbc5938ab6..00000000000 --- a/src/css/main.css +++ /dev/null @@ -1,392 +0,0 @@ -#events { - font-size: 12px; -} - -.legend { - color: #000; -} - -.editor-title { - margin-right: 10px; - font-size: 1.7em; - font-weight: bold; - text-transform:capitalize; -} - -.editor-title small { - opacity: 0.5; - font-size: 0.7em; - font-weight: normal; -} - -.spy { - position:absolute; - right:0px; - top:0px; -} - -.navbar-inner { - border-width: 0 0 0px; - padding-left: 0px; - padding-right: 0px; -} - -.kibana-row { - margin-left: 15px; - margin-bottom: 15px; -} - -.row-close { - color: #bbb; - position: absolute; - font-size: 9pt; - font-weight: 200; - padding-left: 35px; - padding-top:0px; -} - -.row-open { - text-align: right; - color: #bbb; - margin-top:30px; - position: absolute; - font-size: 13pt; - font-weight: 200; - -moz-transform-origin: 40px; - -ms-transform-origin: 40px; - -o-transform-origin: 40px; - -webkit-transform-origin: 40px; - transform-origin: 40px; - transform: rotate(-90deg); - -webkit-transform: rotate(-90deg); - -moz-transform: rotate(-90deg); - -ms-transform: rotate(-90deg); -} - -.row-open i { - font-size: 10pt; -} - -.odd { - background-color: #3a3f44; -} - -.nomargin { - margin: 0px; -} - - -[ng\:cloak], [ng-cloak], .ng-cloak { - display: none !important; -} - -.table tbody + tbody{ - border-top: 0px; -} - -.panel-error { - opacity: 0.9; - position:absolute; - z-index: 1000; -} - -.panel-loading { - position:absolute; - top: 0px; - left: 0px; - z-index: 800; -} - -.panel span.panelextra { - position: absolute; - z-index: 800; - display: none; -} - -.panel:hover span.panelextra { - display: block; - opacity: 0.3; -} - -.panel span.panelextra:hover { - opacity: 1; -} - -.link { - cursor: pointer; -} - -.pointer:hover { - color: #fff; -} - -.pointer { - cursor: pointer; -} - -.link:hover { - color: #0088CC; -} - -.popover { - max-width: 500px; -} - -.modal { - width: 770px; - margin-left: -385px; - top: 10px !important; -} - -.tiny { - font-size: 50%; -} - -.smaller { - font-size: 70%; -} - -.small { - font-size: 85%; -} - -.large { - font-size: 120%; -} - -.strong { - font-weight: bold; -} - -.normal { - font-weight: normal; -} - -.light { - font-weight: 200; -} - -.input-append label { - font-size: inherit !important; -} - -.input-smaller { - width: 75px; -} - -.typeahead { z-index: 1051; } - -.btn-active { - background-color: #E6E6E6; - background-image: none; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) inset, 0 1px 2px rgba(0, 0, 0, 0.05); - outline: 0 none -} - -.remove:hover { - background-color: #A60000; -} - -.faded { - opacity: 0.2; -} - -/* =================================================== - * popover-extra-placements.css v0.1 - * http://twitter.github.com/bootstrap-popover-extra-placements - * =================================================== - * Copyright 2012 Daniel Kleehammer - * - * 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. - * ========================================================== */ - - -/************************* - * Top Positions - *************************/ - -/** Top Left **/ -.popover.topLeft { - margin-top: -10px; -} - -.popover.topLeft .arrow { - bottom: -10px; - left: 25%; - margin-left: -10px; - border-width: 10px 10px 0; - border-top-color: #ffffff; -} - -.popover.topLeft .arrow:after { - border-width: 11px 11px 0; - border-top-color: rgba(0, 0, 0, 0.25); - bottom: -1px; - left: -11px; -} - -/** Top Right **/ -.popover.topRight { - margin-top: -10px; -} - -.popover.topRight .arrow { - bottom: -10px; - left: 75%; - margin-left: -10px; - border-width: 10px 10px 0; - border-top-color: #ffffff; -} - -.popover.topRight .arrow:after { - border-width: 11px 11px 0; - border-top-color: rgba(0, 0, 0, 0.25); - bottom: -1px; - left: -11px; -} - - -/************************* - * Right Positions - *************************/ - -/** Right Top **/ -.popover.rightTop { - margin-left: 10px; -} - -.popover.rightTop .arrow { - top: 25%; - left: -10px; - margin-top: -10px; - border-width: 10px 10px 10px 0; - border-right-color: #ffffff; -} - -.popover.rightTop .arrow:after { - border-width: 11px 11px 11px 0; - border-right-color: rgba(0, 0, 0, 0.25); - bottom: -11px; - left: -1px; -} - -/** Right Bottom **/ -.popover.rightBottom { - margin-left: 10px; -} - -.popover.rightBottom .arrow { - top: 75%; - left: -10px; - margin-top: -10px; - border-width: 10px 10px 10px 0; - border-right-color: #ffffff; -} - -.popover.rightBottom .arrow:after { - border-width: 11px 11px 11px 0; - border-right-color: rgba(0, 0, 0, 0.25); - bottom: -11px; - left: -1px; -} - -/************************* - * Bottom Positions - *************************/ - -/** Bottom Left **/ -.popover.bottomLeft { - margin-top: 10px; -} - -.popover.bottomLeft .arrow { - top: -10px; - left: 25%; - margin-left: -10px; - border-width: 0 10px 10px; - border-bottom-color: #ffffff; -} - -.popover.bottomLeft .arrow:after { - border-width: 0 11px 11px; - border-bottom-color: rgba(0, 0, 0, 0.25); - top: -1px; - left: -11px; -} - - -/** Bottom Right **/ -.popover.bottomRight { - margin-top: 10px; -} - -.popover.bottomRight .arrow { - top: -10px; - left: 75%; - margin-left: -10px; - border-width: 0 10px 10px; - border-bottom-color: #ffffff; -} - -.popover.bottomRight .arrow:after { - border-width: 0 11px 11px; - border-bottom-color: rgba(0, 0, 0, 0.25); - top: -1px; - left: -11px; -} - -/************************* - * Left Positions - *************************/ - -/** Left Top **/ -.popover.leftTop { - margin-left: -10px; -} - -.popover.leftTop .arrow { - top: 25%; - right: -10px; - margin-top: -10px; - border-width: 10px 0 10px 10px; - border-left-color: #ffffff; -} - -.popover.leftTop .arrow:after { - border-width: 11px 0 11px 11px; - border-left-color: rgba(0, 0, 0, 0.25); - bottom: -11px; - right: -1px; -} - - -/** Left Bottom **/ -.popover.leftBottom { - margin-left: -10px; -} - -.popover.leftBottom .arrow { - top: 75%; - right: -10px; - margin-top: -10px; - border-width: 10px 0 10px 10px; - border-left-color: #ffffff; -} - -.popover.leftBottom .arrow:after { - border-width: 11px 0 11px 11px; - border-left-color: rgba(0, 0, 0, 0.25); - bottom: -11px; - right: -1px; -} -