Merge commit 'refs/merge-requests/55' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / theme / base / css / display.css

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d2331ecebaa443fb8fce75f864f2ee17459667ee..999fce7f83ce092d48c265444d20195c69838935 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -709,6 +709,12 @@ font-style:italic;
 
 .notice .e-content {
     margin-left: 56px;
+    max-height: 400px;
+    overflow-y: auto;
+}
+
+.notice .e-content img {
+    max-width: 100%;
 }
 
 .notice-options {
@@ -798,6 +804,9 @@ position:static;
     line-height: 16px;
     height: 16px;
 }
+.notice.h-entry .attachments .inline-attachment > img {
+    display: block;
+}
 
 #attachments {
 clear:both;
@@ -965,7 +974,7 @@ content: ":";
     content: '[';
 }
 
-.notice .permalink.external {
+.notice footer .source + .permalink.external {
     display: none;
 }
 
@@ -1444,6 +1453,11 @@ margin-left:0;
 .notice > footer {
     clear: left;
     font-size: 0.8em;
+    margin-left: 56px;
+}
+
+.threaded-replies .notice > footer, .section .notice > footer {
+    margin-left:33px;
 }
 
 .notice > footer .timestamp span.p-name {