From 9cdd9e6d5f29b67ea404aac4fbf4771344d6e7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 6 Feb 2015 08:40:12 +0100
Subject: [PATCH] updated readme

---
 README.md                                     | 22 +++++++++----------
 .../features/account/partials/account.html    | 10 +++++----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 463aebfae0c..e25eec78416 100644
--- a/README.md
+++ b/README.md
@@ -15,21 +15,14 @@ Graphite, InfluxDB & OpenTSDB.
 [![wercker status](https://app.wercker.com/status/0f109051cfaf2a6d94c0eebdc0dcaeae/s "wercker status")](https://app.wercker.com/project/bykey/0f109051cfaf2a6d94c0eebdc0dcaeae)
 
 ## building and running
-Before trying to build make sure the grafana frontend git submodule is loaded.
-
-By clone recursive
 
 ```
-git clone --recursive <this_repo>
-```
-
-In case of after clone
-```
-git submodule update --init
+go get github.com/grafana/grafana
 ```
 
 Building
 ```
+cd $GOPATH/src/github.com/grafana/grafana
 go run build.go setup (only needed once to install godep)
 go run build.go build
 ```
@@ -44,7 +37,6 @@ go build -o ./bin/grafana .
 To build less to css for frontend:
 
 ```
-cd grafana
 npm install
 npm install -g grunt-cli
 grunt
@@ -53,10 +45,18 @@ grunt
 To rebuild on source change:
 ```
 go get github.com/Unknwon/bra
-
 bra run
 ```
 
+Running
+```
+./bin/grafana web
+```
+Open grafana in your browser (default http://localhost:3000) and login with admin user (default user/pass = admin/admin).
+
+Config
+Create a grafana.custom.ini in the conf directory to override default configuration options. You only need to add the options you want to override.
+
 
 ## Features
 ### Graphite Target Editor
diff --git a/src/app/features/account/partials/account.html b/src/app/features/account/partials/account.html
index da8392aac15..a4c4db89aaf 100644
--- a/src/app/features/account/partials/account.html
+++ b/src/app/features/account/partials/account.html
@@ -6,8 +6,10 @@
 		Account Info
 	</h2>
 
-	<div class="gf-box" style="">
+	<div class="gf-box">
 		<div class="gf-box-body">
+			<div class="editor-row">
+				<div class="section">
 			<form name="accountForm">
 				<div>
 					<div class="tight-form">
@@ -16,17 +18,17 @@
 								<strong>Account name</strong>
 							</li>
 							<li>
-								<input type="text" required ng-model="account.name" class="input-xlarge tight-form-input last" >
+								<input type="text" required ng-model="account.name" class="input-xxlarge tight-form-input last" >
 							</li>
 						</ul>
 						<div class="clearfix"></div>
 					</div>
 				</div>
-				<br>
-
 				<br>
 				<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
 			</form>
+			</div>
+			</div>
 		</div>
 	</div>