Merge remote-tracking branch 'upstream/develop' into 1504-parse_url

[friendica.git] / view / theme / smoothly / style.css

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index e94a9d7ad9cae13c76e6277b7cac5e7a3ff62258..d9dba9818c4404d2f807ee573e134e46416567db 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -1,8 +1,8 @@
 /*
        style.css
        Theme: Smoothly
-       Maintainer: alex@friendica.pixelbits.de
-       last change: 2013-05-07
+       Maintainer: Nomen Nominandum
+       last change: 2013-05-08
 
 ** Colors ** 
 Blue links - #1873a2
@@ -1726,6 +1726,59 @@ ul .sidebar-group-li .icon {
        background-color: #1873a2; 
 }
 
+.wall-item-container .wall-item-content .type-link img,
+.type-link img {
+  max-width: 160px;
+  max-height: 160px;
+  float: left;
+  margin-right: 10px;
+}
+.type-link blockquote {
+  margin-left: 160px;
+  max-height: 160px;
+  overflow: hidden;
+}
+.type-link .oembed {
+}
+
+.shared_header {
+  height: 32px;
+  color: #999;
+  border-top: 1px solid #D2D2D2;
+  padding-top: 5px;
+  margin-top: 5px;
+}
+
+.shared_header a {
+  color: black;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+
+.shared_header a:hover {
+  color: #36c;
+}
+
+.shared_header img {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  float: left;
+}
+
+.shared_header span {
+  margin-left: 9px;
+}
+
+blockquote.shared_content {
+  margin-left: 32px;
+  color: #000;
+  border: none;
+}
+
 .icon.drop,
 .icon.drophide { 
        float: left;
@@ -3933,7 +3986,13 @@ margin-left: 0px;
        font-size: 0.7em; 
 }
 
-footer {
+footer { display: block; margin: 50px 20%; clear: both; }
+
+/* ========== */
+/* = Tools = */
+/* ========== */
+
+tools {
        background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) );
        background: -moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% );
        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0edf0', endColorstr='#e2e2e2');
@@ -3950,7 +4009,7 @@ footer {
        display: block;
        float: right;
        font-size: 15px;
-       height: 2em;
+       height: 38px;
        list-style: none outside none;
        margin: 0 0 0 755px;
        padding: 0;
@@ -3961,7 +4020,6 @@ footer {
        clear:both;
 }
 
-
 /* ======= */
 /* = ACL = */
 /* ======= */
@@ -4330,9 +4388,10 @@ ul.menu-popup {
 ----------------------------------------------------------- */
 #scrollup {
        position: absolute;
-       right: 70px;
-       bottom: -4px;
+       right: 0px;
+       bottom: -1px;
        z-index: 100;
+padding-right: 10px;
 }
 
 #scrollup a:hover {
@@ -4340,6 +4399,10 @@ ul.menu-popup {
        border: 0;
 }
 
+.item-scrollup {
+       margin-left: 5px;
+}
+
 /* New posts and comments => background color
 ----------------------------------------------------------- */
 .shiny {