Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 13f7d2d5649a4327f86b888e52ef437300d51b9d..671d9652baa23c36931c580ede08d27468ade891 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -24,9 +24,9 @@ audio:not([controls]) {
     display: none;
 }
 
-/* =============================================================================
-   Base
-   ========================================================================== */
+/* 
+ *  Base
+ */
 
 /*
  * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
@@ -177,14 +177,14 @@ input[type=submit] {
        padding: 1em;
 }
 .pager {
-       padding-top: 30px;
+       margin-top: 60px;
        display: block;
        clear: both;
        text-align: center;
 }
 .pager span {
     padding: 4px;
-    margin:4px;
+    margin: 4px;
 }
 .pager_current {
     background-color: #729fcf;
@@ -613,25 +613,33 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 aside {
     position: absolute;
     right: 15px;
-    width: 255px;
+    width: 230px;
     font-size: smaller;
 }
 .vcard .fn {
        font-size: 1.7em;
-       font-weight: 700;
+       font-weight: bold;
        border-bottom: 1px solid #729fcf;
-       padding-top: 1px;
+       padding-bottom: 3px;
 }
 .vcard #profile-photo-wrapper {
-       margin: 10px 0px;
+       margin: 20px;
+}
+.vcard #profile-photo-wrapper img {
+       box-shadow: 3px 3px 10px 0;
 }
 aside h4 {
        font-size: 1.2em;
 }
-
 aside #viewcontacts {
        text-align: right;
 }
+.aprofile dt {
+    box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;
+}
 #profile-extra-links ul {
        margin-left: 0px;
     padding-left: 0px;
@@ -750,34 +758,27 @@ aside #viewcontacts {
 }
 #jot #jot-title {
     border: 0px;
-    margin: 0px;
+    margin: 0 0 5px;
     height: 20px;
-    width: 100%;
+    width: 90%;
     font-weight: bold;
-    border: 1px solid #ffffff;
     border-radius: 5px;
-}
-#jot #jot-title:-webkit-input-placeholder {
-  font-weight: normal;
-}
-#jot #jot-title:-moz-placeholder {
-  font-weight: normal;
-}
-#jot #jot-title:placeholder {
-  font-weight: normal;
+       vertical-align: middle;
+       padding: 5px 1px;
 }
 #jot #jot-title:hover,
 #jot #jot-title:focus {
-  border: 1px solid #999999;
+  border: 1px solid #999;
   border-radius: 5px;
 }
 #jot #character-counter {
-  width: 80px;
+  width: 40px;
   float: right;
   text-align: right;
   height: 20px;
   line-height: 20px;
-  padding-right: 20px;
+  padding: 5px;
+  margin: 0 0 5px;
 }
 #profile-jot-text_tbl {
        margin-bottom: 10px;
@@ -796,10 +797,6 @@ aside #viewcontacts {
     float: left;
     margin-left: 10px;
 }
-#character-counter {
-    float:right;
-    padding:8px 10px;
-}
 #profile-rotator-wrapper {
        float: right; 
 }
@@ -959,7 +956,7 @@ aside #viewcontacts {
 section {
     margin: 20px 6% 0 4%;
     font-size: 0.8em;
-    padding-right: 250px;
+    padding-right: 220px;
        min-width: 475px;
 }
 
@@ -1005,7 +1002,6 @@ section {
 .wall-item-content-wrapper {
     position: relative;
        padding: 10px;
-       overflow-x: auto;
        width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
@@ -1110,9 +1106,9 @@ section {
        clear:both;
 }
 .wall-item-location {
-    margin-top: 5px;
+    margin-top: 10px;
     width: 100px;
-    overflow:hidden;
+    overflow: hidden;
     text-overflow: ellipsis;
     -o-text-overflow: ellipsis;
 }
@@ -1133,14 +1129,14 @@ section {
     display: none;
 }
 .wallwall .wwto {
-    left:-10px;
+    left: 5px;
     margin: 0;
-    position:absolute;
-    top:65px;
+    position: absolute;
+    top: 75px;
     width: 30px;
-    z-index:10001;
-    width:30px;
-    height:30px;
+    z-index: 10001;
+    width: 30px;
+    height: 30px;
 }
 .wallwall .wwto img {
     width: 30px !important;
@@ -1151,8 +1147,8 @@ section {
 }
 .wall-item-arrowphoto-wrapper {
     position: absolute;
-    left: 20px;
-    top: 70px;
+    left: 35px;
+    top: 80px;
     z-index: 10002;
 }
 .wall-item-photo-menu {
@@ -1556,10 +1552,11 @@ div[id$="wrapper"] br {
 .view-contact-wrapper,
 .contact-entry-wrapper {
     float: left;
-    margin-right: 20px;
-    margin-bottom: 20px;
+    margin-right: 5px;
+    margin-bottom: 40px;
     width: 120px;
-    /*height: 120px;*/
+       height: 120px;
+       padding: 3px;
     position: relative;
 }
 .contact-direction-wrapper {
@@ -1703,13 +1700,15 @@ 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: #eee;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    padding: 5px;
+}
+#settings-default-perms {
+    margin-bottom: 20px;
 }
-
 #register-form div,
 #profile-edit-form div {
     clear: both;
@@ -1732,11 +1731,11 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-    margin-top: 10px;
+    margin-top: 0px;
 }
 .profile-edit-side-link {
     float: right;
-    margin: 10px 20px -16px 0;
+    margin: 0px 20px -18px 0;
 }
 .profile-listing {
     float: left;
@@ -1920,7 +1919,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;
 }
@@ -2102,19 +2107,20 @@ div[id$="wrapper"] br {
 }
 .field label {
     float: left;
-    width: 200px;
+    width: 275px;
        display: block;
        font-size: 1.077em;
-       margin-bottom: 0.2em;
-       margin: 0 10px 0.2em 0;
+       /*font-weight: bold;*/
+       margin: 0 10px 0.5em 0;
        border: 1px #999 solid;
        padding: 5px;
+       background: #eee;
        vertical-align: middle;
 }
 .field input {
        width: 250px;
        height: 25px;
-       border: 1px #666 solid;
+       border: 1px #999 solid;
 }
 .field textarea {
     width: 80%;
@@ -2124,7 +2130,7 @@ div[id$="wrapper"] br {
 }
 .field_help {
     display: block;
-    margin-left: 0px;
+    margin-left: 297px;
     color: #666;
 }
 .field .onoff {
@@ -2134,32 +2140,26 @@ 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 #999;
+    color: #111;
+    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;
 }
 
 .field.radio .field_help {
-    margin-left:0;
+    margin-left: 0;
 }