Merge branch 'master' of gitorious.org:social/mainline into social-master

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 276a5368a4a73f9e3c33fb8ac56268e7056176e8..5453312947ce1da165a59dff1d6738964162b5b4 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -49,11 +49,11 @@ h1, h2, h3, h4, h5, h6 {
     margin-bottom: 15px;
 }
 
-h1 {font-size: 2.2em;}
-h2 {font-size: 1.8em;}
-h3 {font-size: 1.6em;}
-h4 {font-size: 1.4em;}
-h5 {font-size: 1.2em;}
+h1 {font-size: 2.0em;}
+h2 {font-size: 1.6em;}
+h3 {font-size: 1.4em;}
+h4 {font-size: 1.2em;}
+h5 {font-size: 1.1em;}
 h6 {font-size: 1em;}
 
 p {
@@ -124,6 +124,7 @@ option {
 }
 
 #content_inner {
+    clear: both;
     display: block;
     position: relative;
 }
@@ -247,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;
 }
@@ -566,6 +572,10 @@ address .poweredby {
     z-index: 1;
 }
 
+.form_settings {
+    clear: both;
+}
+
 /* site nav local views */
 
 
@@ -657,11 +667,6 @@ address .poweredby {
     float: left;
 }
 
-#content .notice .h-entry {
-    margin: 2px 0 0 0;
-    min-height: 32px;
-}
-
 .h-card .u-url, .h-card.u-url {
     text-decoration:none;
 }
@@ -669,15 +674,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;
 }
@@ -703,36 +699,18 @@ font-style:italic;
     min-height: 1em; 
 }
 
-#shownotice .notice .h-entry {,
+#shownotice .notice .h-entry {
     font-size:2.2em;
     min-height:123px;
     font-size: 1.6em;
     line-height: 1.2em;
 }
 
-.notice div.e-content {
+.notice .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;
-}
-
-.entry-metadata {
-    clear: left;
-    float: left;
-    font-size: 0.88em;
-}
-
-.entry-metadata, .notice-options {
+.notice-options {
     margin-bottom: 7px;
     margin-top: 12px;
 }
@@ -811,6 +789,15 @@ position:static;
     top: 1em;
 }
 
+.notice.h-entry .attachments .inline-attachment * {
+    max-width: 100%;
+}
+.notice.h-entry .attachments .inline-attachment > a {
+    font-size: 0.8em;
+    line-height: 16px;
+    height: 16px;
+}
+
 #attachments {
 clear:both;
 float:left;
@@ -867,7 +854,7 @@ content: ":";
 }
 
 .threaded-replies:empty {
-    margin-bottom: 0px; 
+    display: none;
 }
 
 #content .notice .threaded-replies .notice,
@@ -883,7 +870,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;
 }
@@ -894,11 +881,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;
 }
 
@@ -973,6 +956,18 @@ content: ":";
     display: none;
 }
 
+.notice .permalink:after {
+    content: ']';
+}
+
+.notice .permalink:before {
+    content: '[';
+}
+
+.notice .permalink.external {
+    display: none;
+}
+
 /* old school conversation style */
 
 #conversation .notices .notices {
@@ -994,31 +989,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;
 }
 
@@ -1030,12 +1001,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 {
@@ -1293,20 +1265,16 @@ form label.submit {
 display:none;
 }
 
-.form_settings {
-    clear:both;
-}
-
 .form_settings fieldset {
     margin-top: 10px;
-    margin-bottom: 30px;
+    margin-bottom: 10px;
     border: none;
 }
 
 .form_settings fieldset fieldset {
-    margin-bottom: 40px;
+    margin-bottom: 20px;
     padding: 10px;
-    padding-top: 30px;
+    padding-top: 10px;
     border-width:1px;
     border-style:solid;
     background:rgba(240, 240, 240, 0.2);
@@ -1341,9 +1309,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 {
@@ -1475,7 +1440,12 @@ width:auto;
 margin-left:0;
 }
 
-.entry-metadata .timestamp span.p-name {
+.notice > footer {
+    clear: left;
+    font-size: 0.8em;
+}
+
+.notice > footer .timestamp span.p-name {
     display: none;
 }
 
@@ -1990,8 +1960,6 @@ margin:0;
 #profile_search_results {
 display:block;
 border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 max-height:800px;
 margin:10px 0;
 padding: 5px;
@@ -2060,8 +2028,6 @@ float:left;
     padding: 6px;
     margin: 4px 0px 0px 4px;
     border-top-left-radius: 7px;
-    -moz-border-radius-topleft: 7px;
-    -webkit-border-top-left-radius: 7px;
 }
 
 .oauth-desktop-mode fieldset {
@@ -2483,7 +2449,7 @@ display:none;
     list-style-type: none;
 }
 
-/*end of @media screen, projection, tv*/
+}/*end of @media screen, projection, tv*/
 
 
 @media print {