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 f20341dd6925b4d68d0728f5fc8b16cba137484d..5dd0b871211782c1adf67057f592c01d5582e04b 100644 (file)
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -72,6 +72,14 @@ blockquote:before {
        content: '>> ';
 }
 
+#site-location {
+       position: absolute;
+       right: 5px;
+       top: 3px;
+       color: white;
+       font-size: 60%;
+}
+
 .shiny {
        border-color: orange !important;
 }
@@ -148,6 +156,14 @@ blockquote:before {
        vertical-align: top;
 }
 
+#logo-text a, #logo-text a:hover, #logo-text a:visited {
+       color: #F5F6FB;
+       font-family: "gill sans MT bold", "lucida grande",tahoma,verdana,arial,sans-serif;
+       margin-left: 3px;
+       vertical-align: top;
+}
+
+
 #banner {
        color: #F5F6FB;
        font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
@@ -188,7 +204,7 @@ img.photo {
 
 .heart {
        color: #FF0000;
-       font-size: 120%;
+       font-size: 100%;
 }
 
 aside {
@@ -240,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;
@@ -496,6 +517,7 @@ input#dfrn-url {
 #settings-password-end,
 #settings-confirm-end,
 #settings-openid-end,
+#settings-maxreq-end,
 #notify1-end,
 #notify2-end,
 #notify3-end,
@@ -515,6 +537,7 @@ input#dfrn-url {
 #settings-password-label,
 #settings-confirm-label,
 #settings-openid-label,
+#settings-maxreq-label,
 #settings-label-notify1,
 #settings-label-notify2,
 #settings-label-notify3,
@@ -533,6 +556,7 @@ input#dfrn-url {
 #theme-select,
 #settings-password,
 #settings-confirm,
+#settings-maxreq,
 #notify1,
 #notify2,
 #notify3,
@@ -548,7 +572,10 @@ input#dfrn-url {
        width: 127px;
 }
        
-
+#settings-maxreq-desc {
+       float: left;
+       margin-left: 20px;
+}
 
 #settings-theme-label,
 #settings-defloc-label {
@@ -707,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,
@@ -720,6 +752,7 @@ input#dfrn-url {
 #profile-edit-sexual-label,
 #profile-edit-politic-label,
 #profile-edit-religion-label,
+#profile-edit-keywords-label,
 #profile-edit-homepage-label {
        float: left;
        width: 175px;
@@ -727,6 +760,7 @@ input#dfrn-url {
 
 #profile-edit-profile-name,
 #profile-edit-name,
+#profile-edit-pdesc,
 #gender-select,
 #profile-edit-dob,
 #profile-edit-address,
@@ -738,6 +772,7 @@ input#dfrn-url {
 #sexual-select,
 #profile-edit-politic,
 #profile-edit-religion,
+#profile-edit-keywords,
 #profile-in-dir-yes,
 #profile-in-dir-no,
 #profile-in-netdir-yes,
@@ -768,6 +803,12 @@ input#dfrn-url {
        margin-left: 20px;
 }
 
+#profile-edit-keywords-desc {
+       float: left;
+       margin-left: 20px;
+}
+
+
 #profile-edit-homepage {
        float: left;
        margin-bottom: 35px;
@@ -789,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,
@@ -800,6 +842,7 @@ input#dfrn-url {
 #profile-edit-sexual-end,
 #profile-edit-politic-end,
 #profile-edit-religion-end,
+#profile-edit-keywords-end,
 #profile-edit-homepage-end,
 #profile-in-dir-break,
 #profile-in-dir-end,
@@ -946,6 +989,10 @@ input#dfrn-url {
        width: 450px;
        margin-left: 10px;
        margin-bottom: 20px;
+       padding: 20px;
+       max-height: 400px;
+       overflow: auto;
+
 }
 
 .wall-item-title {
@@ -991,7 +1038,7 @@ input#dfrn-url {
        margin-left: 110px;
        margin-top: 10px;
 }
-
+#profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
        margin-top: 15px;
 }
@@ -1035,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;
@@ -1288,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;
@@ -1682,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;
 }
@@ -1747,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;
 }
@@ -1762,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;
 }
 
@@ -1893,4 +1948,74 @@ a.mail-list-link {
 
 #search-box {
        margin-bottom: 25px;
-}
\ No newline at end of file
+}
+
+.location-label, .gender-label, .marital-label, .homepage-label {
+       float: left;
+       text-align: right;
+       display: block;
+       width: 65px;
+}
+
+.adr, .x-gender, .marital-text, .homepage-url {
+       float: left;
+       display: block;
+       margin-left: 8px;
+}
+
+.profile-clear {
+       clear: both;
+}
+
+
+.clear {
+       clear: both;
+}
+
+.cc-license {
+       margin-top: 50px;
+       font-size: 70%;
+}
+
+
+#plugin-settings-link, #account-settings-link {
+       margin-bottom: 25px;
+}
+
+
+#birthday-title {
+       float: left;
+       font-weight: bold;      
+}
+
+#birthday-adjust {
+       float: left;
+       font-size: 75%;
+       margin-left: 10px;
+}
+
+#birthday-title-end {
+       clear: both;
+}
+
+.birthday-list {
+       margin-left: 15px;
+}
+
+#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;
+}