Merge tag categories feature into master

[prawokultury.git] / prawokultury / static / css / entry.scss

diff --git a/prawokultury/static/css/entry.scss b/prawokultury/static/css/entry.scss
old mode 100755 (executable)
new mode 100644 (file)
index e6b5056..08460c3
--- a/prawokultury/static/css/entry.scss
+++ b/prawokultury/static/css/entry.scss
@@ -1,7 +1,6 @@
-.avatar {
+.entry-wrapped img.avatar {

     float: left;
     float: left;

-    margin-left: -8em;
-    margin-top: 0em;
+    margin: 0 0 0 -8em;

 }
 
 .entry-short {
 }
 
 .entry-short {


@@ -18,7 +17,7 @@
     h1, h2 {
         margin: 0;
         color: #01519a;
     h1, h2 {
         margin: 0;
         color: #01519a;

-        font-size: 1.2em;
+        font-size: 1.3em;

 
         a {
             color: #01519a;
 
         a {
             color: #01519a;


@@ -30,7 +29,7 @@
     }
 
     .entry-data {
     }
 
     .entry-data {

-        font-size: 1.2em;
+        font-size: 1.3em;

         margin-top: 1.4em;
         margin-bottom: 1.4em;
         .date {
         margin-top: 1.4em;
         margin-bottom: 1.4em;
         .date {


@@ -48,20 +47,42 @@
     }
 
     .lead {
     }
 
     .lead {

-        font-size: 1.2em;
+        font-size: 1.3em;

     }
 
     .body {
     }
 
     .body {

-        font-size: 1.2em;
+        font-size: 1.3em;
+    }
+
+    .lead h2,
+    .body h2 {
+        font-size: 1em;
+        font-weight: normal;
+    }
+
+    blockquote {
+        position:relative;
+        left:1em;
+        font-style:italic;
+        margin-left: 1em;
+    }
+
+    .toolbar {
+        font-size: 1.3em;
+        margin-top: 1.4em;
+        margin-bottom: 1.8em;
+
+        .social a {
+            margin-right: .6em;
+            img {
+                vertical-align: middle;
+            }
+        }

     }
 
     .more {
     }
 
     .more {

-        clear: both;

         float: right;
         float: right;

-        font-size: 1.2em;

         font-style: italic;
         font-style: italic;

-        margin-top: .6em;
-        margin-bottom: 1.8em;

 
         a {
             color: #acacac;
 
         a {
             color: #acacac;


@@ -78,6 +99,10 @@
             margin-left: .7em;
         }
     }
             margin-left: .7em;
         }
     }

+
+    img {
+        margin: 1em;
+    }

 }
 
 .entry-info .entry-wrapped,
 }
 
 .entry-info .entry-wrapped,


@@ -88,9 +113,9 @@
     }
 }
 
     }
 }
 

-.entry-picture {
+.entry-wrapped img.entry-picture {

     float: left;
     float: left;

-    margin-right: 1.5em;
+    margin: 0 1.5em 1em 0;

 }
 
 .submit-link {
 }
 
 .submit-link {


@@ -101,7 +126,7 @@
 
     a {
         color: black;
 
     a {
         color: black;

-        font-size: 1.2em;
+        font-size: 1.3em;

     }
     a:before {
         content: url("/static/img/plus.png");
     }
     a:before {
         content: url("/static/img/plus.png");


@@ -119,7 +144,7 @@
     }
 
     .comment-data {
     }
 
     .comment-data {

-        font-size: 1.2em;
+        font-size: 1.3em;

         margin-top: 1.4em;
         margin-bottom: 1.4em;
         .comment-date {
         margin-top: 1.4em;
         margin-bottom: 1.4em;
         .comment-date {


@@ -131,6 +156,14 @@
     }
 
     .body {
     }
 
     .body {

-        font-size: 1.2em;
+        font-size: 1.3em;

     }
 }
     }
 }

+
+table.borders {
+  border-collapse: collapse;
+  td {
+    border: 1px solid #777;
+    padding: .3em;
+  }
+}