Merge branch 'fabrixxm-master'

[friendica.git] / view / theme / default / style.css

diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index d9e93bbe649b58c07e6aa16cae20e31519d7593b..5dd0b871211782c1adf67057f592c01d5582e04b 100644 (file)
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -256,10 +256,15 @@ nav {
 
 .fn {
        font-size: 1.4em;
-       margin-bottom: 10px;
+       margin-bottom: 5px;
        line-height: 1.5;
 }
 
+.vcard .title {
+       margin-bottom: 5px;
+}
+
+
 .powered {
        font-size: 0.6em;
        color: black;
@@ -729,8 +734,13 @@ input#dfrn-url {
        margin-bottom: 20px;
 }
 
+#profile-photo-link-select-wrapper {
+       margin-top: 2em;
+}
+
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
+#profile-edit-pdesc-label,
 #profile-edit-gender-label,
 #profile-edit-dob-label,
 #profile-edit-address-label,
@@ -750,6 +760,7 @@ input#dfrn-url {
 
 #profile-edit-profile-name,
 #profile-edit-name,
+#profile-edit-pdesc,
 #gender-select,
 #profile-edit-dob,
 #profile-edit-address,
@@ -819,6 +830,7 @@ input#dfrn-url {
 
 #profile-edit-profile-name-end,
 #profile-edit-name-end,
+#profile-edit-pdesc-end,
 #profile-edit-gender-end,
 #profile-edit-dob-end,
 #profile-edit-address-end,
@@ -977,6 +989,10 @@ input#dfrn-url {
        width: 450px;
        margin-left: 10px;
        margin-bottom: 20px;
+       padding: 20px;
+       max-height: 400px;
+       overflow: auto;
+
 }
 
 .wall-item-title {
@@ -1022,7 +1038,7 @@ input#dfrn-url {
        margin-left: 110px;
        margin-top: 10px;
 }
-
+#profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
        margin-top: 15px;
 }
@@ -1066,7 +1082,9 @@ input#dfrn-url {
 #profile-jot-perms-end {
        clear: both;
 }
-
+#profile-jot-plugin-end {
+  clear:both;
+}
 #profile-jot-end {
        clear: both;
        margin-bottom: 30px;
@@ -1319,6 +1337,9 @@ input#dfrn-url {
 #contact-edit-poll-text {
        margin-bottom: 10px;
 }
+#contact-edit-update-now {
+       margin-top: 15px;
+}
 
 #contact-edit-photo-wrapper {
        margin-bottom: 20px;
@@ -1713,6 +1734,9 @@ a.mail-list-link {
 #photos-upload-album-select {
        float: left;
 }
+#photos-upload-spacer {
+       margin-top: 25px;
+}
 #photos-upload-new-end, #photos-upload-exist-end {
        clear: both;
 }
@@ -1778,11 +1802,11 @@ a.mail-list-link {
        margin-bottom: 15px;
 }
 
-#photo-edit-caption-label, #photo-edit-tags-label {
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
        float: left;
        width: 150px;
 }
-#photo-edit-caption, #photo-edit-newtag {
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
        float: left;
        margin-bottom: 25px;
 }
@@ -1793,7 +1817,7 @@ a.mail-list-link {
        margin-bottom: 25px;
 }
 
-#photo-edit-caption-end, #photo-edit-tags-end {
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
        clear: both;
 }
 
@@ -1981,3 +2005,17 @@ a.mail-list-link {
 #birthday-wrapper {
        margin-bottom: 20px;
 }
+
+
+#network-new-link {
+       margin-top: 15px;
+       margin-bottom: 15px;
+}
+
+.tool-wrapper {
+  float: left;
+  margin-left: 20px;
+}
+.tool-link {
+  cursor: pointer;
+}