fnp / prawokultury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 773a8c2)
Images and icons
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 10 Oct 2012 12:27:57 +0000 (14:27 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 10 Oct 2012 12:27:57 +0000 (14:27 +0200)
prawokultury/static/css/header.css patch | blob | history
prawokultury/static/css/header.scss patch | blob | history
prawokultury/static/img/copycamp2012_en.png [new file with mode: 0644] patch | blob
prawokultury/static/img/copycamp2012_pl.png [new file with mode: 0644] patch | blob
prawokultury/static/img/favicon.png patch | blob | history
prawokultury/static/img/logo_160.png [new file with mode: 0644] patch | blob
prawokultury/templates/base.html patch | blob | history

diff --git a/prawokultury/static/css/header.css b/prawokultury/static/css/header.css
index 0020c13..2f2ca24 100644 (file)
--- a/prawokultury/static/css/header.css
+++ b/prawokultury/static/css/header.css
@@ -1,8 +1,15 @@
 #header-bar {
 #header-bar {
-  height: 9em;
+  height: 14em;
   padding-top: 3em; }
   #header-bar .bar-left {
     margin-left: -1.1em; }
   padding-top: 3em; }
   #header-bar .bar-left {
     margin-left: -1.1em; }
+  #header-bar .social {
+    padding-top: 2em;
+    padding-bottom: 2em; }
+    #header-bar .social a {
+      margin-right: 1.8em; }
+      #header-bar .social a img {
+        vertical-align: middle; }
 
 .org-fnp, .org-trust {
   display: inline-block;
 
 .org-fnp, .org-trust {
   display: inline-block;
diff --git a/prawokultury/static/css/header.scss b/prawokultury/static/css/header.scss
index aae0e73..48d7c2d 100644 (file)
--- a/prawokultury/static/css/header.scss
+++ b/prawokultury/static/css/header.scss
@@ -1,11 +1,22 @@
 #header-bar {
 #header-bar {
-    height: 9em;
+    height: 14em;
     padding-top: 3em;
 
     .bar-left {
         margin-left: -1.1em;
     }
     padding-top: 3em;
 
     .bar-left {
         margin-left: -1.1em;
     }
-
+    
+    .social {
+        padding-top: 2em;
+        padding-bottom: 2em;
+    
+        a {
+            margin-right: 1.8em;
+            img {
+                vertical-align: middle;
+            }
+        }
+    }
 }
 
 
 }
 
 
@@ -25,3 +36,5 @@
 .org-fnp {
     margin-right: 4em;
 }
 .org-fnp {
     margin-right: 4em;
 }
+
+
diff --git a/prawokultury/static/img/copycamp2012_en.png b/prawokultury/static/img/copycamp2012_en.png
new file mode 100644 (file)
index 0000000..3351c1f
Binary files /dev/null and b/prawokultury/static/img/copycamp2012_en.png differ
diff --git a/prawokultury/static/img/copycamp2012_pl.png b/prawokultury/static/img/copycamp2012_pl.png
new file mode 100644 (file)
index 0000000..85c4574
Binary files /dev/null and b/prawokultury/static/img/copycamp2012_pl.png differ
diff --git a/prawokultury/static/img/favicon.png b/prawokultury/static/img/favicon.png
index 7bfe152..9be3768 100644 (file)
Binary files a/prawokultury/static/img/favicon.png and b/prawokultury/static/img/favicon.png differ
diff --git a/prawokultury/static/img/logo_160.png b/prawokultury/static/img/logo_160.png
new file mode 100644 (file)
index 0000000..43201b1
Binary files /dev/null and b/prawokultury/static/img/logo_160.png differ
diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 5f200a5..b484c46 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -15,7 +15,7 @@
         <meta property='og:site_name' content='CopyCamp' />
         <meta property='og:description' content='{% block "ogdescription" %}CopyCamp!{% endblock %}' />
         <meta property='og:type' content='{% block "ogtype" %}website{% endblock %}' />
         <meta property='og:site_name' content='CopyCamp' />
         <meta property='og:description' content='{% block "ogdescription" %}CopyCamp!{% endblock %}' />
         <meta property='og:type' content='{% block "ogtype" %}website{% endblock %}' />
-        <meta property='og:image' content='{% block "ogimage" %}{{ "/static/img/square-logo.png"|build_absolute_uri:request }}{% endblock %}' />
+        <meta property='og:image' content='{% block "ogimage" %}{{ "img/copycamp2012_"|add:request.LANGUAGE_CODE|add:".png"|build_absolute_uri:request }}{% endblock %}' />
         <meta property='og:locale' content='pl_PL' />
     </head>
     <body>
         <meta property='og:locale' content='pl_PL' />
     </head>
     <body>
@@ -24,9 +24,10 @@
         <div class="bar-left">
             <a id="logo" href="{% url "migdal_main" %}">
                 <img alt="{% trans "CopyCamp" %}"
         <div class="bar-left">
             <a id="logo" href="{% url "migdal_main" %}">
                 <img alt="{% trans "CopyCamp" %}"
-                    src="{% static "img/logo.png" %}" /></a>
+                    src="{% static "img/copycamp2012_"|add:request.LANGUAGE_CODE|add:".png" %}" /></a>
         </div>
         <div class="bar-right">
         </div>
         <div class="bar-right">
+            <a href="http://prawokultury.pl"><img src="{% static "img/logo_160.png" %}" alt="PrawoKultury.pl"/></a>
             <div class="social">
                 {% url 'migdal_main' as main_url %}
                 {% share main_url "CopyCamp" "big" %}
             <div class="social">
                 {% url 'migdal_main' as main_url %}
                 {% share main_url "CopyCamp" "big" %}