fnp
/
edumed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df04a12
)
lesson number, photo attribution
author
Radek Czajka
<radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 19 Feb 2013 14:36:11 +0000
(15:36 +0100)
committer
Radek Czajka
<radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 19 Feb 2013 14:36:11 +0000
(15:36 +0100)
catalogue/templates/catalogue/snippets/carousel.html
patch
|
blob
|
history
edumed/static/css/base.css
patch
|
blob
|
history
edumed/static/css/base.scss
patch
|
blob
|
history
edumed/templates/base.html
patch
|
blob
|
history
edumed/templates/home.html
patch
|
blob
|
history
diff --git
a/catalogue/templates/catalogue/snippets/carousel.html
b/catalogue/templates/catalogue/snippets/carousel.html
index
2095186
..
62cfd07
100755
(executable)
--- a/
catalogue/templates/catalogue/snippets/carousel.html
+++ b/
catalogue/templates/catalogue/snippets/carousel.html
@@
-6,7
+6,7
@@
<li style="background-image: url(/static/carousel/img1.jpg); z-index: 100;">
<a href="{{ jak }}" class="catalogue-carousel-link">
<div class="catalogue-carousel-note">
<li style="background-image: url(/static/carousel/img1.jpg); z-index: 100;">
<a href="{{ jak }}" class="catalogue-carousel-link">
<div class="catalogue-carousel-note">
- <p><strong>7
5</strong> <em>kompletnych lekcji
</em> - zobacz jak wykorzystać</p>
+ <p><strong>7
4</strong> <em>kompletne lekcje
</em> - zobacz jak wykorzystać</p>
</div>
</a>
</li>
</div>
</a>
</li>
diff --git
a/edumed/static/css/base.css
b/edumed/static/css/base.css
index
89c34d6
..
5cfe862
100644
(file)
--- a/
edumed/static/css/base.css
+++ b/
edumed/static/css/base.css
@@
-134,12
+134,12
@@
footer.main {
padding: 0.2em 0.625em;
margin: 2.5em auto 0 auto;
color: #9a9c9e; }
padding: 0.2em 0.625em;
margin: 2.5em auto 0 auto;
color: #9a9c9e; }
+ footer.main p {
+ font-size: .75em; }
footer.main .footer-item {
float: left;
margin-right: 1.25em;
width: 13.75em; }
footer.main .footer-item {
float: left;
margin-right: 1.25em;
width: 13.75em; }
- footer.main .footer-item p {
- font-size: .75em; }
footer.main .sponsors-column {
float: left;
margin-left: 1.25em;
footer.main .sponsors-column {
float: left;
margin-left: 1.25em;
diff --git
a/edumed/static/css/base.scss
b/edumed/static/css/base.scss
index
4d7e8a7
..
5c38509
100644
(file)
--- a/
edumed/static/css/base.scss
+++ b/
edumed/static/css/base.scss
@@
-143,13
+143,13
@@
footer.main {
margin: 40*$px auto 0 auto;
color: #9a9c9e;
margin: 40*$px auto 0 auto;
color: #9a9c9e;
+ p {
+ font-size: .75em;
+ }
.footer-item {
float: left;
margin-right: 20 * $px;
width: 220 * $px;
.footer-item {
float: left;
margin-right: 20 * $px;
width: 220 * $px;
- p {
- font-size: .75em;
- }
}
.sponsors-column {
float: left;
}
.sponsors-column {
float: left;
diff --git
a/edumed/templates/base.html
b/edumed/templates/base.html
index
cda342f
..
2121b81
100644
(file)
--- a/
edumed/templates/base.html
+++ b/
edumed/templates/base.html
@@
-92,6
+92,7
@@
</div>
{% sponsor_page "footer" %}
<div class="clr"></div>
</div>
{% sponsor_page "footer" %}
<div class="clr"></div>
+ {% block footer_extra %}{% endblock %}
</footer>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
</footer>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
diff --git
a/edumed/templates/home.html
b/edumed/templates/home.html
index
759e72c
..
693f7b2
100755
(executable)
--- a/
edumed/templates/home.html
+++ b/
edumed/templates/home.html
@@
-30,7
+30,7
@@
<section id="main-tools">
<section class="main-tools-box">
<section id="main-tools">
<section class="main-tools-box">
-<h1>Aktualności</h1>
+<h1>Aktualności
na stronie Fundacji
</h1>
{% latest_blog_posts "http://nowoczesnapolska.org.pl/feed" 5 %}
</section>
{% latest_blog_posts "http://nowoczesnapolska.org.pl/feed" 5 %}
</section>
@@
-46,5
+46,9
@@
</section>
</section>
+{% endblock %}
+
+{% block footer_extra %}
+ <p>Wykorzystano zdjęcie <a href="http://www.flickr.com/photos/ahorcado/5758888635/">„Europejski Tydzień Młodzieży Katowice 2011”</a>, Krzysztof Duda, CC BY-SA</p>
{% endblock %}
{% endblock %}