Merge branch 'pull'

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

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 95bc1c6f7da8b1eb0561e47ff7feeb284b61fdb7..bb0dda5a56ab24de0801df16486c76f6832a9bbe 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -81,17 +81,18 @@ mark {
     font-weight: bold;
 }
 /* Redeclare monospace font family: h5bp.com/j */
-pre, code, kbd, samp {
+pre, code, kbd, samp, .wall-item-body code {
     font-family: monospace, monospace;
     _font-family: 'courier new', monospace;
     font-size: 1em; }
 
 /* Improve readability of pre-formatted text in all browsers */
-pre {
+pre, .wall-item-body code {
     white-space: pre;
     white-space: pre-wrap;
     word-wrap: break-word;
 }
+
 q {
     quotes: none;
 }
@@ -152,7 +153,7 @@ a:hover {
     color: #729fcf;
 }
 input[type=submit] {
-    margin-top: 20px;
+    margin-top: 10px;
     height: 22px;
     background-color: #555753;
     color: #eeeeec;
@@ -231,7 +232,8 @@ nav a:hover {
 nav #banner {
        display: block;
        position: absolute;
-       margin-left: 20px;      
+       left: 51px;
+       top: 25px;
 }
 nav #banner #logo-text a {
        font-size: 40px;
@@ -287,6 +289,11 @@ ul#user-menu-popup li a.nav-sep {
 }
 #nav-buttons {
     clear: both;
+       list-style: none;
+       padding: 0px;
+}
+#nav-buttons li {
+       padding: 0;
 }
 nav .nav-link {
        float: right;
@@ -408,8 +415,8 @@ div.jGrowl div.info {
     padding-left: 58px;
 }
 #nav-notifications-menu {
-    margin-top: 30px;
-    width: 255px;
+    margin: 30px 0 0 -45px;
+    width: 300px;
     max-height: 400px;
     overflow: auto;
     font-size: 9pt;
@@ -469,17 +476,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
        width: 30px;
        height: 19px;
        background: transparent url(notifications.png) 0 0 no-repeat;
-       color: #fff;
+       color: #222;
        font-weight: bold;
        font-size: 0.8em;
        padding-top: 0.2em;
        text-align: center;
        float: left;
-       margin-right: -4px;
-    display: none;
+       margin: 0 -1px 0 3px;
+       display: block;
+       visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
-    display: block;
+    visibility: visible;
 }
 #net-update {
        background-position: 0px 0px;
@@ -604,8 +612,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 **/
 aside {
     position: absolute;
-    right: 8%;
-    width: 20.5%;
+    right: 15px;
+    width: 255px;
     font-size: smaller;
 }
 .vcard .fn {
@@ -665,7 +673,7 @@ aside #viewcontacts {
  **/
 #jot {
   /*width: 785px;*/
-  margin: 0px 0 20px 0px;
+  margin: 10px 0 20px 0px;
   width: 100%;
 }
 #jot #jot-tools {
@@ -949,15 +957,16 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 9% 0 9%;
+    margin: 20px 6% 0 4%;
     font-size: 0.8em;
     padding-right: 250px;
