clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pull'

This commit is contained in:
friendica 2012-03-22 06:20:32 -07:00
parent 40d19d5b8c 586c07681b
commit 622b25df5f
4 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/theme/quattro-green/colors.less
View File

@ -72,6 +72,8 @@
@NoticeColor: @Grey1;
@NoticeBackgroundColor: #511919;
@FieldHelpColor: @Grey3;
@ThreadBackgroundColor: #f6f7f8;
@ShinyBorderColor: @Green4;

43
view/theme/quattro-green/style.css
View File

@ -615,7 +615,7 @@ aside #profiles-menu {
}
#contact-block .contact-block-content {
clear: both;
overflow: idden;
overflow: hidden;
height: auto;
}
#contact-block .contact-block-link {
@ -623,7 +623,7 @@ aside #profiles-menu {
margin: 0px 2px 2px 0px;
}
#contact-block .contact-block-link img {
widht: 48px;
width: 48px;
height: 48px;
}
/* mail view */
@ -787,7 +787,7 @@ section {
}
.wall-item-decor {
position: absolute;
left: 790px;
left: 97%;
top: -10px;
width: 16px;
}
@ -968,6 +968,10 @@ section {
background: url("../../../images/tag.png") no-repeat center right;
color: #ffffff;
}
.filesavetags {
padding: 3px 0px 3px 0px;
opacity: 0.5;
}
.wwto {
position: absolute !important;
width: 25px;
@ -1304,6 +1308,37 @@ ul.tabs li {
ul.tabs li .active {
border-bottom: 1px solid #009100;
}
/** group editor **/
#group-edit-desc {
margin-top: 1em;
color: #999999;
}
#group-update-wrapper {
height: auto;
overflow: auto;
}
#group-update-wrapper #group {
width: 300px;
float: left;
margin-right: 20px;
}
#group-update-wrapper #contacts {
width: 300px;
float: left;
}
#group-update-wrapper #group-separator {
display: none;
}
#group-update-wrapper .contact_list {
height: 300px;
border: 1px solid #364e59;
overflow: auto;
}
#group-update-wrapper .contact_list .contact-block-div {
width: 50px;
height: 50px;
float: left;
}
/**
* Form fields
*/
@ -1326,7 +1361,7 @@ ul.tabs li .active {
.field .field_help {
display: block;
margin-left: 200px;
color: #666666;
color: #999999;
}
.field .onoff {
float: left;

8
view/theme/quattro/quattro.less
View File

@ -113,7 +113,7 @@ header {
#banner {
overflow: hidden;
text-align: center;
text-align: center;
width: 100%;
a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; }
#logo-img { height: 22px; margin-top:5px;}
@ -448,7 +448,7 @@ section {
margin-bottom: 20px;
width: 780px;
}
.wall-item-decor { position: absolute; left: 790px; top: -10px; width: 16px;}
.wall-item-decor { position: absolute; left: 97%; top: -10px; width: 16px;}
.unstarred { display: none; }
.wall-item-container {
@ -570,6 +570,10 @@ section {
color: @TagColor;
}
}
.filesavetags {
padding: 3px 0px 3px 0px;
opacity: 0.5;
}
.wwto {
position: absolute !important;

6
view/theme/quattro/style.css
View File

@ -787,7 +787,7 @@ section {
}
.wall-item-decor {
position: absolute;
left: 790px;
left: 97%;
top: -10px;
width: 16px;
}
@ -968,6 +968,10 @@ section {
background: url("../../../images/tag.png") no-repeat center right;
color: #ffffff;
}
.filesavetags {
padding: 3px 0px 3px 0px;
opacity: 0.5;
}
.wwto {
position: absolute !important;
width: 25px;