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 8b2f2310f52c533c6cd7d83f1c3dab0c9c67e1b8..5dd0b871211782c1adf67057f592c01d5582e04b 100644 (file)
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -47,6 +47,9 @@ input:hover {
    background-position: 0 50%;
    padding-left: 18px;
 }
+.openid:hover {
+       background-color: #0CBEFE !important;
+}
 
 option {
        background-color: #ECD6D2;
@@ -68,6 +71,19 @@ code {
 blockquote:before {
        content: '>> ';
 }
+
+#site-location {
+       position: absolute;
+       right: 5px;
+       top: 3px;
+       color: white;
+       font-size: 60%;
+}
+
+.shiny {
+       border-color: orange !important;
+}
+
 .nav-login-link {
        float: right;
        margin-left: 0px;
@@ -128,15 +144,33 @@ blockquote:before {
 #top-margin {
        height: 20px;
 }
-#banner {
 
+#logo-img {
+       margin-top: 3px;
+
+}
+
+#logo-text {
+       font-family: "gill sans MT bold", "lucida grande",tahoma,verdana,arial,sans-serif;
+       margin-left: 3px;
+       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;
-       font-size: 1.8em;
-       letter-spacing: 0.12em;
+       font-size: 2.0em;
        position: absolute;
-       top: 10px;
-       left: 40%;
+       top: 5px;
+       left: 39%;
 }
 
 #panel {
@@ -160,14 +194,17 @@ img.photo {
        font-weight: bold;
        margin-left: 280px;
 }
-#page-footer {
-       height: 20px;
-/*     border-bottom: 3px dashed #15607B; */
-}
+
+/*
+ * #page-footer {
+ *     height: 20px;
+ *
+ * }
+ */
 
 .heart {
        color: #FF0000;
-       font-size: 120%;
+       font-size: 100%;
 }
 
 aside {
@@ -206,25 +243,28 @@ nav {
        background: #15607B;
 }
 
-footer {
-       /*position: absolute;*/
-       left: 0px;
-       /*right: 0px;*/
-       bottom: 0px;
-       /*margin: 20px 20px 20px 20px;*/
-
-       position: fixed;
-       background-color: #0CBEFE;
-       width: 100%;
-       padding: 2px 3%;
-}
+/*
+ * footer {
+ *     left: 0px;
+ *     bottom: 0px;
+ *     position: fixed;
+ *     background-color: #0CBEFE;
+ *     width: 100%;
+ *     padding: 2px 3%;
+ * }
+ */
 
 .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;
@@ -334,8 +374,11 @@ footer {
        margin-left: 20px;
        margin-right: 20px;
 }
+#register-fill-ext {
+       margin-bottom: 25px;
+}
 
-#label-register-name, #label-register-email, #label-register-nickname {
+#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
        float: left;
        width: 350px;
        margin-top: 10px;
@@ -347,9 +390,16 @@ footer {
        width: 150px;
 }
 
-#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end {
+#register-openid {
+       float: left;
+       margin-top: 10px;
+       width: 130px;
+}
+
+#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
        clear: both;
 }
+
 #register-nickname-desc {
        margin-top: 30px;
        width: 650px;
@@ -366,19 +416,29 @@ footer {
 
 #label-login-name, #label-login-password, #login-extra-filler {
        float: left;
-       width: 150px;
+       width: 200px;
        margin-bottom: 20px;
 }
 
 
-#login-name, #login-password {
+#login-password {
        float: left;
-       width: 150px;
+       width: 170px;
+}
+
+#login-name {
+       float: left;
+       width: 153px;
+}
+
+#login-name.no-openid {
+       float: left;
+       width: 170px;
 }
 
 #register-link, #lost-password-link {
        float: left;
-       font-size: 0.7em;
+       font-size: 80%;
        margin-right: 15px;
 }
 
@@ -387,8 +447,8 @@ footer {
 }
 
 #login-submit-button {
-       margin-top: 10px;
-       margin-left: 150px;
+/*     margin-top: 10px; */
+       margin-left: 200px;
 }
 
 input#dfrn-url {
@@ -457,6 +517,7 @@ input#dfrn-url {
 #settings-password-end,
 #settings-confirm-end,
 #settings-openid-end,
+#settings-maxreq-end,
 #notify1-end,
 #notify2-end,
 #notify3-end,
@@ -476,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,
@@ -494,7 +556,7 @@ input#dfrn-url {
 #theme-select,
 #settings-password,
 #settings-confirm,
-#settings-openid,
+#settings-maxreq,
 #notify1,
 #notify2,
 #notify3,
@@ -504,6 +566,17 @@ input#dfrn-url {
        margin-bottom: 20px;
 }
 
+#settings-openid {
+       float: left;
+       margin-bottom: 20px;
+       width: 127px;
+}
+       
+#settings-maxreq-desc {
+       float: left;
+       margin-left: 20px;
+}
+
 #settings-theme-label,
 #settings-defloc-label {
        margin-top: 20px;
@@ -661,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,
@@ -674,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;
@@ -681,6 +760,7 @@ input#dfrn-url {
 
 #profile-edit-profile-name,
 #profile-edit-name,
+#profile-edit-pdesc,
 #gender-select,
 #profile-edit-dob,
 #profile-edit-address,
@@ -692,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,
@@ -717,6 +798,17 @@ input#dfrn-url {
        width: 50px;
 }
 
+#profile-edit-with-label {
+       width: 175px;
+       margin-left: 20px;
+}
+
+#profile-edit-keywords-desc {
+       float: left;
+       margin-left: 20px;
+}
+
+
 #profile-edit-homepage {
        float: left;
        margin-bottom: 35px;
@@ -738,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,
@@ -749,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,
@@ -895,6 +989,10 @@ input#dfrn-url {
        width: 450px;
        margin-left: 10px;
        margin-bottom: 20px;
+       padding: 20px;
+       max-height: 400px;
+       overflow: auto;
+
 }
 
 .wall-item-title {
@@ -940,7 +1038,7 @@ input#dfrn-url {
        margin-left: 110px;
        margin-top: 10px;
 }
-
+#profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
        margin-top: 15px;
 }
@@ -984,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;
@@ -1215,6 +1315,11 @@ input#dfrn-url {
        border: 1px solid #CCCCCC;
 }
 
+#advanced-profile-with {
+       float: left;
+       margin-left: 15px;
+}
+
 #contact-edit-wrapper {
        margin-top: 50px;
 }
@@ -1232,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;
@@ -1626,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;
 }
@@ -1691,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;
 }
@@ -1706,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;
 }
 
@@ -1837,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;
+}