From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 7 Feb 2014 09:38:43 +0000 (+0200)
Subject: Merge branch 'master' into mindcoding
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=22590ac20d06f8ee47dbf9a1e996c2519494d58e;hp=-c;p=plack-app-gruntmaster.git

Merge branch 'master' into mindcoding

Conflicts:
	css/custom.css
---

22590ac20d06f8ee47dbf9a1e996c2519494d58e
diff --combined css/custom.css
index 289ae41,bc0b7ea..4c4ba93
--- a/css/custom.css
+++ b/css/custom.css
@@@ -1,11 -1,17 +1,9 @@@
  h1#title{
  	font-weight: bold;
  	text-align: center;
- 	padding: 0;
- 	margin: 0;
  	font-size: 3em !important;
  }
  
 -footer{
 -	width: 60em;
 -	margin: auto;
 -	margin-top: 6em;
 -	white-space: pre-wrap;
 -	color: #777;
 -}
 -
  #logo {
  	margin: 5em auto 2em;
  	display: block;
@@@ -42,6 -48,6 +40,10 @@@ div#result
  	text-align: center;
  }
  
 +footer{
 +	padding: 1.5em 0;
 +}
++
+ a.dropdown-toggle{
+ 	cursor: pointer;
+ }