merge sync oss

README.md

@@ -49,40 +49,38 @@ Graphite, InfluxDB & OpenTSDB.
 - Use as metric data source
 - Query editor with metric name typeahead and tag filtering
 
-# Requirements
+## Requirements
 There are no dependencies, Grafana is a client side application that runs in your browser. It only needs a time series store where it can fetch metrics. If you use InfluxDB Grafana can use it to store dashboards. If you use Graphite or OpenTSDB you can use Elasticsearch to store dashboards or just use json files stored on disk.
 
-# Installation
+## Installation
 Head to [grafana.org](http://grafana.org) and [download](http://grafana.org/download/)
 the latest release.
 
 Then follow the quick [setup & config guide](http://grafana.org/docs/). If you have any problems please
 read the [troubleshooting guide](http://grafana.org/docs/troubleshooting).
 
-# Documentation & Support
+## Documentation & Support
 Be sure to read the [getting started guide](http://grafana.org/docs/features/intro) and the other
 feature guides.
 
-# Roadmap
-- Improve graphite query editor to handle all types of queries
-- Refine and simplify common tasks
-- More panel types (not just graphs)
-- Improve templating support
-- Alerting
-- Optional backend component
-- Much much more! (what ever gets votes on github issues!)
+## Run from master
+Grafana uses nodejs and grunt for asset management (css & javascript), unit test runner and javascript syntax verification.
+- clone repository
+- install nodejs
+- npm install (in project root)
+- npm install -g grunt-cli
+- grunt   (runt default task that will generate css files)
+- grunt build (creates optimized & minified release)
+- grunt release (same as grunt build but will also create tar & zip package)
+- grunt test (executes jshint and unit tests)
 
-# Contribute
-If you have any idea for an improvement or found a bug do not hesitate to open an issue. And if you have time clone this repo and submit a pull request and help me make Grafana the kickass metrics & devops dashboard we all dream about!
+## Contribute
+If you have any idea for an improvement or found a bug do not hesitate to open an issue.
+And if you have time clone this repo and submit a pull request and help me make Grafana
+the kickass metrics & devops dashboard we all dream about!
 
-Clone repository:
-- npm install
-- grunt server (starts development web server in src folder)
-- grunt (runs jshint and less -> css compilation)
-- npm test runs jshint, and unit tests
+Before creating a pull request be sure that "grunt test" runs without any style or unit test errors, also
+please [sign the CLA](http://grafana.org/docs/contributing/cla.html)
 
-Before submitting a PR be sure that there are no jshint or unit test failures.
-And [sign the CLA](http://grafana.org/docs/contributing/cla.html)
-
-# License
+## License
 Grafana is distributed under Apache 2.0 License.

src/css/less/grafana.less

@@ -156,7 +156,7 @@
 }
 
 .panel-full-edit-tabs {
-  margin-top: 10px;
+  margin-top: 30px;
   min-height: 250px;
   margin-left: -10px;
   margin-right: -10px;

src/css/less/graph.less

@@ -4,7 +4,7 @@
 
 .graph-legend {
   margin: 0 20px;
-  text-align: left;
+  text-align: center;
   position: relative;
   top: 2px;
 
@@ -44,6 +44,7 @@
 
 .graph-legend-series {
   padding-left: 10px;
+  padding-top: 2px;
 }
 
 .graph-legend-value {