From: Prawo Kultury Date: Tue, 11 Dec 2012 12:41:12 +0000 (+0000) Subject: Merge branch 'master' of git://github.com/fnp/prawokultury X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/f5fce02290e4cfd292776015a2597cb8c305e7c3?hp=f20d24c6d6967ac9bd060a77386b15e4d692729b Merge branch 'master' of git://github.com/fnp/prawokultury --- diff --git a/prawokultury/static/css/entry.css b/prawokultury/static/css/entry.css index ea26986..33eb3aa 100644 --- a/prawokultury/static/css/entry.css +++ b/prawokultury/static/css/entry.css @@ -70,7 +70,8 @@ .entry-picture { float: left; - margin-right: 1.5em; } + margin-right: 1.5em; + margin-bottom: 1em; } .submit-link { margin-top: 1em; diff --git a/prawokultury/static/css/search.css b/prawokultury/static/css/search.css index 6bc635c..2d40b45 100644 --- a/prawokultury/static/css/search.css +++ b/prawokultury/static/css/search.css @@ -1,8 +1,8 @@ #search-form { - margin-top: .4em; } + margin: .4em 0 0 0; } #search-form input { font-size: 1.1em; - width: 16.1em; + width: 15.1em; padding-left: 1em; border: none; border-radius: 1.5em 0 0 1.5em; @@ -10,7 +10,8 @@ -webkit-border-radius: 1.5em 0 0 1.5em; background: white; color: black; - height: 2em; } + height: 2em; + margin: 0; } #search-form button { font-size: 1.1em; width: 2.7em; @@ -23,6 +24,7 @@ border-radius: 0 1em 1em 0; -moz-border-radius: 0 1em 1em 0; -webkit-border-radius: 0 1em 1em 0; - padding-right: 1em; } + padding-right: 1em; + margin: 0; } #search-form button img { vertical-align: middle; }