+       min-width: 475px;
 }
 
 /** tabs **/
 .tabs {
     list-style: none;
-    margin: 0;
+    margin: 10px 0 10px;
     padding: 0;
     border-bottom: 1px solid #729fcf;
     font-size: 14px;
@@ -996,21 +1005,24 @@ section {
 .wall-item-content-wrapper {
     position: relative;
        padding: 10px;
+       overflow-x: auto;
+       width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
-.wall-item-content-wrapper.shiny {
+.shiny {
     background: #efefdf;
 }
 .wall-item-content {
-    overflow-x: auto;
+       overflow-x: auto;
 }
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
-    margin: 5px 0;
-    border: 1px #aaa solid;
-    border-radius: 5px;
-    padding: 10px;
+    margin: 15px 0 0 0;
+       /*border: 1px #aaa solid;*/
+       /*border-radius: 5px;*/
+    padding: 0px;
+       overflow-x: auto;
 }
 .wall-item-photo-menu {
     display: none;
@@ -1082,13 +1094,13 @@ section {
        clear: left;
        font-size: 0.8em;
        color: #878883;
-       margin: 20px 0 0 140px;
+       margin: 5px 0 5px 120px;
 }
 .wall-item-author, .wall-item-actions-author {
        clear: left;
        font-size: 0.8em;
        color: #878883;
-       margin: 20px 0 0 140px;
+       margin: 20px 0 0 110px;
 }
 .wall-item-ago {
        display: inline;
@@ -1207,8 +1219,8 @@ section {
 .wall-item-outside-wrapper.comment .wall-item-body {
     margin-left: 10px;
 }
-.wall-item-outside-wrapper.comment .wall-item-actions-author {
-    margin-left: 60px;
+.wall-item-outside-wrapper.comment .wall-item-author {
+    margin-left: 50px;
 }
 
 .wall-item-outside-wrapper.comment .wall-item-photo-menu {
@@ -1226,9 +1238,9 @@ section {
        width: 20px;
        height: 20px;
 }
-.comment-edit-photo-link {
+.comment-edit-photo-link, .comment-edit-photo {
        float: left;
-       width: 40px;
+       margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1264,7 +1276,7 @@ section {
 }
 .comment-edit-submit-wrapper {
        width: 90%;
-       margin-left: 0px;
+       margin: 5px 5px 10px 50px;
        text-align: right;
 }
 .comment-edit-submit {
@@ -1282,11 +1294,13 @@ section {
  * item text style
  **/
 .wall-item-body code {
-       display:block;
-       padding-left:10px;
-       border-color:#ccc;
-       border-style:solid;
-       border-width:1px 1px 1px 10px;
+       display: block;
+       padding-left: 10px;
+       border-color: #ccc;
+       border-style: solid;
+       border-width: 1px 1px 1px 10px;
+       background: #eee;
+       width: 95%;
 }
 
 
@@ -1431,6 +1445,37 @@ div[id$="wrapper"] br {
 #photos-upload-perms-menu {
     text-align: right;
 }
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+    float: left;
+    margin-bottom: 25px;
+}
+#photo-edit-link-wrap {
+    margin-bottom: 15px;
+}
+#photo-edit-caption {
+       width: 100%;
+}
+#photo-edit-newtag {
+       width: 100%;
+}
+#photo-like-div {
+    margin-bottom: 25px;
+}
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+    clear: both;
+}
+#photo-edit-delete-button {
+    margin-left: 200px;
+}
+#photo-edit-end {
+    margin-bottom: 35px;
+}
+#photo-caption {
+    font-size: 110%;
+    font-weight: bold;
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
 
 /**
  *     message
@@ -1658,11 +1703,11 @@ div[id$="wrapper"] br {
 }
 
 #settings-nickname-desc {
-    background-color:#DDEFFF;
-    -webkit-border-radius:5px;
-    -moz-border-radius:5px;
-    border-radius:5px;
-    padding:5px;
+    background-color: #def;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    padding: 5px;
 }
 
 #register-form div,
@@ -1712,6 +1757,14 @@ div[id$="wrapper"] br {
 /**
  *     contacts selector
  */
+.group-delete-wrapper {
+       margin: -28px 150px 0 0;
+    float: right;
+}
+#group-edit-submit-wrapper {
+    margin: 0 0 10px 0;
+    display: inline;
+}
 #group-edit-desc {
     margin: 10px 0px;
 }
@@ -1867,7 +1920,13 @@ div[id$="wrapper"] br {
 #item-delete-selected {
        margin-top: 30px;
 }
-
+/* was tired of having no way of moving it around, so
+ * here's a little 'hook' to do so */
+.delete-checked {
+       position: absolute;
+       left: 35px;
+       margin-top: 20px;
+}
 #item-delete-selected-end {
        clear: both;
 }
@@ -2042,26 +2101,38 @@ div[id$="wrapper"] br {
  * Form fields
  */
 .field {
-    margin-bottom: 10px;
-    padding-bottom: 10px;
+       /*margin-bottom: 10px;*/
+       /*padding-bottom: 10px;*/
     overflow: auto;
     width: 100%;
 }
 .field label {
     float: left;
-    width: 200px;
+    width: 275px;
+       display: block;
+       font-size: 1.077em;
+       /*font-weight: bold;*/
+       margin-bottom: 0.2em;
+       margin: 0 10px 0.2em 0;
+       border: 1px #999 solid;
+       padding: 5px;
+       background: #def;
+       vertical-align: middle;
+}
+.field input {
+       width: 250px;
+       height: 25px;
+       border: 1px #666 solid;
 }
-
-.field input,
 .field textarea {
-    width: 400px;
+    width: 80%;
 }
 .field textarea {
     height: 100px;
 }
 .field_help {
     display: block;
-    margin-left: 0px;
+    margin-left: 222px;
     color: #666;
 }
 .field .onoff {
@@ -2071,25 +2142,19 @@ div[id$="wrapper"] br {
 .field .onoff a {
     display: block;
     border: 1px solid #666;
-    background: url("../../../images/onoff.jpg") no-repeat;
-    padding: 4px 2px 2px;
+    padding: 3px 6px 4px 10px;
     height: 16px;
     text-decoration: none;
 }
-.field .onoff .off {
-    border-color: #666;
-    padding-left: 40px;
-    background: #ccc left center;
-    color: #666;
-    text-align:right;
-}
 .field .onoff .on {
-    border-color:#204a87;
-    padding-right:40px;
-    background-position:right center;
-    background-color:#3465A4;
-    color:#fff;
-    text-align:left;
+       background: url("../../../images/onoff.jpg") no-repeat 42px 1px #def;
+    color: #333;
+    text-align: left;
+}
+.field .onoff .off {
+       background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    color: #333;
+    text-align: right;
 }
 .hidden {
     display:none !important;
@@ -2352,6 +2417,11 @@ div[id$="wrapper"] br {
        opacity: 0.3;
        filter: alpha(opacity=30);
 }
+#pause {
+       position: fixed;
+       bottom: 5px;
+       right: 5px;
+}
 .border, .border:hover {
        border: 1px solid #babdb6;
     -webkit-border-radius: 3px;