mirror of
https://github.com/friendica/friendica
synced 2024-11-10 19:42:54 +00:00
Merge pull request #910 from fabrixxm/master
quattro: css for reshare moved to LESS file
This commit is contained in:
fabrixxm
commit
446a82e9fd
5 changed files with 52 additions and 77 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in a new issue