Merge pull request #910 from fabrixxm/master

quattro: css for reshare moved to LESS file

diff --git a/view/theme/quattro/Makefile b/view/theme/quattro/Makefile
index 5b3d692a21a9eedfb1667a8d88c3e46b08ff8dce..042fcdd67d836d9d44878152403bffc325cd124b 100644 (file)
--- a/view/theme/quattro/Makefile
+++ b/view/theme/quattro/Makefile
@@ -3,4 +3,8 @@ all:
        cd green; make; cd ..
        cd lilac; make; cd ..
 
+clean:
+       rm dark/style.css
+       rm green/style.css
+       rm lilac/style.css
 

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 4e2ab475e03486cb3df20b1bf6ecc238021f9587..22d3f13b0bf55353f96acaf26de5a6f72a60774c 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -486,7 +486,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -816,7 +815,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -898,7 +896,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
        .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1177,7 +1174,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1269,7 +1265,7 @@ section {
   width: 25px;
   height: 25px;
 }
-
+/* reshare */
 .wall-item-container .wall-item-content .type-link img,
 .type-link img {
   max-width: 160px;
@@ -1282,48 +1278,27 @@ section {
   max-height: 160px;
   overflow: hidden;
 }
-.type-link .oembed {
-}
-
 .shared_header {
   height: 32px;
   color: #999;
-  border-top: 1px solid #D2D2D2;
+  border-top: 1px solid #cccccc;
   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;
 }
-
-
 /* threaded comments */
 .children {
   margin-top: 1em;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index aee9b70db1d4049f430670a1aba84f0e68ab6333..24ce51c65be31dd1947b896f8bb2041dcccecb31 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -486,7 +486,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -816,7 +815,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -898,7 +896,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
        .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1177,7 +1174,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1269,6 +1265,7 @@ section {
   width: 25px;
   height: 25px;
 }
+/* reshare */
 .wall-item-container .wall-item-content .type-link img,
 .type-link img {
   max-width: 160px;
@@ -1281,47 +1278,27 @@ section {
   max-height: 160px;
   overflow: hidden;
 }
-.type-link .oembed {
-}
-
 .shared_header {
   height: 32px;
   color: #999;
-  border-top: 1px solid #D2D2D2;
+  border-top: 1px solid #cccccc;
   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;
 }
-
 /* threaded comments */
 .children {
   margin-top: 1em;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 97ca47308df78db3bf6baca7ef7d609d829827d3..7c002b112e7b3e380d59e2bff4cbaf6d0dcd7759 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -486,7 +486,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -816,7 +815,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -898,7 +896,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
        .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1177,7 +1174,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1269,6 +1265,7 @@ section {
   width: 25px;
   height: 25px;
 }
+/* reshare */
 .wall-item-container .wall-item-content .type-link img,
 .type-link img {
   max-width: 160px;
@@ -1281,47 +1278,27 @@ section {
   max-height: 160px;
   overflow: hidden;
 }
-.type-link .oembed {
-}
-
 .shared_header {
   height: 32px;
   color: #999;
-  border-top: 1px solid #D2D2D2;
+  border-top: 1px solid #cccccc;
   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;
 }
-
 /* threaded comments */
 .children {
   margin-top: 1em;

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 768f1cab290b10e9f4af58007576600785664ad9..96019e0927973688a42b952310d061aa18fe6d90 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -670,6 +670,48 @@ section {
 }
 .wwto .contact-photo { width: 25px; height: 25px; }
 
+/* reshare */
+.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;
+    }
+    .oembed {}
+}
+
+.shared_header {
+    height: 32px;
+    color: #999;
+    border-top: 1px solid @ThreadBottomBorderColor;
+    padding-top: 5px;
+    margin-top: 5px;
+    
+    img {
+        -webkit-border-radius: 4px;
+        -moz-border-radius: 4px;
+        border-radius: 4px;
+        float: left;
+    }
+    
+    span { margin-left: 9px; }
+}
+
+
+blockquote.shared_content {
+    margin-left: 32px;
+    color: #000;
+    border: none;
+}
+
+
 
 /* threaded comments */
 .children {