Merge branch 'master' of git://github.com/friendika/friendika

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

diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 491486794f6afd4c1d9d7a5bf04b8e4f5c543b84..0457850dc4d0f5680b37d632a590be6a796ce91f 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;
@@ -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 {
@@ -709,6 +736,7 @@ input#dfrn-url {
 
 #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 +748,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 +756,7 @@ input#dfrn-url {
 
 #profile-edit-profile-name,
 #profile-edit-name,
+#profile-edit-pdesc,
 #gender-select,
 #profile-edit-dob,
 #profile-edit-address,
@@ -738,6 +768,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 +799,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 +826,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 +838,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,
@@ -1911,3 +1950,42 @@ a.mail-list-link {
 .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;
+}