Merge pull request #233 from simonlnu/master

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

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 66f3cc47e0df99226379db3bf2af93e41485490b..47e1d11322efdb47e15e909ee7fdcc2acd785dad 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1,7 +1,8 @@
 /*
  * dispy
  *
- * modernised, sort of, by simon <http://simon.kisikew.org/>
+ * maintainer: simon <http://simon.kisikew.org/>
+ * author: unknown
  *
  */
 
@@ -63,8 +64,8 @@ option {
        color: #222;
        background: #efefef;
 }
-li {
-       padding: 0 0 0 2px;
+ul, ol {
+       padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
@@ -146,7 +147,7 @@ a:hover {
 }
 .required {
     display: inline;
-    color: #ff0;
+    color: #f00;
     font-size: 16px;
     font-weight: bold;
     margin: 3px;
@@ -210,12 +211,17 @@ input[type=submit] {
        margin: 5px 0;
        list-style: none;
 }
+#articlemain {
+       width: 100%;
+       height: 100%;
+       margin: 0 auto;
+}
 
 
 /**
  *     login
  */
-aside .field {
+#asidemain .field {
        overflow: hidden;
        width: 200px;
 }
@@ -247,7 +253,7 @@ aside .field {
 #login-submit-button {
     margin-left: 0px !important;
 }
-aside #login_openid {
+#asidemain #login_openid {
        position: relative !important;
        float: none !important;
        margin-left: 0px !important;
@@ -268,13 +274,10 @@ aside #login_openid {
  */
 nav {
        height: 60px;
-       display: block;
        background-color: #2e3436;
        color: #eeeeec;
        position: relative;
        padding: 20px 20px 10px 95px;
-    margin-left: auto;
-    margin-right: auto;
 }
 nav a {
        text-decoration: none;
@@ -309,6 +312,7 @@ ul#user-menu-popup {
        -webkit-border-radius: 0 0 5px 5px;
        -moz-border-radius: 0 0 5px 5px;
        border-radius: 0 0 5px 5px;
+       box-shadow: 5px 10px 10px 0 #111;
        z-index: 10000;
 }
 ul#user-menu-popup li {
@@ -444,10 +448,10 @@ div.jGrowl div.info {
     padding-left: 58px;
 }
 #nav-notifications-menu {
-    margin: 30px 0 0 -45px;
-    width: 300px;
-    max-height: 400px;
-    overflow: auto;
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
     font-size: 9pt;
 }
 #nav-notifications-menu .contactname {
@@ -541,7 +545,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
        width: 10em;
        color: #eec;
 }
+#scrollup {
+       position: fixed;
+       right: 5px;
+       bottom: 40px;
+       z-index: 100;
+}
+#scrollup a:hover {
+       text-decoration: none;
+       border: 0;
+}
 #user-menu {
+       box-shadow: 5px 0 10px 0 #111;
     display: block;    
     width: 75%;
     margin: 3px 0 0 0;
@@ -707,12 +722,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 /**
 * aside
 **/
-aside {
-    position: absolute;
-    right: 15px;
-    width: 245px;
-       padding-top: 15px;
+#asidemain {
+       float: left;
     font-size: smaller;
+    margin: 20px 0 20px 35px;
+    width: 25%;
+       display: inline;
+}
+/* for now, disappear these */
+#asideright, #asideleft {
+       display: none;
 }
 .vcard .fn {
        font-size: 1.7em;
@@ -742,15 +761,15 @@ aside {
 .vcard #profile-photo-wrapper img {
        box-shadow: 3px 3px 10px 0 #000;
 }
-aside h4 {
+#asidemain h4 {
        font-size: 1.2em;
 }
-aside #viewcontacts {
+#asidemain #viewcontacts {
        text-align: right;
 }
 .aprofile dt {
-    color: #666666;
        background: transparent;
+       color: #666666;
        font-weight: bold;
     box-shadow: 1px 1px 5px 0 #000;
     margin: 15px 0 5px;
@@ -762,12 +781,20 @@ aside #viewcontacts {
     list-style: none;
 }
 #dfrn-request-link {
-       background:#3465A4 url(connect.png) no-repeat 95% center;
-       border-radius:5px 5px 5px 5px;
-       color:#fff;
-       display:block;
-       font-size:1.2em;
-       padding:.2em .5em;
+       background: #3465A4 url(connect.png) no-repeat 95% center;
+       border-radius: 5px 5px 5px 5px;
+       color: #fff;
+       display: block;
+       font-size: 1.2em;
+       padding: 0.2em 0.5em;
+}
+#wallmessage-link {
+       /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+       /*border-radius: 5px 5px 5px 5px;*/
+       color: #eee;
+       display: block;
+       font-size: 1.2em;
+       padding: 0.2em 0.5em;
 }
 #netsearch-box {
        margin: 20px 0px 30px;
@@ -848,6 +875,16 @@ aside #viewcontacts {
     border-radius: 5px;
        vertical-align: middle;
 }
+#jot-category {
+       margin: 5px 0;
+       border-radius: 5px;
+       border: 1px #ccc solid;
+       color: #666;
+       font-size: small;
+}
+#jot-category:focus {
+       color: #111;
+}
 #jot #character-counter {
        width: 6%;
        float: right;
@@ -856,12 +893,24 @@ aside #viewcontacts {
        line-height: 20px;
        padding: 2px 20px 5px 0;
 }
+#profile-jot-text_parent {
+       /*border-radius: 10px;*/
+       box-shadow: 5px 0 10px 0 #111;
+}
 #profile-jot-text_tbl {
        margin-bottom: 10px;
