From: Marius Gavrilescu 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;p=gruntmaster-page.git Merge branch 'master' into mindcoding Conflicts: css/custom.css --- 22590ac20d06f8ee47dbf9a1e996c2519494d58e diff --cc css/custom.css index 289ae41,bc0b7ea..4c4ba93 --- a/css/custom.css +++ b/css/custom.css @@@ -42,6 -48,6 +40,10 @@@ div#result text-align: center; } +footer{ + padding: 1.5em 0; +} ++ + a.dropdown-toggle{ + cursor: pointer; + }