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 bff926bd2779cf79af2ad7980ff9af5ecabfcd3d..999fce7f83ce092d48c265444d20195c69838935 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -248,15 +248,20 @@ address .poweredby {
 /* input forms */
 
 .input_forms {
-    float: left;
     position: relative;
     margin-bottom: 10px;
     border-bottom: 1px dotted #ccc;
+    width: 100%;
+}
+
+.input_forms > label {
+    float: left;
+    margin-right: 1em;
+    opacity: 0.6;
 }
 
 #input_form_nav {
     float: left;
-    width: 100%;
     margin-bottom: 10px;
     list-style-type: none;
 }
@@ -567,6 +572,10 @@ address .poweredby {
     z-index: 1;
 }
 
+.form_settings {
+    clear: both;
+}
+
 /* site nav local views */
 
 
@@ -656,11 +665,7 @@ address .poweredby {
 
 #core .h-card .u-photo {
     float: left;
-}
-
-#content .notice .h-entry {
-    margin: 2px 0 0 0;
-    min-height: 32px;
+    margin-right: 8px;
 }
 
 .h-card .u-url, .h-card.u-url {
@@ -670,15 +675,6 @@ address .poweredby {
     text-decoration:underline;
 }
 
-.notice .h-entry {
-    overflow:hidden;
-    word-wrap:break-word;
-}
-
-.notice .entry-title.ov {
-overflow:visible;
-}
-
 .notice .automatic { 
 font-style:italic;
 }
@@ -711,29 +707,17 @@ font-style:italic;
     line-height: 1.2em;
 }
 
-.notice div.e-content {
-    margin-left: 55px;
-}
-
-.entry-metadata .repeat {
-    display: block;
-}
-
-.entry-metadata .repeat .u-photo {
-float:none;
-margin-right:1px;
-position:relative;
-top:4px;
-left:0;
+.notice .e-content {
+    margin-left: 56px;
+    max-height: 400px;
+    overflow-y: auto;
 }
 
-.entry-metadata {
-    clear: left;
-    float: left;
-    font-size: 0.88em;
+.notice .e-content img {
+    max-width: 100%;
 }
 
-.entry-metadata, .notice-options {
+.notice-options {
     margin-bottom: 7px;
     margin-top: 12px;
 }
@@ -816,10 +800,13 @@ position:static;
     max-width: 100%;
 }
 .notice.h-entry .attachments .inline-attachment > a {
-    font-size: 0.88em;
+    font-size: 0.8em;
     line-height: 16px;
     height: 16px;
 }
+.notice.h-entry .attachments .inline-attachment > img {
+    display: block;
+}
 
 #attachments {
 clear:both;
@@ -877,7 +864,7 @@ content: ":";
 }
 
 .threaded-replies:empty {
-    margin-bottom: 0px; 
+    display: none;
 }
 
 #content .notice .threaded-replies .notice,
@@ -893,7 +880,7 @@ content: ":";
     background: none;
 }
 
-#content .notice .threaded-replies .h-entry,
+#content .notice .threaded-replies .notice.h-entry,
 #content .notice .threaded-replies .entry-title {
     min-height: 1px;
 }
@@ -904,11 +891,7 @@ content: ":";
     top: 12px;
 }
 
-#content .notice .threaded-replies .notice .h-entry p.e-content {
-    margin-left: 32px;
-}
-
-#content .notice .threaded-replies .notice div.e-content {
+#content .threaded-replies .notice.h-entry .e-content {
     margin-left: 32px;
 }
 
@@ -991,7 +974,7 @@ content: ":";
     content: '[';
 }
 
-.notice .permalink.external {
+.notice footer .source + .permalink.external {
     display: none;
 }
 
@@ -1016,31 +999,7 @@ content: ":";
 clear:both;
 }
 
-.notice p.e-content {
-    clear: none;
-    display: block;
-}
-
-.section .h-card .u-photo {
-margin-right:7px;
-margin-bottom:0;
-}
-
-.section .notice {
-padding-top:7px;
-padding-bottom:7px;
-border-top:0;
-}
-
-.section .notice:first-child {
-padding-top:0;
-}
-
-.section .notice .author {
-margin-right:0;
-}
-
-.p-name.metadata {
+.notice-title {
     display:none;
 }
 
@@ -1052,12 +1011,13 @@ margin-right:0;
     width: 100%;
 }
 
-#aside_primary .notices li {
-    margin-bottom: 8px;
+#aside_primary .notice .h-card .u-photo {
+    height: 24px;
+    width: 24px;
+    margin-right: 8px;
 }
-
-#aside_primary .notice {
-    min-height: 24px;
+#aside_primary .notice .e-content {
+    margin-left: 32px;
 }
 
 #export_data li {
@@ -1359,9 +1319,6 @@ float:left;
 }
 
 
-.form_settings .form_data input {
-width:39%;
-}
 .form_settings .form_data input.submit,
 .form_settings .form_data input.checkbox,
 .form_settings .form_data input.radio {
@@ -1493,7 +1450,17 @@ width:auto;
 margin-left:0;
 }
 
-.entry-metadata .timestamp span.p-name {
+.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 {
     display: none;
 }