Merge branch 'master', remote-tracking branch 'remotes/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 9743800bfcd45a82cf060d95325e8748619cc014..05d544b0a60e60b8a83771ab47b4ccb8b4a0ef94 100644 (file)
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -8,11 +8,22 @@
 /* from html5boilerplate */
 
 /* these are to tell browsers they should be displayed a certain way */
-article, aside, details, figcaption, figure, footer,
-header, hgroup, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
     display: block;
 }
-audio, canvas, video, time {
+audio,
+canvas,
+video,
+time {
     display: inline-block;
     *display: inline;
     *zoom: 1;
@@ -45,7 +56,11 @@ body {
     font-size: 16px;
     line-height: 1.1em;
 }
-body, button, input, select, textarea {
+body,
+button,
+input,
+select,
+textarea {
     font-family: sans-serif;
     color: #eec;
     background-color: #2e2f2e;
@@ -73,6 +88,10 @@ ul, ol {
 :focus {
     outline: 0;
 }
+[disabled="disabled"] {
+    background: #4e4f4f;
+    color: #ddb;
+}
 
 /* remember to highlight inserts somehow! */
 ins {
@@ -321,8 +340,7 @@ ul#user-menu-popup li a.nav-sep {
     border-top: 1px solid #eeeeec;
 }
 nav .nav-link {
-    float: right;
-    display: block;
+    display: inline-block;
     width: 22px;
     height: 22px;
     overflow: hidden;
@@ -427,6 +445,8 @@ nav .nav-link {
 .icon, .hover, .focus, .pointer {
     cursor: pointer;
 }
+
+
 /* popup notifications */
 div.jGrowl div.notice {
     background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -458,7 +478,6 @@ div.jGrowl div.info {
     display: block;
 }
 #nav-notifications-menu li {
-    padding: 7px 0px 7px 10px;
     word-wrap: normal;
     border-bottom: 1px solid #000;
 }
@@ -481,7 +500,7 @@ nav #nav-notifications-linkmenu.selected .icon.s22.notify {
     width: 170px;
     position: absolute;
     top: -19px;
-    left: 7px;
+    left: 4px;
 }
 #nav-floater {
     position: fixed;
@@ -499,11 +518,13 @@ nav #nav-notifications-linkmenu.selected .icon.s22.notify {
     clear: both;
     list-style: none;
     padding: 0px;
-    margin: 0 7px 0 0;
+    margin: 0px;
     height: 25px;
 }
-#nav-buttons li {
+#nav-buttons > li {
     padding: 0;
+       display: inline-block;
+       margin: 0px -4px 0px 0px;
 }
 .floaterflip {
     display: block;
@@ -889,22 +910,20 @@ width: 100%;
     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;
+    background: #777;
 }
 #profile-jot-text_ifr {
     width:99.900002% !important;
 }
 #profile-jot-text_toolbargroup {
-    background: #888;
+    background: #777;
 }
 .mceCenter table tr {
-    background: #888;
+    background: #777;
 }
 [id$="jot-text_ifr"] {
     width: 99.900002% !important;
@@ -915,14 +934,20 @@ width: 100%;
     color: #2e2f2e;
     background: #eec;
 }
-.mceFirst tr {
-    background: #888;
+.defaultSkin tr.mceFirst {
+    background: #777;
+}
+.defaultSkin td.mceFirst {
+       background-color: #eec;
 }
-.mceFirst td {
-    /*border-radius: 10px 10px 0px 0px;*/
+.defaultSkin td.mceLast {
+       background-color: #eec;
 }
-.mceLast td {
-    /*border-radius: 0 0 10px 10px;*/
+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {
+       background-color: #eec;
+}
+.defaultSkin .mceButtonDisabled .mceIcon {
+       background-color: #eec;
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -1113,6 +1138,7 @@ width: 100%;
     display: inline;
 }
 
+
 /**
  * tabs
  */
@@ -1440,13 +1466,23 @@ width: 100%;
 .comment-edit-wrapper {
     border-top: 1px #aaa solid;
 }
+[class^="comment-edit-bb"] {
+       list-style: none;
+       display: none;
+       margin: -40px 0 5px 60px;
+       width: 75%;
+}
+[class^="comment-edit-bb"] > li {
+       display: inline-block;
+       margin: 0 10px 0 0;
+       visibility: none;
+}
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
     width: 20px;
     height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-    float: left;
     margin-left: 10px;
 }
 .my-comment-photo {
@@ -1526,6 +1562,10 @@ div[id$="wrapper"] {
 div[id$="wrapper"] br {
     clear: left;
 }
+[id$="-end"], [class$="end"] {
+       clear: both;
+       margin: 0 0 10px 0;
+}
 #advanced-profile-with {
     margin-left: 200px;
 }
@@ -1587,9 +1627,6 @@ div[id$="wrapper"] br {
     position: relative;
     float:left;
 }
-#photo-photo-end {
-    clear: both;
-}
 #photo-prev-link,
 #photo-next-link {
     position:absolute;
@@ -2257,8 +2294,7 @@ div[id$="wrapper"] br {
 .item-select {
     opacity: 0.1;
     filter:alpha(opacity=10);
-    float: right;
-    margin-right: 5px;
+    margin: 5px 0 0 6px !important;
 }
 .item-select:hover, .checkeditem {
     opacity: 1;
@@ -2514,6 +2550,8 @@ input[type="search"] {
 input[type="checkbox"], input[type="radio"] {
     border: 1px #999 solid;
     margin: 0 0 0 0;
+       height: 15px;
+       width: 15px;
 }
 input[type="submit"], input[type="button"] {
     background-color: #eee;
@@ -2688,6 +2726,71 @@ input[type="submit"]:active, input[type="button"]:active {
     border: 0;
     text-decoration: none;
 }
+.editicon {
+    display: inline-block;
+    width: 21px;
+    height: 21px;
+    background: url(editicons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
+}
+.shadow {
+       box-shadow: 2px 2px 5px 2px #111;
+}
+.shadow:active, .shadow:focus, .shadow:hover {
+       box-shadow: 0 0 0 0;
+}
+.editicon:hover {
+       border: 0;
+}
+.boldbb {
+       background-position: 0px 0px;
+}
+.boldbb:hover {
+       background-position: -22px 0px;
+}
+.italicbb {
+       background-position: 0px -22px;
+}
+.italicbb:hover {
+       background-position: -22px -22px;
+}
+.underlinebb {
+       background-position: 0px -44px;
+}
+.underlinebb:hover {
+       background-position: -22px -44px;
+}
+.quotebb {
+       background-position: 0px -66px;
+}
+.quotebb:hover {
+       background-position: -22px -66px;
+}
+.codebb {
+       background-position: 0px -88px;
+}
+.codebb:hover {
+       background-position: -22px -88px;
+}
+.imagebb {
+       background-position: -44px 0px;
+}
+.imagebb:hover {
+       background-position: -66px 0px;
+}
+.urlbb {
+       background-position: -44px -22px;
+}
+.urlbb:hover {
+       background-position: -66px -22px;
+}
+.videobb {
+       background-position: -44px -44px;
+}
+.videobb:hover {
+       background-position: -66px -44px;
+}
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;