aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-22 06:20:32 -0700
committerfriendica <info@friendica.com>2012-03-22 06:20:32 -0700
commit622b25df5f2d1ab21c9e23047bc0c98bfe72bad0 (patch)
tree29355722fb8a3e993884e852a254277c80e90de4
parent40d19d5b8c34cdb2ad6d605e85206bbe57c0be13 (diff)
parent586c07681bdb29b30e7e06ab031bdfa1c2de66c1 (diff)
downloadvolse-hubzilla-622b25df5f2d1ab21c9e23047bc0c98bfe72bad0.tar.gz
volse-hubzilla-622b25df5f2d1ab21c9e23047bc0c98bfe72bad0.tar.bz2
volse-hubzilla-622b25df5f2d1ab21c9e23047bc0c98bfe72bad0.zip
Merge branch 'pull'
-rwxr-xr-xview/theme/quattro-green/colors.less2
-rwxr-xr-xview/theme/quattro-green/style.css43
-rwxr-xr-xview/theme/quattro/quattro.less8
-rwxr-xr-xview/theme/quattro/style.css6
4 files changed, 52 insertions, 7 deletions
diff --git a/view/theme/quattro-green/colors.less b/view/theme/quattro-green/colors.less
index 57fd2ef60..9eee19f4c 100755
--- a/view/theme/quattro-green/colors.less
+++ b/view/theme/quattro-green/colors.less
@@ -72,6 +72,8 @@
@NoticeColor: @Grey1;
@NoticeBackgroundColor: #511919;
+@FieldHelpColor: @Grey3;
+
@ThreadBackgroundColor: #f6f7f8;
@ShinyBorderColor: @Green4;
diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro-green/style.css
index 301477679..2f463c96c 100755
--- a/view/theme/quattro-green/style.css
+++ b/view/theme/quattro-green/style.css
@@ -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;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 27c48f195..fca65c907 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -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;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 6087e4cd1..8f0abe86d 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -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;