Просмотр исходного кода

Added margins to some posts contents.

Ralfp 12 лет назад
Родитель
Сommit
8525a7c201
2 измененных файлов с 20 добавлено и 3 удалено
  1. 4 2
      static/cranefly/css/cranefly.css
  2. 16 1
      static/cranefly/css/cranefly/markdown.less

+ 4 - 2
static/cranefly/css/cranefly.css

@@ -944,10 +944,12 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .markdown blockquote blockquote{background-color:#ffffff;border:1px solid #f2f2f2;border-radius:3px;padding:14px;}
 .markdown code{background-color:#333333;border:none;color:#eeeeee;font-size:14px;}
 .markdown pre{background-color:#222222;padding:7px 14px;}.markdown pre code{background:none;border:none;color:#eeeeee;font-size:11.9px;}
-.markdown img{border-radius:3px;box-shadow:0px 0px 4px #555555;}
-.markdown .md-img{overflow:auto;}.markdown .md-img .md-img-span{margin:0px;float:none;}.markdown .md-img .md-img-span .md-img-wrap{background-color:#222222;border:1px solid #ffffff;border-radius:4px;box-shadow:0px 0px 2px #999999;margin:3px;}.markdown .md-img .md-img-span .md-img-wrap .md-img-bg{background-color:#ffffff;border-radius:3px;text-align:center;}.markdown .md-img .md-img-span .md-img-wrap .md-img-bg img{border-radius:3px;box-shadow:none;}
+.markdown img{border-radius:3px;box-shadow:0px 0px 4px #555555;margin:10px 0px;}
+.markdown .md-img{overflow:auto;}.markdown .md-img .md-img-span{margin:10px 0px;float:none;}.markdown .md-img .md-img-span .md-img-wrap{background-color:#222222;border:1px solid #ffffff;border-radius:4px;box-shadow:0px 0px 2px #999999;margin:3px;}.markdown .md-img .md-img-span .md-img-wrap .md-img-bg{background-color:#ffffff;border-radius:3px;text-align:center;}.markdown .md-img .md-img-span .md-img-wrap .md-img-bg img{border-radius:3px;box-shadow:none;}
 .markdown .md-img .md-img-span .md-img-wrap .md-img-bg .md-img-error{background:url('../img/img_broken.jpg');border-radius:3px;padding:50px 0px;}.markdown .md-img .md-img-span .md-img-wrap .md-img-bg .md-img-error span{background-color:#333333;border-radius:5px;opacity:0.8;filter:alpha(opacity=80);padding:7px 14px;margin:0px auto;color:#ffffff;text-shadow:0px 1px 0px #000000;}
 .markdown .md-img .md-img-span .md-img-wrap .md-img-label{display:block;padding:7px 14px;text-align:center;color:#999999;font-weight:bold;}.markdown .md-img .md-img-span .md-img-wrap .md-img-label:hover,.markdown .md-img .md-img-span .md-img-wrap .md-img-label:active{color:#ffffff;text-decoration:none;}
+.markdown pre,.markdown blockquote,.markdown iframe{margin-top:10px;margin-bottom:10px;}.markdown pre>:first-child,.markdown blockquote>:first-child,.markdown iframe>:first-child{margin-top:0px;}
+.markdown pre>:last-child,.markdown blockquote>:last-child,.markdown iframe>:last-child{margin-bottom:0px;}
 .index-sidebar{position:relative;bottom:9px;}
 .index-category{background-color:#ffffff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0px 0px 0px 3px #eeeeee;-moz-box-shadow:0px 0px 0px 3px #eeeeee;box-shadow:0px 0px 0px 3px #eeeeee;margin-bottom:20px;}.index-category table{margin:0px;}.index-category table caption{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0px 0px;margin:-1px;padding:3.966666666666667px 9.9px;color:#333333;font-size:11.9px;font-weight:bold;text-align:left;}.index-category table caption small{margin-left:7px;color:#999999;font-size:11.9px;}
 .index-category table td{padding:11.75px 9.9px;}

+ 16 - 1
static/cranefly/css/cranefly/markdown.less

@@ -95,13 +95,14 @@
   img {
     border-radius: @baseBorderRadius;
     box-shadow: 0px 0px 4px @gray;
+    margin: (@baseLineHeight / 2) 0px;
   }
 
   .md-img {
     overflow: auto;
 
     .md-img-span {
-      margin: 0px;
+      margin: (@baseLineHeight / 2) 0px;
       float: none;
 
       .md-img-wrap {
@@ -155,4 +156,18 @@
       }
     }
   }
+
+  // Blocks margins
+  pre, blockquote, iframe {
+    margin-top: @baseLineHeight / 2;
+    margin-bottom: @baseLineHeight / 2;
+
+    &>:first-child {
+      margin-top: 0px;
+    }
+
+    &>:last-child {
+      margin-bottom: 0px;
+    }
+  }
 }