+       /*border-radius: 10px;*/
+       background: #888;
 }
 #profile-jot-text_ifr {
        width:99.900002% !important;
 }
+#profile-jot-text_toolbargroup {
+       background: #888;
+}
+.mceCenter table tr {
+       background: #888;
+}
 [id$="jot-text_ifr"] {
        width: 99.900002% !important;
        color: #2e2f2e;
@@ -871,6 +920,15 @@ aside #viewcontacts {
        color: #2e2f2e;
        background: #eec;
 }
+.mceFirst tr {
+       background: #888;
+}
+.mceFirst td {
+       /*border-radius: 10px 10px 0px 0px;*/
+}
+.mceLast td {
+       /*border-radius: 0 0 10px 10px;*/
+}
 #profile-attach-wrapper,
 #profile-audio-wrapper,
 #profile-link-wrapper,
@@ -1046,12 +1104,13 @@ aside #viewcontacts {
 /**
  * section
  */
-section {
-    margin: 20px 9% 0 4%;
+#sectionmain {
+    margin: 20px;
     font-size: 0.8em;
-    padding-right: 230px;
        min-width: 475px;
-       width: 65%;
+       width: 67%;
+       float: left;
+       display: inline;
 }
 
 /** tabs **/
@@ -1062,6 +1121,8 @@ section {
 }
 .tabs li {
     display: inline;
+       font-size: smaller;
+       font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
@@ -1094,6 +1155,7 @@ section {
 .wall-item-outside-wrapper {
        border: 1px solid #aaa;
        border-radius: 5px;
+       box-shadow: 5px 0 10px 0 #999;
 }
 .wall-item-outside-wrapper.comment {
        margin-top: 5px;
@@ -1111,6 +1173,7 @@ section {
 }
 .shiny {
     background: #efefdf;
+       border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
        border-radius: 5px;
@@ -1120,6 +1183,7 @@ section {
 }
 .wall-item-content {
        overflow-x: auto;
+       margin: 0px 15px 0px 5px;
 }
 /* removing it from here, vs. putting it in .wall-item-content
  * might break things for people. we shall see ;) */
@@ -1203,6 +1267,7 @@ section {
 .wall-item-body {
        margin: 20px 20px 10px 0px;
     text-align: left;
+       overflow-x: auto;
 }
 .wall-item-lock-wrapper {
        float: right;
@@ -1310,19 +1375,19 @@ section {
     width: 100%;
 }
 #connect-services-header {
-
+       margin: 5px 0 0 0;
 }
 #connect-services {
        margin: 5px 0 0 0;
 }
 #extra-help-header {
-
+       margin: 5px 0 0 0;
 }
 #extra-help {
        margin: 5px 0 0 0;
 }
 #postit-header {
-
+       margin: 5px 0 0 0;
 }
 #postit {
        margin: 5px 0 0 0;
@@ -1915,8 +1980,8 @@ div[id$="wrapper"] br {
     margin: 0 0 -18px;
        position: absolute;
     text-decoration: none;
-       top: 18px;
-       right: 226px;
+       top: 113px;
+       right: 260px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -2072,6 +2137,9 @@ div[id$="wrapper"] br {
     float:left;
     font-size:20px;
 }
+.event {
+       background: #2e2f2e;
+}
 .vevent {
     border:1px solid #ccc;
 }
@@ -2083,15 +2151,14 @@ div[id$="wrapper"] br {
        margin-left: 10px;
        margin-right: 10px;
 }
-
 #new-event-link {
        margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-       float: left;
-       margin-top: 4px;
-       margin-right: 4px;
-       margin-bottom: 15px;
+       /*float: left;      */
+       /*margin-top: 4px;  */
+       /*margin-right: 4px;*/
+       /*margin-bottom: 15px;*/
 }
 .event-description:before {
        content: url('../../../images/calendar.png');
@@ -2100,6 +2167,7 @@ div[id$="wrapper"] br {
 .event-start, .event-end {
        margin-left: 10px;
        width: 330px;
+       font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
        float: right;
@@ -2160,12 +2228,12 @@ div[id$="wrapper"] br {
        opacity: 1.0 !important;
        filter:alpha(opacity=100) !important;
 }
-.filesavetags {
+.filesavetags, .categorytags {
        margin: 20px 0;
        opacity: 0.5;
        filter:alpha(opacity=50);
 }
-.filesavetags:hover {
+.filesavetags:hover, .categorytags:hover {
        margin: 20px 0;
        opacity: 1.0 !important;
        filter:alpha(opacity=100) !important;
@@ -2174,7 +2242,7 @@ div[id$="wrapper"] br {
        opacity: 0.1;
        filter:alpha(opacity=10);
        float: right;
-       margin-right: 10px;
+       margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
        opacity: 1;
@@ -2200,6 +2268,10 @@ div[id$="wrapper"] br {
 #item-delete-selected-desc:hover {
        text-decoration: underline;
 }
+.fc-state-highlight {
+    background: #eec;
+    color: #2e2f2e;
+}
 
 
 /**
@@ -2574,6 +2646,7 @@ div[id$="wrapper"] br {
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
+       margin: 0 2px;
 }
 .icon.s22.delete {
        display: block;
@@ -2745,7 +2818,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-    margin: 50px 20%;
+       /*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
@@ -2774,6 +2847,7 @@ footer {
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
        margin: 6px;
+       color: #111;
 }
 #acl-showall {
     float: left;