aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-03-23 14:04:35 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-03-23 14:04:35 +0100
commit1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1 (patch)
tree629a2c3cb457293bbe77c956011ad370aa087a78 /view/theme
parent4a1426934968384d10a38f335a1c0c49b058dc2d (diff)
parent93504896155d74fc42f6bf60cb61d65295f6b911 (diff)
downloadvolse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.tar.gz
volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.tar.bz2
volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.zip
Merge branch 'master' of github.com:fabrixxm/friendika
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/duepuntozero/style.css40
-rw-r--r--view/theme/loozah/style.css25
2 files changed, 61 insertions, 4 deletions
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 5db45921a..4f6d6c196 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -384,6 +384,7 @@ input#dfrn-url {
#settings-nick-end,
#settings-defloc-end,
#settings-allowloc-end,
+#settings-blockw-end,
#settings-timezone-end,
#settings-theme-end,
#settings-password-end,
@@ -404,6 +405,7 @@ input#dfrn-url {
#settings-nick-label,
#settings-defloc-label,
#settings-allowloc-label,
+#settings-blockw-label,
#settings-timezone-label,
#settings-theme-label,
#settings-password-label,
@@ -424,6 +426,7 @@ input#dfrn-url {
#settings-nick,
#settings-defloc,
#settings-allowloc,
+#settings-blockw,
#timezone-select,
#theme-select,
#settings-password,
@@ -1431,7 +1434,7 @@ input#dfrn-url {
/*margin-left: 50px;*/
}
-#block-message, #ignore-message, #profile-edit-insecure {
+#block-message, #ignore-message {
margin-top: 20px;
color: #FF0000;
font-size: 1.1em;
@@ -1440,13 +1443,21 @@ input#dfrn-url {
padding: 10px;
}
+#profile-edit-insecure {
+ margin-top: 20px;
+ color: #FF0000;
+ font-size: 1.1em;
+ border: 1px solid #FF8888;
+ background-color: #FFEEEE;
+ padding-left: 5px;
+ /*: 3px 3px 3px 5px; */
+ width: 587px;
+}
+
#block-message, #ignore-message {
width: 180px;
}
-#profile-edit-insecure {
- width: 600px;
-}
/*
.profile-tabs {
@@ -2133,3 +2144,24 @@ a.mail-list-link {
clear: both;
}
+.profile-match-photo {
+ float: left;
+ text-align: center;
+ width: 120px;
+}
+
+.profile-match-name {
+ float: left;
+ text-align: center;
+ width: 120px;
+ overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+ clear: both;
+}
+
+.side-link {
+ margin-bottom: 15px;
+}
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 0284bdcf8..49c83c83c 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -517,6 +517,7 @@ input#dfrn-url {
#settings-nick-end,
#settings-defloc-end,
#settings-allowloc-end,
+#settings-blockw-end,
#settings-timezone-end,
#settings-theme-end,
#settings-password-end,
@@ -537,6 +538,7 @@ input#dfrn-url {
#settings-nick-label,
#settings-defloc-label,
#settings-allowloc-label,
+#settings-blockw-label,
#settings-timezone-label,
#settings-theme-label,
#settings-password-label,
@@ -557,6 +559,7 @@ input#dfrn-url {
#settings-nick,
#settings-defloc,
#settings-allowloc,
+#settings-blockw,
#timezone-select,
#theme-select,
#settings-password,
@@ -2166,3 +2169,25 @@ a.mail-list-link {
clear: both;
}
+
+.profile-match-photo {
+ float: left;
+ text-align: center;
+ width: 120px;
+}
+
+.profile-match-name {
+ float: left;
+ text-align: center;
+ width: 120px;
+ overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+ clear: both;
+}
+
+.side-link {
+ margin-bottom: 15px;
+}