fnp
/
prawokultury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b74a8ca
)
style fixes
author
Radek Czajka
<radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 11 Dec 2012 09:12:57 +0000
(09:12 +0000)
committer
Prawo Kultury
<prawokultury@giewont.vls.icm.edu.pl>
Tue, 11 Dec 2012 09:14:54 +0000
(09:14 +0000)
prawokultury/static/css/entry.css
patch
|
blob
|
history
prawokultury/static/css/entry.scss
patch
|
blob
|
history
prawokultury/static/css/search.css
patch
|
blob
|
history
prawokultury/static/css/search.scss
patch
|
blob
|
history
prawokultury/templates/base.html
patch
|
blob
|
history
diff --git
a/prawokultury/static/css/entry.css
b/prawokultury/static/css/entry.css
index
ea26986
..
33eb3aa
100644
(file)
--- a/
prawokultury/static/css/entry.css
+++ b/
prawokultury/static/css/entry.css
@@
-70,7
+70,8
@@
.entry-picture {
float: left;
.entry-picture {
float: left;
- margin-right: 1.5em; }
+ margin-right: 1.5em;
+ margin-bottom: 1em; }
.submit-link {
margin-top: 1em;
.submit-link {
margin-top: 1em;
diff --git
a/prawokultury/static/css/entry.scss
b/prawokultury/static/css/entry.scss
index
62de95a
..
80917b4
100644
(file)
--- a/
prawokultury/static/css/entry.scss
+++ b/
prawokultury/static/css/entry.scss
@@
-107,6
+107,7
@@
.entry-picture {
float: left;
margin-right: 1.5em;
.entry-picture {
float: left;
margin-right: 1.5em;
+ margin-bottom: 1em;
}
.submit-link {
}
.submit-link {
diff --git
a/prawokultury/static/css/search.css
b/prawokultury/static/css/search.css
index
6bc635c
..
2d40b45
100644
(file)
--- a/
prawokultury/static/css/search.css
+++ b/
prawokultury/static/css/search.css
@@
-1,8
+1,8
@@
#search-form {
#search-form {
- margin
-top: .4em
; }
+ margin
: .4em 0 0 0
; }
#search-form input {
font-size: 1.1em;
#search-form input {
font-size: 1.1em;
- width: 1
6
.1em;
+ width: 1
5
.1em;
padding-left: 1em;
border: none;
border-radius: 1.5em 0 0 1.5em;
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;
-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;
#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;
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; }
#search-form button img {
vertical-align: middle; }
diff --git
a/prawokultury/static/css/search.scss
b/prawokultury/static/css/search.scss
index
9b9bbe1
..
7133c89
100644
(file)
--- a/
prawokultury/static/css/search.scss
+++ b/
prawokultury/static/css/search.scss
@@
-1,9
+1,9
@@
#search-form {
#search-form {
- margin
-top: .4em
;
+ margin
: .4em 0 0 0
;
input {
font-size: 1.1em;
input {
font-size: 1.1em;
- width: 1
6
.1em;
+ width: 1
5
.1em;
padding-left: 1em;
border: none;
border-radius: 1.5em 0 0 1.5em;
padding-left: 1em;
border: none;
border-radius: 1.5em 0 0 1.5em;
@@
-12,6
+12,7
@@
background: white;
color: black;
height: 2em;
background: white;
color: black;
height: 2em;
+ margin: 0;
}
button {
}
button {
@@
-27,6
+28,7
@@
-moz-border-radius: 0 1em 1em 0;
-webkit-border-radius: 0 1em 1em 0;
padding-right: 1em;
-moz-border-radius: 0 1em 1em 0;
-webkit-border-radius: 0 1em 1em 0;
padding-right: 1em;
+ margin: 0;
img {
vertical-align: middle;
img {
vertical-align: middle;
diff --git
a/prawokultury/templates/base.html
b/prawokultury/templates/base.html
index
1430cf9
..
7eb4c2c
100755
(executable)
--- a/
prawokultury/templates/base.html
+++ b/
prawokultury/templates/base.html
@@
-52,7
+52,7
@@
{% block "main_menu" %}
{% main_menu %}
{% endblock %}
{% block "main_menu" %}
{% main_menu %}
{% endblock %}
- <
!--li id="item-lang">{% lang_switcher %}</li--
>
+ <
li id="item-lang">{% lang_switcher %}</li
>
</ul>
<div style="clear: both;"></div>
</div>
</ul>
<div style="clear: both;"></div>
</div>