Merge remote-tracking branch 'upstream/develop' into more-abstraction

[friendica.git] / view / global.css

diff --git a/view/global.css b/view/global.css
index 8cb1db95a77f8bc92924929f58514e1ca6e76cd2..0e6a36e2c61ad0a9e49eb65fc4a482f40b9a29d5 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -201,6 +201,18 @@ blockquote.shared_content {
   content: ' »';
 }
 
+#profile-photo-wrapper {
+  clear: both;
+  overflow: hidden;
+}
+
+#newmember-tips {
+  font-size: 1.2em;
+  float: right;
+  margin-top: -32px;
+  padding-right: 10px;
+}
+
 /* headers */
 h1, h2, h3, h4, h5, h6 {
   margin: 5px 0px 5px 0px;
@@ -242,7 +254,7 @@ code {
   background-color: #eee;
   color: #666;
   padding: 1em;
-  font-size: 0.8em;
+  font-size: 0.85em;
   font-family: monospace;
 }
 key {
@@ -250,7 +262,7 @@ key {
   background-color: #eee;
   color: #666;
   padding: 0.2em;
-  font-size: 0.8em;
+  font-size: 0.85em;
   font-family: monospace;
 }
 
@@ -414,6 +426,7 @@ a {
 }
 .federation-graph {
   margin: 0 auto;
+  float: right;
 }
 .federation-network-graph {
   float: left;
@@ -451,6 +464,22 @@ td.federation-data {
   opacity: 0.3;
 }
 
+/* help widget */
+aside .help-aside-wrapper ul {
+  padding-left: 1em;
+}
+
+aside .help-aside-wrapper h1 {
+  font-size:2em
+}
+
+.md_warning {
+  padding: 1em;
+  border: #ff0000 solid 2px;
+  background-color: #f9a3a3;
+  color: #ffffff;
+}
+
 #forum-widget-collapse:hover {
   opacity: 1.0;
 }
@@ -578,4 +607,4 @@ img.invalid-src:after { vertical-align: top;}
 }
 .tag-cloud {
   word-wrap: break-word;
-}
\ No newline at end of file
+}