Merge remote branch 'upstream/master'

[friendica.git] / view / theme / dispy-dark / style.css

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 2dc21817a268326e7d14e9385c3a2e28b62bee83..9883b2fd72c5c1c6be4848f5ba5540642da3199d 100644 (file)
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -123,9 +123,6 @@ a {
     text-decoration: none;
     margin-bottom: 1px;
 }
-/*a:hover {                 */
-/*    text-decoration: none;*/
-/*}*/
 a:hover img {
     text-decoration: none;
 }
@@ -156,9 +153,9 @@ a:hover {
     color: #729fcf;
 }
 input[type=submit] {
-       font-weight: bold;
     background-color: #eee;
        color: #2e302e;
+       font-weight: bold;
     margin-top: 10px;
     height: 22px;
     -webkit-border-radius: 5px;
@@ -694,7 +691,7 @@ aside #viewcontacts {
        margin: 30px 0px;
 }
 .ttright {
-       margin: 0px 0px 0px 5px;
+       margin: 0px 0px 0px 0px;
 }
 
 /**
@@ -778,6 +775,15 @@ aside #viewcontacts {
 #profile-jot-text_ifr {
        width:99.900002% !important;
 }
+[id$="jot-text_ifr"] {
+       width: 99.900002% !important;
+       color: #2e2f2e;
+       background: #eec;
+}
+[id$="jot-text_ifr"] .mceContentBody {
+       color: #2e2f2e;
+       background: #eec;
+}
 #profile-attach-wrapper,
 #profile-audio-wrapper,
 #profile-link-wrapper,
@@ -835,6 +841,7 @@ aside #viewcontacts {
     border: 0;
     text-decoration: none;
        float: right;
+       cursor: pointer;
 }
 #profile-jot-perms { 
        float: right;
@@ -1251,7 +1258,7 @@ section {
 }
 [class^="comment-edit-text"] {
     margin: 5px 0 10px 20px;
-    width: 86.5%;
+    width: 84.5%;
 }
 .comment-edit-text-empty {
        height: 20px;
@@ -1489,6 +1496,8 @@ div[id$="wrapper"] br {
 }
 #prvmail-subject {
     width: 100%;
+       color: #2e2f2e;
+       background: #eec;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1524,7 +1533,6 @@ div[id$="wrapper"] br {
 }
 .mail-list-subject {
     font-size: 1.2em;
-       font-weight: bold;
 }
 .mail-list-delete-wrapper {
     float: right;
@@ -1702,7 +1710,6 @@ div[id$="wrapper"] br {
 }
 
 
-
 /**
  *     register, settings & profile forms
  */
@@ -1749,39 +1756,43 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-       /*background: #111;*/
-       /*border-radius: 5px 5px 0px 0px;*/
-       /*margin: 0px 0px 0px 0px;*/
-       /*width: 100px;*/
-       /*height: 25px;*/
-       /*position: absolute;*/
+       /*background: #111;
+       border-radius: 5px 5px 0px 0px;
+       margin: 0px 0px 0px 0px;
+       width: 100px;
+       height: 25px;
+       position: absolute;*/
        display: none;
-       /*left: 35%;*/
-       /*top: 41%;*/
-       /*cursor: pointer;*/
-}
-/*.profile-edit-side-div:hover {*/
-       /*display: block;*/
-/*}*/
-/*.profile-edit-side-link {*/
-       /*margin: 3px 0px 0px 70px;*/
-/*}*/
+       /*left: 35%;
+       top: 41%;
+       cursor: pointer;*/
+}
+/*.profile-edit-side-div:hover {
+       display: block;
+}
+.profile-edit-side-link {
+       margin: 3px 0px 0px 70px;
+}*/
 #profiles-menu-trigger {
-       width: 100px;
+       margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
     margin: 20px 20px 0px 0px;
 }
 .icon-profile-edit {
-    background: url("icons.png") no-repeat scroll -150px 0px transparent;
-    border: 0 none;
+    background: url("icons.png") -150px 0px no-repeat;
+    border: 0;
+       cursor: pointer;
     display: block;
     float: right;
+       width: 20px;
     height: 20px;
     margin: 0 0 -18px;
+       position: absolute;
     text-decoration: none;
-       cursor: pointer;
+       top: 18px;
+       right: 226px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -1799,6 +1810,10 @@ div[id$="wrapper"] br {
        background: #2e2f2e;
        color: #eec;
 }
+#id_ssl_policy {
+       width: 374px;
+}
+
 
 /**
  *     contacts selector
@@ -1857,6 +1872,71 @@ div[id$="wrapper"] br {
     clear:both;
 }
 
+
+/**
+ * intros
+ */
+.intro-wrapper {
+    margin-top: 20px;
+}
+
+.intro-fullname {
+    font-size: 1.1em;
+    font-weight: bold;
+
+}
+.intro-desc {
+    margin-bottom: 20px;
+    font-weight: bold;
+}
+
+.intro-note {
+    padding: 10px;
+}
+
+.intro-end {
+    padding: 30px;
+}
+
+.intro-form {
+    float: left;
+}
+.intro-approve-form {
+    clear: both;
+}
+.intro-approve-as-friend-end {
+    clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+    margin-right: 20px;
+}
+.intro-submit-approve {
+    margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+    float: left;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+    float: left;
+}
+.intro-form-end {
+    clear: both;
+    margin-bottom: 10px;
+}
+.intro-approve-as-friend-desc {
+    margin-top: 10px;
+}
+.intro-approve-as-end {
+    clear: both;
+    margin-bottom: 10px;
+}
+
+.intro-end {
+    clear: both;
+}
+
+
 /**
  * events
  **/
@@ -2113,12 +2193,12 @@ div[id$="wrapper"] br {
     border-bottom: 1px solid #000;
 }
 #adminpage dt {
-    width: 200px;
+    width: 250px;
     float: left;
     font-weight: bold;
 }
 #adminpage dd {
-       margin-left: 200px;
+       margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
@@ -2580,8 +2660,8 @@ footer {
     margin-top: 30px;
     overflow: auto;
 }
-/*#acl-list-content {*/
-/*}*/
+/*#acl-list-content {
+}*/
 .acl-list-item {
        border: 1px solid #eec;
     display: block;