Ralfp 12 лет назад
Родитель
Сommit
e263cad9dc

+ 1 - 0
misago/apps/threadtype/posting/forms.py

@@ -3,6 +3,7 @@ from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from misago.apps.threadtype.mixins import ValidateThreadNameMixin, ValidatePostLengthMixin
 from misago.forms import Form
+from misago.markdown.factory import emojis
 from misago.validators import validate_sluggable
 
 class PostingForm(Form, ValidatePostLengthMixin):

+ 8 - 1
misago/markdown/factory.py

@@ -86,4 +86,11 @@ def finalize_markdown(text):
     text = re.sub(r'<quotetitle>(?P<content>.+)</quotetitle>', trans_quotetitle, text)
     text = re.sub(r'<quotesingletitle>', _("Quote"), text)
     text = re.sub(r'<imgalt>', _("Posted image"), text)
-    return text
+    return text
+
+
+def emojis():
+    if 'misago.markdown.extensions.emoji.EmojiExtension' in settings.MARKDOWN_EXTENSIONS:
+        from misago.markdown.extensions.emoji.EmojiExtension import EMOJIS
+        return EMOJIS
+    return []

+ 3 - 6
static/cranefly/css/cranefly.css

@@ -949,12 +949,9 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .markdown h3,.markdown article h3{font-size:16.8px;}
 .markdown h4,.markdown article h4{font-size:14px;}
 .markdown hr,.markdown article hr{border:none;border-top:1px solid #eeeeee;margin:20px 0px;}
-.markdown blockquote,.markdown article blockquote{background-color:#fcfcfc;border:1px solid #f0f0f0;border-radius:3px;padding:14px;}.markdown blockquote:hover,.markdown article blockquote:hover{border-color:#e0e0e0;}.markdown blockquote:hover header,.markdown article blockquote:hover header{opacity:1;filter:alpha(opacity=100);}
-.markdown blockquote header,.markdown article blockquote header{border-bottom:1px solid #e0e0e0;margin-bottom:10px;opacity:0.7;filter:alpha(opacity=70);padding-bottom:14px;font-size:16.8px;font-weight:bold;line-height:20px;}
-.markdown blockquote>:first-child,.markdown article blockquote>:first-child{margin-top:0px;}
-.markdown blockquote>:last-child,.markdown article blockquote>:last-child{margin-bottom:0px;}.markdown blockquote>:last-child img:last-child,.markdown article blockquote>:last-child img:last-child{margin-bottom:0px;}
-.markdown blockquote p,.markdown article blockquote p{margin:0 0 10px;font-size:11.9px;}
-.markdown blockquote blockquote,.markdown article blockquote blockquote{background-color:#ffffff;border:1px solid #f2f2f2;border-radius:3px;padding:14px;}
+.markdown blockquote,.markdown article blockquote{border-left-color:#e1e1e1;padding:4.666666666666667px 14px;}.markdown blockquote header,.markdown article blockquote header{padding-bottom:10px;font-size:15.400000000000002px;font-weight:bold;line-height:20px;}
+.markdown blockquote p,.markdown article blockquote p{margin:0 0 10px;font-size:14px;}
+.markdown blockquote blockquote,.markdown article blockquote blockquote{opacity:0.85;filter:alpha(opacity=85);}
 .markdown code,.markdown article code{background-color:#333333;border:none;color:#eeeeee;font-size:14px;}
 .markdown pre,.markdown article pre{background-color:#222222;padding:7px 14px;}.markdown pre code,.markdown article pre code{background:none;border:none;color:#eeeeee;font-size:11.9px;}
 .markdown img,.markdown article img{background-color:#ffffff;border-radius:3px;margin:10px 0px;}

+ 8 - 35
static/cranefly/css/cranefly/markdown.less

@@ -40,52 +40,25 @@
   }
 
   blockquote {
-    background-color: darken(@postBackground, 1%);
-    border: 1px solid darken(@postBackground, 6%);
-    border-radius: @baseBorderRadius;
-    padding: @baseFontSize;
-
-    &:hover {
-      border-color: darken(@postBackground, 12%);
-
-      header {
-        .opacity(100);
-      }
-    }
+    border-left-color: darken(@grayLighter, 5%);
+    padding: (@baseFontSize / 3) @baseFontSize;
 
     header {
-      border-bottom: 1px solid darken(@postBackground, 12%);
-      margin-bottom: @baseLineHeight / 2;
-      .opacity(70);
-      padding-bottom: @baseFontSize;
+      padding-bottom: (@baseLineHeight / 2);
 
-      font-size: @baseFontSize * 1.2;
+      font-size: @baseFontSize * 1.1;
       font-weight: bold;
       line-height: @baseLineHeight;
     }
 
-    &>:first-child {
-      margin-top: 0px;
-    }
-
-    &>:last-child {
-      margin-bottom: 0px;
-      
-      img:last-child {
-        margin-bottom: 0px;
-      }
-    }
-
     p {
-      margin: 0 0 @baseLineHeight / 2;
-      font-size: @fontSizeSmall;
+      margin: 0 0 (@baseLineHeight / 2);
+
+      font-size: @baseFontSize;
     }
 
     blockquote {
-      background-color: @postBackground;
-      border: 1px solid darken(@postBackground, 5%);
-      border-radius: @baseBorderRadius;
-      padding: @baseFontSize;
+      .opacity(85);
     }
   }