]> git.mxchange.org Git - friendica.git/blobdiff - view/theme/dispy/dark/style.less
slight re-design of wall stuff and css/font cleaning
[friendica.git] / view / theme / dispy / dark / style.less
index 6d76044bacc6cee53e4f8079400f84036238462a..7634db1d729c77ae243b74353d011897ad9cb3ef 100644 (file)
@@ -1,19 +1,19 @@
 /*
- * dispy-dark
- *
+ * dispy dark
+ * Description: Dispy Dark: dark, sleek, functional
  * author, maintainer: simon <http://simon.kisikew.org/>
  * 
  * Author's notes:
  * A few things of note here. The less file is our working copy,
  * and the CSS is *generated* from it. The CSS is the one that's
  * included in the HTML, and not the less one. This is to save
- * bandwidth and processing time.
+ * bandwidth and processing time, by not including less.js.
  */
-/* from html5boilerplate */
-/* these are to tell browsers they should be displayed a certain way */
 
 @import "_base";
 
+///* from html5boilerplate */
+///* these are to tell browsers they should be displayed a certain way */
 article,
 aside,
 details,
@@ -34,20 +34,20 @@ time {
        *display: inline;
        *zoom: 1;
 }
-audio:not([controls]), [hidden] {
+audio:not([controls]),
+[hidden] {
        display: none;
 }
-/*
- * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
- * 2. Force vertical scrollbar in non-IE
- * 3. Prevent iOS text size adjust on device orientation change,
- *             without disabling user zoom: h5bp.com/g
- */
+///*
+// * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+// * 2. Force vertical scrollbar in non-IE
+// * 3. Prevent iOS text size adjust on device orientation change,
+// *           without disabling user zoom: h5bp.com/g
+// */
 html {
        font-size: 100%;
        overflow-y: scroll;
-       -webkit-text-size-adjust: 100%;
-       -ms-text-size-adjust: 100%;
+       .font_size_adjust;
 }
 body {
        margin: 0;
@@ -56,16 +56,21 @@ body {
        color: @main_colour;
        background-color: @bg_colour;
 }
-button, input, select, textarea {
+button,
+input,
+select,
+textarea {
        color: @main_colour;
        background-color: @bg_colour;
 }
 select {
-       border: 1px #555 dotted;
+       .borders(1px, dotted, darken(@main_alt_colour, 60%));
        padding: 1px;
        margin: 3px;
        color: @main_colour;
        background: @bg_colour;
+    max-width: 85%;
+    min-width: 85px;
 }
 option {
        padding: 1px;
@@ -76,22 +81,27 @@ option {
                background: @main_colour;
        }
 }
-ul, ol {
-       .list_reset;
-}
 tr:nth-child(even) {
        background-color: lighten(@bg_colour, 10%);
 }
-/* remember to define focus styles! */
+///* remember to define focus styles! */
+//outline      Sets all the outline properties in one declaration
+//outline-color        Sets the color of an outline    color_name,hex_number,rgb_number,invert,inherit
+//outline-style                Sets the style of an outline    dotted,dashed,solid,double,groove,ridge,inset,outset,inherit
+//outline-width                Sets the width of an outline    thin,medium,thick,length,inherit
 :focus {
-       outline: 0;
+       outline: none;
+}
+a:focus {
+       outline: invert, dashed, thin;
 }
 [disabled="disabled"] {
        background: @med_bg_colour;
        color: @disabled_colour;
 }
-/* remember to highlight inserts somehow! */
-ins, mark {
+///* remember to highlight inserts somehow! */
+ins,
+mark {
        background-color: @bg_alt_colour;
        color: @lt_main_colour;
 }
@@ -102,14 +112,19 @@ mark {
        font-style: italic;
        font-weight: bold;
 }
-/* Redeclare monospace font family: h5bp.com/j */
-pre, code, kbd, samp, .wall-item-body code {
+///* Redeclare monospace font family: h5bp.com/j */
+pre,
+code,
+kbd,
+samp,
+.wall-item-body code {
        font-family: monospace, monospace;
        _font-family: monospace;
        font-size: 1em;
 }
-/* Improve readability of pre-formatted text in all browsers */
-pre, .wall-item-body code {
+///* Improve readability of pre-formatted text in all browsers */
+pre,
+.wall-item-body code {
        .wrap;
 }
 q {
@@ -119,11 +134,22 @@ q {
                content: none;
        }
 }
+em {
+       font-style: italic;
+}
+strong {
+       font-weight: bold;
+}
+strike {
+       text-decoration: line-through;
+}
 small {
        font-size: 85%;
 }
-/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
-sub, sup {
+///* Position subscript and superscript content without affecting
+// * line-height: h5bp.com/k */
+sub,
+sup {
        font-size: 75%;
        line-height: 0;
        position: relative;
@@ -151,16 +177,78 @@ a {
        }
 }
 blockquote {
-       background: #444;
+       background: darken(@main_alt_colour, 66.5%);
        color: @main_colour;
        text-indent: 5px;
        padding: 5px;
-       border: 1px #aaa solid;
+       .borders(1px, solid, darken(@main_alt_colour, 33%));
        .rounded_corners;
 }
+label {
+       width: 38%;
+       display: inline-block;
+       font-size: small;
+       margin: 0 10px 1em 0;
+       .borders(1px, solid, @bg_colour);
+       padding: 5px;
+       background: @main_colour;
+       color: darken(@main_alt_colour, 86.5%);
+       .box_shadow(3px, 3px, 5px);
+}
+input {
+       .box(250px, 25px);
+       .borders(1px, solid, darken(@main_alt_colour, 33.5%));
+       &[type="checkbox"],
+       &[type="radio"] {
+               margin: 0;
+               .box(15px, 15px);
+       }
+       &[type="submit"],
+       &[type="button"] {
+               background-color: @main_alt_colour;
+               .borders(2px, outset, darken(@main_alt_colour, 24%));
+               .rounded_corners;
+               .box_shadow(1px, 3px, 4px, 0);
+               color: @bg_alt_colour;
+               cursor: pointer;
+               font-weight: bold;
+               width: auto;
+               .text_shadow;
+       }
+       &[type="submit"]:active,
+       &[type="button"]:active {
+               .box_shadow(0, 0, 0, 0);
+       }
+}
+h1, h2, h3,
+h4, h5, h6 {
+       margin: 10px 0px;
+       font-weight: bold;
+       border-bottom: 1px solid @hover_colour;
+}
+h1 {
+       font-size: x-large;
+}
+h2 {
+       font-size: large;
+}
+h3 {
+       font-size: medium;
+}
+h4 {
+       font-size: small;
+}
+h5 {
+       font-size: x-small;
+}
+h6 {
+       font-size: xx-small;
+}
+
+//
 .required {
        display: inline;
-       color: #ff0;
+       color: red;
        font-size: 16px;
        font-weight: bold;
        margin: 3px;
@@ -175,28 +263,6 @@ blockquote {
 .smalltext {
        font-size: 0.7em;
 }
-#panel {
-       position: absolute;
-       .rounded_corners;
-       .borders(1px, solid, @main_alt_colour);
-       background-color: @bg_alt_colour;
-       color: @main_colour;
-       padding: 1em;
-}
-.pager {
-       margin-top: 60px;
-       display: block;
-       clear: both;
-       text-align: center;
-       span {
-               padding: 4px;
-               margin: 4px;
-       }
-}
-.pager_current {
-       background-color: @link_colour;
-       color: @main_alt_colour;
-}
 
 
 /**
@@ -214,14 +280,69 @@ blockquote {
        .box(100%, 100%);
        margin: 0 auto;
 }
-[class$="-desc"], [id$="-desc"] {
+.button,
+#profile-listing-desc {
+       .box(25%, auto);
+       background: @menu_bg_colour;
+       color: @main_colour;
+       .borders(2px, outset, darken(@menu_bg_colour, 20%));
+       .rounded_corners;
+       padding: 5px;
+       font-size: smaller;
+       cursor: pointer;
+       &.active {
+               .box_shadow(4px, 4px, 7px);
+       }
+       a {
+               color: @main_colour;
+               font-size: smaller;
+               font-weight: bold;
+       }
+}
+[class$="-desc"],
+[id$="-desc"] {
        color: @bg_colour;
+       // background: @main_colour;
+       .borders(1px, outset, @main_colour);
+       .rounded_corners;
+       // .box_shadow(3px, 3px, 5px);
+    margin: 3px 10px 7px 0;
+    padding: 5px;
+       font-weight: bold;
+       font-size: smaller;
+}
+#item-delete-selected-desc {
+       float: left;
+       margin-right: 5px;
+       &:hover {
+               text-decoration: underline;
+       }
+}
+.intro-approve-as-friend-desc {
+       margin-top: 10px;
+}
+.intro-desc {
+       margin-bottom: 20px;
+       font-weight: bold;
+}
+#group-edit-desc {
+       margin: 10px 0px;
+}
+#settings-nickname-desc {
        background: @main_colour;
        .rounded_corners;
-       .box_shadow(3px, 3px, 5px);
-       padding: 3px;
-       margin: 5px 0;
+       .borders;
+       padding: 5px;
+       color: @bg_colour;
+}
+.contactname,
+.contact-name {
        font-weight: bold;
+       font-size: smaller;
+}
+.contact-details {
+       font-style: italic;
+       font-size: smaller;
 }
 
 
@@ -276,7 +397,8 @@ blockquote {
                overflow: hidden !important; }
        label {
                width: 180px !important;
-       } }
+       }
+}
 
 
 /**
@@ -315,6 +437,8 @@ ul#user-menu-popup {
        margin: 0px;
        top: 20px;
        left: 0;
+       font-size: small;
+       line-height: 1;
        .rounded_corners(0 0 5px 5px);
        .box_shadow(5px, 5px, 10px, 0px);
        z-index: 10000;
@@ -323,9 +447,11 @@ ul#user-menu-popup {
                a {
                        display: block;
                        padding: 5px;
+                       color: @main_alt_colour;
+                       background-color: @menu_bg_colour;
                        &:hover {
-                               color: @main_colour;
-                               background-color: @bg_alt_colour;
+                               color: @bg_colour;
+                               background-color: @main_alt_colour;
                        }
                        &.nav-sep {
                                border-top: 1px solid @bg_alt_colour; } } }
@@ -341,44 +467,54 @@ nav .nav-link {
 #nav-apps-link {
        background-position: 0 -66px;
        &:hover {
-               background-position: -22px -66px; }
+               background-position: -22px -66px;
+       }
 }
-#nav-community-link, #nav-contacts-link {
+#nav-community-link,
+#nav-contacts-link {
        background-position: 0 -22px;
        &:hover {
-               background-position: -22px -22px; }
+               background-position: -22px -22px;
+       }
 }
 #nav-directory-link {
        background-position: -44px -154px;
        &:hover {
-               background-position: -66px -154px; }
+               background-position: -66px -154px;
+       }
 }
 #nav-help-link {
        background-position: 0 -110px;
        &:hover {
-               background-position: -22px -110px; }
+               background-position: -22px -110px;
+       }
 }
 #nav-home-link {
        background-position: -44px -132px;
        &:hover {
-               background-position: -66px -132px; }
+               background-position: -66px -132px;
+       }
 }
 #nav-intro-link {
        background-position: 0px -190px;
        &:hover {
-               background-position: -44px -190px; }
+               background-position: -44px -190px;
+       }
 }
 #nav-login-link, #nav-logout-link {
        background-position: 0 -88px;
        &:hover {
-               background-position: -22px -88px; }
+               background-position: -22px -88px;
+       }
 }
 #nav-messages-link {
        background-position: -44px -88px;
        &:hover {
-               background-position: -66px -88px; }
+               background-position: -66px -88px;
+       }
 }
-#nav-notify-link, #nav-notifications-linkmenu {
+#nav-notify-link,
+#nav-notifications-linkmenu {
        background-position: -44px -110px;
 }
 #nav-notify-link:hover {
@@ -387,7 +523,8 @@ nav .nav-link {
 #nav-network-link {
        background-position: 0px -177px;
        &:hover {
-               background-position: -22px -177px; }
+               background-position: -22px -177px;
+       }
 }
 #nav-search-link {
        background-position: 0 -44px;
@@ -417,9 +554,7 @@ nav .nav-link {
 .pointer {
        cursor: pointer;
 }
-
-/* popup notifications */
-
+//* popup notifications */
 div.jGrowl div {
        &.notice {
                background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -434,16 +569,12 @@ div.jGrowl div {
                margin-top: 50px;
        }
 }
-
 #nav-notifications-menu {
        margin: 30px 0 0 -20px;
        width: 275px;
        max-height: 300px;
        overflow-y: auto;
        font-size: 9pt;
-       .contactname {
-           font-weight: bold;
-               font-size: 0.9em; }
        img {
                float: left;
                margin-right: 5px; }
@@ -458,9 +589,9 @@ div.jGrowl div {
        }
        a:hover {
                color: black;
-               text-decoration: underline; }
+               text-decoration: underline;
+       }
 }
-
 nav #nav-notifications-linkmenu {
        &.on .icon.s22.notify,
        &.selected .icon.s22.notify {
@@ -473,9 +604,10 @@ nav #nav-notifications-linkmenu {
 }
 #notifications {
        .box(170px, 20px);
-       position: absolute;
+       font-size: small;
        top: -19px;
        left: 4px;
+       position: absolute;
 }
 #nav-floater {
        position: fixed;
@@ -488,7 +620,6 @@ nav #nav-notifications-linkmenu {
        z-index: 100;
        .box(300px, 60px);
 }
-
 #nav-buttons {
        clear: both;
        list-style: none;
@@ -522,13 +653,19 @@ nav #nav-notifications-linkmenu {
        background: @dk_bg_colour;
        .rounded_corners;
 }
-#search-text {
-       .borders;
+#search-text,
+#mini-search-text {
        background: @bg_colour;
        color: @main_colour;
-       font-size: 8pt;
        margin: 8px;
-       .box(10em, 14px);
+}
+#search-text {
+       .borders;
+}
+#mini-search-text {
+       font-size: 8pt;
+       height: 14px;
+       width: 10em;
 }
 #scrollup {
        position: fixed;
@@ -557,17 +694,19 @@ nav #nav-notifications-linkmenu {
        padding: 2px;
        > a {
                vertical-align: top;
+               outline: 0 none;
        }
 }
 #user-menu-label {
-       font-size: 12px;
+       font-size: small;
        padding: 3px 20px 9px 5px;
        height: 10px;
 }
-.nav-ajax-update, .nav-ajax-left {
+.nav-ajax-update,
+.nav-ajax-left {
        .box(30px, 19px);
        background: transparent url(dark/notifications.png) 0 0 no-repeat;
-       color: #222;
+       color: @shadow_colour;
        font-weight: bold;
        font-size: 0.8em;
        padding-top: 0.2em;
@@ -577,7 +716,8 @@ nav #nav-notifications-linkmenu {
        display: block;
        visibility: hidden;
 }
-.nav-ajax-update.show, .nav-ajax-left.show {
+.nav-ajax-update.show,
+.nav-ajax-left.show {
        visibility: visible;
 }
 #net-update {
@@ -616,7 +756,8 @@ nav #nav-notifications-linkmenu {
        color: @bg_colour;
        margin: 0px;
        padding: 0px;
-       .borders(3px, solid, @shiny_colour);
+       .borders(3px, solid, @link_colour);
+       .rounded_corners;
        z-index: 100000;
        .box_shadow;
        a {
@@ -625,7 +766,8 @@ nav #nav-notifications-linkmenu {
                padding: 5px 10px;
                text-decoration: none;
                &:hover {
-                       background-color: lighten(@shiny_colour, 55%);
+                       color: @main_colour;
+                       background-color: @link_colour;
                }
        }
        .menu-sep {
@@ -659,7 +801,11 @@ nav #nav-notifications-linkmenu {
        padding: 7px 7px 0px 0px;
 }
 .notify-seen {
-       background: darken(@main_alt_colour, 20%);
+       background: @disabled_colour;
+       color: @main_colour;
+}
+.notify-unseen {
+       color: @main_colour;
 }
 
 
@@ -688,7 +834,8 @@ nav #nav-notifications-linkmenu {
        padding-bottom: 50px;
        z-index: 1000;
 }
-#sysmsg_info br, #sysmsg br {
+#sysmsg_info br,
+#sysmsg br {
        display: block;
        margin: 2px 0px;
        border-top: 1px solid @main_colour;
@@ -700,21 +847,20 @@ nav #nav-notifications-linkmenu {
  */
 #asidemain {
        float: left;
-       font-size: smaller;
+       font-size: small;
        margin: 20px 0 20px 35px;
        width: 25%;
        display: inline;
 }
-
 /* for now, disappear these */
 #asideright, #asideleft {
        display: none;
 }
 .vcard {
        .fn {
-               font-size: 1.7em;
+               font-size: 1.5em;
                font-weight: bold;
-               border-bottom: 1px solid #729fcf;
+               border-bottom: 1px solid @hover_colour;
                padding-bottom: 3px;
        }
        #profile-photo-wrapper {
@@ -741,12 +887,12 @@ nav #nav-notifications-linkmenu {
                                padding: 3px;
                                position: relative; } } }
 }
-
 .aprofile dt {
        background: @main_colour;
        color: @bg_colour;
        font-weight: bold;
-       .box_shadow(1px 1px 5px 0);
+       .box_shadow(3px, 3px, 5px);
+       .rounded_corners;
        margin: 15px 0 5px;
        padding-left: 5px;
 }
@@ -807,9 +953,9 @@ nav #nav-notifications-linkmenu {
                span {
                        float: left;
                        margin: 10px 20px 2px 0px;
-               a {
-                       display: block;
-               }
+                       a {
+                               display: block;
+                       }
                }
                .perms {
                        float: right;
@@ -854,17 +1000,17 @@ nav #nav-notifications-linkmenu {
        padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-       .box_shadow(5px, 0, 10px, 0, @shadow_colour);
+       .box_shadow(5px, 0, 10px, 0);
 }
 #profile-jot-text_tbl {
        margin-bottom: 10px;
-       background: #777;
+       background: darken(@main_alt_colour, 46.8%);
 }
 #profile-jot-text_ifr {
        width: 99.900002% !important;
 }
 #profile-jot-text_toolbargroup, .mceCenter tr {
-       background: #777;
+       background: darken(@main_alt_colour, 46.8%);
 }
 [id$="jot-text_ifr"] {
        width: 99.900002% !important;
@@ -877,7 +1023,7 @@ nav #nav-notifications-linkmenu {
 }
 .defaultSkin {
        tr.mceFirst {
-               background: #777;
+               background: darken(@main_alt_colour, 46.8%);
        }
        td {
                &.mceFirst, &.mceLast {
@@ -944,11 +1090,12 @@ nav #nav-notifications-linkmenu {
 }
 #profile-jot-perms {
        float: right;
-       background-color: @menu_bg_colour;
-       .box(22px, 22px);
+       color: @menu_bg_colour;
+       .box(20px, 20px);
        .rounded_corners;
+       .box_shadow(3px, 3px, 5px, 0);
+       .borders(2px, outset, @menu_bg_colour);
        overflow: hidden;
-       border: 0px;
        margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
@@ -977,17 +1124,10 @@ nav #nav-notifications-linkmenu {
        }
 }
 #jot-perms-icon {
-       .box(20px, 22px);
+       .box(22px, 22px);
        .rounded_corners;
        overflow: hidden;
-}
-#profile-jot-acl-wrapper {
-       margin: 0 10px;
-       .borders(1px, solid, darken(@main_alt_colour, 60%));
-       border-top: 0;
-       display: block !important;
-       .borders(1px solid @menu_bg_colour);
-       .box_shadow;
+       background: @menu_bg_colour url("dark/icons.png") -88px -40px;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
@@ -1029,6 +1169,9 @@ nav #nav-notifications-linkmenu {
        color: darken(@main_alt_colour, 13%);
 }
 #profile-jot-desc {
+       background: @bg_colour;
+       .borders;
+       .rounded_corners;
        color: @red_orange;
        margin: 5px 0;
 }
@@ -1042,14 +1185,16 @@ nav #nav-notifications-linkmenu {
        display: none;
 }
 #jot-preview-content {
-       background-color: @bg_alt_colour;
+       background-color: @shiny_colour;
        color: @main_colour;
-       .borders(1px, solid, @main_colour);
+       .borders(1px, solid, @bg_colour);
        .rounded_corners;
+       .box_shadow(5px, 0, 10px);
        padding: 3px 3px 6px 10px;
        .wall-item-outside-wrapper {
            border: 0;
                .rounded_corners(0px 0px 0px 0px);
+               .box_shadow(0, 0, 0, 0);
        }
 }
 
@@ -1071,27 +1216,34 @@ nav #nav-notifications-linkmenu {
  * tabs
  */
 .tabs {
-       list-style: none;
+       .list_reset;
        margin: 10px 0;
-       padding: 0;
        li {
                display: inline;
                font-size: smaller;
-               font-weight: bold;
        }
 }
 .tab {
-       border: 1px solid @link_colour;
+       .borders(1px, solid, @hover_colour);
        padding: 4px;
-       &:hover, &.active:hover, &:active {
-               background: @link_colour;
-               color: @bg_colour;
+       &:hover,
+       &:active {
+               background: @shiny_colour;
+               color: @main_colour;
+               .borders(1px, solid, @hover_colour);
        }
        &.active {
                background: @main_colour;
                color: @bg_colour;
+               .borders(1px, solid, @hover_colour);
+               &:hover {
+                       background: @shiny_colour;
+                       color: @main_colour;
+                       .borders(1px, solid, @hover_colour);
+               }
                a {
                        color: @bg_colour;
+                       text-decoration: none;
                }
        }
        a {
@@ -1100,23 +1252,21 @@ nav #nav-notifications-linkmenu {
        }
 }
 
+
 /**
  * items
  */
 .wall-item-outside-wrapper {
-       .borders(1px, solid, #aaa);
+       .borders(1px, solid, darken(@main_alt_colour, 27%));
        .rounded_corners;
-       .box_shadow(5px, 0, 10px, 0);
+       .box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour
        &.comment {
                margin-top: 5px;
        }
 }
-.wall-item-outside-wrapper-end {
-       clear: both;
-}
 .wall-item-content-wrapper {
        position: relative;
-       padding: 10px;
+       padding: 0.75em;
        width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
@@ -1134,10 +1284,11 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-content {
        overflow-x: auto;
-       margin: 0px 15px 0px 5px;
+       margin: 0px 4em 1em 5px;
 }
-[id^="tread-wrapper"], [class^="tread-wrapper"] {
-       margin: 15px 0 0 0;
+[id^="tread-wrapper"],
+[class^="tread-wrapper"] {
+       margin: 1.2em 0 0 0;
        padding: 0px;
 }
 .wall-item-photo-menu {
@@ -1156,7 +1307,7 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-info {
        float: left;
-       width: 110px;
+       width: 8em;
 }
 .wall-item-photo-wrapper {
        .box(80px, 80px);
@@ -1183,23 +1334,22 @@ nav #nav-notifications-linkmenu {
 .wall-item-subtools1 {
        .box(30px, 30px);
        list-style: none outside none;
-       margin: 20px 0 30px -20px;
+       margin: 18px 0 30px -20px;
        padding: 0;
 }
 .wall-item-subtools2 {
-       height: 25px;
+       .box(25px, 25px);
        list-style: none outside none;
-       margin: -75px 0 0 5px;
+       margin: -78px 0 0 5px;
        padding: 0;
-       width: 25px;
 }
 .wall-item-title {
        font-size: 1.2em;
        font-weight: bold;
-       margin-bottom: 1em;
+       margin-bottom: 1.4em;
 }
 .wall-item-body {
-       margin: 20px 20px 10px 0px;
+       margin: 15px 10px 10px 0px;
        text-align: left;
        overflow-x: auto;
 }
@@ -1213,33 +1363,41 @@ nav #nav-notifications-linkmenu {
 .wall-item-like {
        clear: left;
        font-size: 0.8em;
-       color: #878883;
-       margin: 5px 0 5px 120px;
+       color: lighten(@menu_bg_colour, 20%);
+       margin: 5px 0 5px 10.2em;
+       .transition;
+       opacity: 0.5;
+       &:hover {
+               opacity: 1;
+       }
 }
 .wall-item-author,
-.wall-item-actions-author {
-       clear: left;
-       font-size: 0.8em;
-       color: #878883;
-       margin: 20px 20px 0 110px;
-}
+.wall-item-actions-author,
 .wall-item-ago {
-       display: inline;
-       padding-left: 10px;
+       clear: left;
+       float: left;
+       color: @main_colour;
+       line-height: 1;
+       display: inline-block;
+       font-size: 0.75em;
+       margin: 0.5em auto 0;
 }
-.wall-item-wrapper-end {
-       clear: both;
+.wall-item-author,
+.wall-item-actions-author {
+       margin: 0.5em auto 0;
+       font-size: 0.75em;
+       font-weight: bold;
 }
 .wall-item-location {
        margin-top: 15px;
        width: 100px;
        overflow: hidden;
-       text-overflow: ellipsis;
-       -o-text-overflow: ellipsis;
+       .text_overflow;
        .icon {
                float: left;
        }
-       > a, .smalltext {
+       > a,
+       .smalltext {
                margin-left: 25px;
                font-size: 0.7em;
                display: block;
@@ -1254,7 +1412,6 @@ nav #nav-notifications-linkmenu {
                margin: 0;
                position: absolute;
                top: 75px;
-               width: 30px;
                z-index: 10001;
                .box(30px, 30px);
                img {
@@ -1274,22 +1431,23 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-photo-menu {
        min-width: 92px;
-       .borders(2px, solid, white);
+       font-size: 0.75em;
+       .borders(2px, solid, @menu_bg_colour);
        border-top: 0px;
-       background: #555753;
+       background: @menu_bg_colour;
        position: absolute;
        left: -2px;
        top: 101px;
        display: none;
        z-index: 10003;
-       .rounded_corners;
+       .rounded_corners(0 5px 5px 5px);
        li a {
                white-space: nowrap;
                display: block;
-               padding: 5px 2px;
+               padding: 5px 6px;
                color: @main_alt_colour;
                &:hover {
-                       color: #555753;
+                       color: @menu_bg_colour;
                        background: @main_alt_colour;
                }
        }
@@ -1313,31 +1471,30 @@ nav #nav-notifications-linkmenu {
  */
 .ccollapse-wrapper {
        font-size: 0.9em;
-       margin-left: 80px;
+       margin-left: 5em;
+}
+.hide-comments-outer {
+       font-size: small;
 }
 .wall-item-outside-wrapper.comment {
-       margin-left: 80px;
+       margin-left: 5em;
        .wall-item-photo {
-               width: 40px!important;
-               height: 40px!important;
+               width: 40px !important;
+               height: 40px !important;
        }
        .wall-item-photo-wrapper {
-               width: 40px;
-               height: 40px;
+               .box(40px, 40px);
        }
        .wall-item-photo-menu-button {
                width: 50px;
                top: 45px;
                background-position: 35px center;
        }
-       .wall-item-info {
-               width: 60px;
-       }
        .wall-item-body {
                margin-left: 10px;
        }
        .wall-item-author {
-               margin-left: 50px;
+               margin-left: 0.2em;
        }
        .wall-item-photo-menu {
                min-width: 50px;
@@ -1345,7 +1502,7 @@ nav #nav-notifications-linkmenu {
        }
 }
 .comment-wwedit-wrapper {
-  /*margin: 30px 0px 0px 80px;*/
+       /*margin: 30px 0px 0px 80px;*/
 }
 .comment-edit-wrapper {
        border-top: 1px #aaa solid;
@@ -1373,19 +1530,18 @@ nav #nav-notifications-linkmenu {
        .box(40px, 40px);
        padding: 5px;
 }
-
 [class^="comment-edit-text"] {
        margin: 5px 0 10px 20px;
-       width: 84.5%;
+       width: 94%;
 }
 .comment-edit-text-empty {
        height: 20px;
-       border: 2px #c8bebe solid;
-       border-radius: 5px;
-       color: #c8bebe;
+       .med_borders;
+       .rounded_corners;
+       color: @med_border_colour;
        .transition;
        &:hover {
-               color: #999999;
+               color: darken(@main_alt_colour, 33.5%);
        }
 }
 .comment-edit-text-full {
@@ -1400,7 +1556,7 @@ nav #nav-notifications-linkmenu {
 }
 .comment-edit-submit {
        height: 22px;
-       background-color: #555753;
+       background-color: @menu_bg_colour;
        color: @main_alt_colour;
        .rounded_corners;
        border: 0;
@@ -1411,11 +1567,11 @@ nav #nav-notifications-linkmenu {
  * item text style
  */
 .wall-item-body code {
-    background-color: #444;
-    border-bottom: 1px dashed #ccc;
-    border-left-style: solid;
-    border-left-width: 10px;
-    border-top: 1px dashed #ccc;
+    background-color: darken(@main_alt_colour, 66.5%);
+    border-bottom: 1px dashed darken(@main_alt_colour, 13.5%);
+    border-left: 5px solid darken(@main_alt_colour, 13.5%);
+    border-top: 1px dashed darken(@main_alt_colour, 13.5%);
+       color: @main_colour;
     display: block;
     overflow-x: auto;
     padding: 5px 0 15px 10px;
@@ -1432,7 +1588,7 @@ nav #nav-notifications-linkmenu {
 div {
        &[id$="text"] {
                font-weight: bold;
-               border-bottom: 1px solid #ccc;
+               border-bottom: 1px solid darken(@main_alt_colour, 13.5%);
        }
        &[id$="wrapper"] {
                height: 100%;
@@ -1471,339 +1627,318 @@ div {
        margin: auto auto auto 23px;
 }
 #advanced-profile-with {
-  margin-left: 200px; }
+       margin-left: 200px;
+}
+
 
 /**
  * photos
  */
-
 .photos {
-  height: auto;
-  overflow: auto; }
-
+       height: auto;
+       overflow: auto;
+}
 #photo-top-links {
-  margin-bottom: 30px; }
-
-.photo-album-image-wrapper, .photo-top-image-wrapper {
+       margin-bottom: 30px;
+}
+.photo-album-image-wrapper,
+.photo-top-image-wrapper {
        float: left;
-       .box_shadow;
-       background-color: #222;
+       .box_shadow(3px, 3px, 10px, 0);
+       background-color: darken(@main_alt_colour, 80%);
        color: @bg_colour;
        .rounded_corners;
        padding-bottom: 30px;
        position: relative;
        margin: 0 10px 10px 0;
 }
-
 #photo-photo {
        max-width: 100%;
        img {
-               max-width: 100%; } }
-
+               max-width: 100%;
+       }
+}
 .photo-top-image-wrapper a:hover,
 #photo-photo a:hover,
 .photo-album-image-wrapper a:hover {
        border-bottom: 0;
 }
-
 .photo-top-photo, .photo-album-photo {
        .rounded_corners(5px 5px 0 0);
 }
-
-.photo-top-album-name, .caption {
+.photo-top-album-name,
+.caption {
        position: absolute;
        bottom: 0;
        padding: 0 5px;
 }
-
 #photo-photo {
        position: relative;
-       float: left; }
-
-#photo-prev-link, #photo-next-link {
+       // float: left;
+       margin: 5px 45%;
+}
+#photo-prev-link,
+#photo-next-link {
        position: absolute;
-       .box(30%, 100%);
+       // .box(30%, 100%);
+       .box(50px, 150px);
        background: white center center no-repeat;
        opacity: 0;
-       .transition(all, 0.2s);
-}
-
-#photo-prev-link {
-       background-image: url(dark/prev.png);
-    height: 350px;
-    left: 1%;
-    top: 215px;
-    width: 50px;
-    z-index: 10;
-}
-
-#photo-next-link {
-       background-image: url(dark/next.png);
-    height: 350px;
-    right: 45%;
-    top: 215px;
-    width: 50px;
-}
-
-#photo-prev-link a, #photo-next-link a {
-  display: block;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  text-indent: -900000px; }
-
-#photo-prev-link:hover {
-       opacity: 1;
-       .transition(all, 0.2s);
-}
-
-#photo-next-link {
+       .transition(all, 0.5s);
+       z-index: 10;
+       top: 175px;
+       .rounded_corners;
        &:hover {
-               opacity: 1;
-               .transition(all, 0.2s);
+               opacity: 0.6;
+               .transition(all, 0.5s);
        }
        .icon {
                display: none;
        }
 }
-
-#photo-prev-link .icon {
-  display: none; }
-
+#photo-prev-link {
+       // background-image: url(dark/prev.png);
+       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");
+    left: 22%;
+}
+#photo-next-link {
+       // background-image: url(dark/next.png);
+       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");
+    left: 44%;
+}
+#photo-prev-link a,
+#photo-next-link a {
+       display: block;
+       .box(100%, 100%);
+       .rounded_corners;
+       overflow: hidden;
+       text-indent: -900000px;
+}
 #photos-upload-spacer,
 #photos-upload-new-wrapper,
 #photos-upload-exist-wrapper {
-  margin-bottom: 1em; }
-
+       margin-bottom: 1em;
+}
 #photos-upload-existing-album-text,
 #photos-upload-newalbum-div {
-  background-color: #555753;
-  color: @main_alt_colour;
-  padding: 1px; }
-
+       background-color: @menu_bg_colour;
+       color: @main_alt_colour;
+       padding: 1px;
+}
 #photos-upload-album-select,
 #photos-upload-newalbum {
-  width: 99%; }
-
+       width: 99%;
+}
 #photos-upload-perms-menu {
-  text-align: right; }
-
+       text-align: right;
+}
 #photo-edit-caption,
 #photo-edit-newtag,
 #photo-edit-albumname {
-  float: left;
-  margin-bottom: 25px; }
-
+       float: left;
+       margin-bottom: 25px;
+}
 #photo-edit-link-wrap {
-  margin-bottom: 15px; }
-
+       margin-bottom: 15px;
+}
 #photo-edit-caption,
 #photo-edit-newtag {
-  width: 100%; }
-
+       width: 100%;
+}
 #photo-like-div {
-  margin-bottom: 25px; }
-
-#photo-edit-caption-end,
-#photo-edit-tags-end,
-#photo-edit-albumname-end {
-  clear: both; }
-
+       margin-bottom: 25px;
+}
 #photo-edit-delete-button {
-  margin-left: 200px; }
-
+       margin-left: 200px;
+}
 #photo-edit-end {
-  margin-bottom: 35px; }
-
+       margin-bottom: 35px;
+}
 #photo-caption {
-  font-size: 110%;
-  font-weight: bold;
-  margin-top: 15px;
-  margin-bottom: 15px; }
+       font-size: 110%;
+       font-weight: bold;
+       margin-top: 15px;
+       margin-bottom: 15px;
+}
+
 
 /**
  * message
  */
-
 .prvmail-text {
        width: 100%;
 }
-
 #prvmail-subject {
        width: 100%;
        color: @bg_colour;
        background: @main_colour;
 }
-
 #prvmail-submit-wrapper {
-  margin-top: 10px; }
-
+       margin-top: 10px;
+}
 #prvmail-submit {
-  float: right;
-  margin-top: 0; }
-
+       float: right;
+       margin-top: 0;
+}
 #prvmail-submit-wrapper div {
-  margin-right: 5px;
-  float: left; }
-
+       margin-right: 5px;
+       float: left;
+}
 .mail-list-outside-wrapper {
-  margin-top: 20px; }
-
+       margin-top: 20px;
+}
 .mail-list-sender {
-  float: left; }
-
+       float: left;
+}
 .mail-list-detail {
-  margin-left: 90px; }
-
+       margin-left: 90px;
+}
 .mail-list-sender-name {
-  display: inline;
-  font-size: 1.1em; }
-
+       display: inline;
+       font-size: 1.1em;
+}
 .mail-list-date {
-  display: inline;
-  font-size: 0.9em;
-  padding-left: 10px; }
-
-.mail-list-sender-name, .mail-list-date {
-  font-style: italic; }
-
+       display: inline;
+       font-size: 0.9em;
+       padding-left: 10px;
+}
+.mail-list-sender-name,
+.mail-list-date {
+       font-style: italic;
+}
 .mail-list-subject {
-  font-size: 1.2em; }
-
+       font-size: 1.2em;
+}
 .mail-list-delete-wrapper {
-  float: right; }
-
+       float: right;
+}
 .mail-list-outside-wrapper-end {
-  clear: both;
-  border-bottom: 1px @main_colour dotted; }
-
+       clear: both;
+       border-bottom: 1px @main_colour dotted;
+}
 .mail-conv-sender {
-  float: left;
-  margin: 0px 5px 5px 0px; }
-
+       float: left;
+       margin: 0px 5px 5px 0px;
+}
 .mail-conv-sender-photo {
        .box(32px, 32px)
 }
-
 .mail-conv-sender-name {
-       float: left; }
-
+       float: left;
+}
 .mail-conv-date {
-       float: right; }
-
+       float: right;
+}
 .mail-conv-subject {
-  clear: right;
-  font-weight: bold;
-  font-size: 1.2em; }
-
+       clear: right;
+       font-weight: bold;
+       font-size: 1.2em;
+}
 .mail-conv-body {
-  clear: both; }
-
+       clear: both;
+}
 .mail-conv-delete-wrapper {
-  margin-top: 5px; }
+       margin-top: 5px;
+}
+
 
 /**
  * contacts
  */
-
-.view-contact-wrapper, .contact-entry-wrapper {
+.view-contact-wrapper,
+.contact-entry-wrapper {
        float: left;
        margin: 0 5px 40px 0;
-       .box(120px, 120px);
+       .box(120px, 135px);
        padding: 3px;
-       position: relative; }
-
+       position: relative;
+}
 .contact-direction-wrapper {
        position: absolute;
-       top: 20px; }
-
+       top: 20px;
+}
 .contact-edit-links {
        position: absolute;
-       top: 60px; }
-
+       top: 60px;
+}
 .contact-entry-photo-wrapper {}
-
 .contact-entry-photo {
-       margin-left: 20px; }
-
+       margin-left: 20px;
+}
 .contact-entry-name {
        width: 120px;
        font-weight: bold;
-       /*overflow: hidden;*/
+       font-size: small;
+}
+.contact-entry-details {
+       font-size: x-small;
 }
-
 .contact-entry-photo {
-  position: relative; }
-
+       position: relative;
+}
 .contact-entry-edit-links .icon {
-       border: 1px solid #babdb6;
+       .borders(1px, solid, #babdb6);
        .rounded_corners(3px);
-       background-color: #fff;
+       background-color: white;
 }
-
 #contact-entry-url,
 [id^="contact-entry-url"],
 #contact-entry-network,
 [id^="contact-entry-network"] {
        font-size: smaller;
 }
-
 #contact-entry-network,
 [id^="contact-entry-network"] {
        font-style: italic;
 }
-
 #contact-edit-banner-name {
-  font-size: 1.5em; }
+       font-size: 1.5em;
+}
 
 #contact-edit-photo-wrapper {
-  position: relative;
-  float: left;
-  padding: 20px; }
-
+       position: relative;
+       float: left;
+       padding: 20px;
+}
 #contact-edit-direction-icon {
-  position: absolute;
-  top: 60px;
-  left: 0; }
-
+       position: absolute;
+       top: 60px;
+       left: 0;
+}
 #contact-edit-nav-wrapper {
-  margin-left: 0px; }
-
+       margin-left: 0px;
+}
 #contact-edit-links {
        margin-top: 23px;
-       ul {
-               .list_reset;
-       }
 }
-
 #contact-drop-links {
        margin-left: 5px;
 }
-
 #contact-edit-nav-wrapper .icon {
        .borders(1px, solid, #babdb6);
        .rounded_corners(3px);
 }
-
 #contact-edit-poll-wrapper {
-  margin-left: 0px; }
-
+       margin-left: 0px;
+}
 #contact-edit-last-update-text {
-  margin-bottom: 15px; }
-
+       margin-bottom: 15px;
+}
 #contact-edit-last-updated {
-  font-weight: bold; }
-
+       font-weight: bold;
+}
 #contact-edit-poll-text {
-  display: inline; }
-
-#contact-edit-info_tbl, #contact-edit-info_parent, .mceLayout {
-  width: 100%; }
-
+       display: inline;
+}
+#contact-edit-info_tbl,
+#contact-edit-info_parent,
+.mceLayout {
+       width: 100%;
+}
 #contact-edit-end {
-  clear: both;
-  margin-bottom: 65px; }
-
+       clear: both;
+       margin-bottom: 65px;
+}
 .contact-photo-menu-button {
        position: absolute;
        background: url("dark/photo-menu.jpg") top left no-repeat transparent;
@@ -1816,95 +1951,85 @@ div {
        text-indent: 40px;
        display: none;
 }
-
 .contact-photo-menu {
-  width: auto;
-  border: 2px solid #444;
-  background: @bg_colour;
-  color: @main_colour;
-  position: absolute;
-  left: 0px;
-  top: 90px;
-  display: none;
-  z-index: 10000;
-  ul {
-    margin: 0px;
-    padding: 0px;
-    list-style: none; }
-  li a {
-    display: block;
-    padding: 2px;
-    &:hover {
-      color: #fff;
-      background: #3465A4;
-      text-decoration: none; } } }
+       width: auto;
+       .borders(2px, solid, darken(@main_alt_colour, 66.5%));
+       background: @bg_colour;
+       color: @main_colour;
+       position: absolute;
+       left: 0px;
+       top: 90px;
+       display: none;
+       z-index: 10000;
+       li a {
+               display: block;
+               padding: 2px;
+               &:hover {
+                       color: white;
+                       background: #3465A4;
+                       text-decoration: none;
+               }
+       }
+}
+
 
 /**
  * register, settings & profile forms
  */
-
 .openid {}
-
 #id_openid_url {
-  background: url(dark/login-bg.gif) no-repeat;
-  background-position: 0 50%;
-  padding-left: 18px; }
-
-#settings-nickname-desc {
-       background-color: @main_colour;
-       .rounded_corners;
-       padding: 5px;
-       color: #111;
+       background: url(dark/login-bg.gif) no-repeat;
+       background-position: 0 50%;
+       padding-left: 18px;
 }
-
 #settings-default-perms {
-  margin-bottom: 20px; }
-
+       margin-bottom: 20px;
+}
 #register-form div, #profile-edit-form div {
-  clear: both; }
-
+       clear: both;
+}
 .settings-block {
-  label {
-    clear: left; }
-  input {
-    margin: 10px 5px; } }
-
-/*#register-form label,     */
-/*#profile-edit-form label {*/
-/*    width: 300px;         */
-/*    float: left;          */
-/*}                         */
-
-/*#register-form span,     */
-/*#profile-edit-form span {*/
-/*    color: #555753;      */
-/*    display: block;      */
-/*    margin-bottom: 20px; */
-/*}                        */
-
+       label {
+               clear: left;
+       }
+       input {
+               margin: 10px 5px;
+       }
+}
+#register-form label,
+#profile-edit-form label {
+    width: 300px;
+    float: left;
+} 
+#register-form span,
+#profile-edit-form span {
+    color: @menu_bg_colour;
+    display: block;
+    margin-bottom: 20px;
+}
 #profile-edit-marital-label span {
-  margin: -4px; }
-
-.settings-submit-wrapper, .profile-edit-submit-wrapper {
-  margin: 0 0 30px -3px; }
-
+       margin: -4px;
+}
+.settings-submit-wrapper,
+.profile-edit-submit-wrapper {
+       margin: 0 0 30px;
+}
 .profile-edit-side-div {
-  display: none; }
-
+       display: none;
+}
 /*.profile-edit-side-div:hover {
     display: block;
 }
 .profile-edit-side-link {
     margin: 3px 0px 0px 70px;
 }*/
-
 #profiles-menu-trigger {
-  margin: 0px 0px 0px 25px; }
-
+       margin: 0px 0px 0px 25px;
+}
 .profile-listing {
-  float: left;
-  margin: 20px 20px 0px 0px; }
-
+       float: left;
+       margin: 20px 20px 0px 0px;
+}
 .icon-profile-edit {
        background: url("dark/icons.png") -150px 0px no-repeat;
        border: 0;
@@ -1938,255 +2063,254 @@ div {
        margin: 10px 10px 10px 288px;
 }
 
+
 /**
  * contacts selector
  */
-
 .group-delete-wrapper {
        margin: -31px 50px 0 0;
-       float: right; }
-
+       float: right;
+}
 /*.group-delete-icon {
     margin: 0 0 0 10px;
 }*/
-
 #group-edit-submit-wrapper {
        margin: 0 0 10px 0;
-       display: inline; }
-
-#group-edit-desc {
-       margin: 10px 0px; }
-
+       display: inline;
+}
 #group-members, #prof-members {
        height: 200px;
        overflow: auto;
-       .borders(1px, solid, #555753);
+       .borders(1px, solid, @menu_bg_colour);
        .rounded_corners(5px 5px 0 0);
 }
-
 #group-all-contacts, #prof-all-contacts {
        height: 200px;
        overflow: auto;
-       .borders(1px, solid, #555753);
+       .borders(1px, solid, @menu_bg_colour);
        .rounded_corners(0 0 5px 5px);
 }
-
 #group-members h3,
 #group-all-contacts h3,
 #prof-members h3,
 #prof-all-contacts h3 {
        color: @main_alt_colour;
-       background-color: #555753;
+       background-color: @menu_bg_colour;
        margin: 0;
-       padding: 5px; }
-
+       padding: 5px;
+}
 #group-separator, #prof-separator {
-       display: none; }
+       display: none;
+}
+
 
 /**
  * profile
  */
-
 #cropimage-wrapper {
-  float: left; }
-
+       float: left;
+}
 #crop-image-form {
-  clear: both; }
+       clear: both;
+}
+
 
 /**
  * intros
  */
-
 .intro-wrapper {
-  margin-top: 20px; }
-
+       margin-top: 20px;
+}
 .intro-fullname {
-  font-size: 1.1em;
-  font-weight: bold; }
-
-.intro-desc {
-  margin-bottom: 20px;
-  font-weight: bold; }
-
+       font-size: 1.1em;
+       font-weight: bold;
+}
 .intro-note {
-  padding: 10px; }
-
+       padding: 10px;
+}
 .intro-end {
-  padding: 30px; }
-
+       padding: 30px;
+}
 .intro-form {
-  float: left; }
-
-.intro-approve-form, .intro-approve-as-friend-end {
-  clear: both; }
-
-.intro-submit-approve, .intro-submit-ignore {
-  margin-right: 20px; }
-
+       float: left;
+}
+.intro-approve-form {
+       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, .intro-approve-as-friend, .intro-approve-as-fan {
-  float: left; }
-
+       margin-top: 15px;
+}
+.intro-approve-as-friend-label,
+.intro-approve-as-fan-label,
+.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; }
-
+       clear: both;
+       margin-bottom: 10px;
+}
 .intro-approve-as-end {
-  clear: both;
-  margin-bottom: 10px; }
+       clear: both;
+       margin-bottom: 10px;
+}
+.clear {
+       clear: both;
+}
 
-.intro-end, .clear {
-  clear: both; }
 
 /**
  * events
  */
-
 .eventcal {
-  float: left;
-  font-size: 20px; }
-
+       float: left;
+       font-size: 20px;
+}
 .event {
-  background: @bg_colour; }
-
+       background: @bg_colour;
+}
 .vevent {
-  border: 1px solid #ccc;
-  .event-description, .event-location, .event-start {
-    margin-left: 10px;
-    margin-right: 10px; } }
-
+       border: 1px solid darken(@main_alt_colour, 13.5%);
+       .event-description,
+       .event-location,
+       .event-start {
+               margin-left: 10px;
+               margin-right: 10px;
+       }
+}
 #new-event-link {
-  margin-bottom: 10px; }
-
-.edit-event-link, .plink-event-link {
+       margin-bottom: 10px;
+}
+.edit-event-link,
+.plink-event-link {
   /*float: left;      */
   /*margin-top: 4px;  */
   /*margin-right: 4px;*/
-  /*margin-bottom: 15px;*/ }
-
+  /*margin-bottom: 15px;*/
+}
 .event-description:before {
-  content: url('../../../images/calendar.png');
-  margin-right: 15px; }
-
-.event-start, .event-end {
-  margin-left: 10px;
-  width: 330px;
-  font-size: smaller; }
-
-.event-start .dtstart, .event-end .dtend {
-  float: right; }
-
+       content: url('../../../images/calendar.png');
+       margin-right: 15px;
+}
+.event-start,
+.event-end {
+       margin-left: 10px;
+       width: 330px;
+       font-size: smaller;
+}
+.event-start .dtstart,
+.event-end .dtend {
+       float: right;
+}
 .event-list-date {
-  margin-bottom: 10px; }
-
+       margin-bottom: 10px;
+}
 .prevcal, .nextcal {
-  float: left;
-  margin-left: 32px;
-  margin-right: 32px;
-  margin-top: 64px; }
-
-.event-calendar-end {
-  clear: both; }
-
+       float: left;
+       margin: 64px 32px auto 32px;
+}
 .calendar {
-  font-family: monospace; }
-
+       font-family: monospace;
+}
 .today {
-  font-weight: bold;
-  color: #F00; }
-
-#event-start-text, #event-finish-text {
-  margin-top: 10px;
-  margin-bottom: 5px; }
-
-#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text, #event-share-checkbox {
-  float: left; }
-
+       font-weight: bold;
+       color: red;
+}
+#event-start-text,
+#event-finish-text {
+       margin-top: 10px;
+       margin-bottom: 5px;
+}
+#event-nofinish-checkbox,
+#event-nofinish-text,
+#event-adjust-checkbox,
+#event-adjust-text,
+#event-share-checkbox {
+       float: left;
+}
 #event-datetime-break {
-  margin-bottom: 10px; }
-
-#event-nofinish-break, #event-adjust-break, #event-share-break {
-  clear: both; }
-
-#event-desc-text, #event-location-text {
-  margin-top: 10px;
-  margin-bottom: 5px; }
-
+       margin-bottom: 10px;
+}
+#event-nofinish-break,
+#event-adjust-break,
+#event-share-break {
+       clear: both;
+}
+#event-desc-text,
+#event-location-text {
+       margin-top: 10px;
+       margin-bottom: 5px;
+}
 #event-submit {
-  margin-top: 10px; }
-
+       margin-top: 10px;
+}
 .body-tag {
-  margin: 10px 0;
-  opacity: 0.5;
-  &:hover {
-    opacity: 1.0 !important; } }
-
-.filesavetags, .categorytags {
-  margin: 20px 0;
-  opacity: 0.5; }
-
-.filesavetags:hover, .categorytags:hover {
-  margin: 20px 0;
-  opacity: 1.0 !important; }
-
+       margin: 10px 0;
+       opacity: 0.5;
+       &:hover {
+               opacity: 1.0 !important;
+       }
+}
+.filesavetags,
+.categorytags {
+       margin: 20px 0;
+       opacity: 0.5;
+}
+.filesavetags:hover,
+.categorytags:hover {
+       margin: 20px 0;
+       opacity: 1.0 !important;
+}
 .item-select {
-  opacity: 0.1;
-  margin: 5px 0 0 6px !important;
-  &:hover {
-    opacity: 1; } }
-
+       opacity: 0.1;
+       margin: 5px 0 0 6px !important;
+       &:hover {
+               opacity: 1;
+       }
+}
 .checkeditem {
-  opacity: 1; }
-
+       opacity: 1;
+}
 #item-delete-selected {
-  margin-top: 30px; }
-
+       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; }
-
+       position: absolute;
+       left: 35px;
+       margin-top: 20px;
+}
 #item-delete-selected-icon {
-  float: left;
-  margin-right: 5px; }
-
-#item-delete-selected-desc {
-  float: left;
-  margin-right: 5px;
-  &:hover {
-    text-decoration: underline; } }
-
+       float: left;
+       margin-right: 5px;
+}
 .fc-state-highlight {
-  background: @main_colour;
-  color: @bg_colour; }
+       background: @main_colour;
+       color: @bg_colour;
+}
+
 
 /**
  * directory
  */
-
 .directory-item {
-  float: left;
-  margin: 0 5px 4px 0;
-  padding: 3px;
-  width: 180px;
-  height: 250px;
-  position: relative; }
+       float: left;
+       margin: 0 5px 4px 0;
+       padding: 3px;
+       width: 180px;
+       height: 250px;
+       position: relative;
+}
+
 
 /**
  * sidebar
  */
-
 #group-sidebar {
        margin-bottom: 10px;
 }
@@ -2196,13 +2320,15 @@ div {
        padding: 3px;
        color: @bg_colour;
        background: @main_colour;
-       font-weight: bold;
+       .borders(1px, solid, @link_colour);
 }
 .group-selected:hover,
 .nets-selected:hover,
 .fileas-selected:hover {
+       padding: 3px;
        color: @link_colour;
        background: @bg_colour;
+       .borders(1px, solid, @link_colour);
 }
 .groupsideedit {
        margin-right: 10px;
@@ -2224,15 +2350,15 @@ div {
        padding: 3px;
        &:hover {
                color: @bg_colour;
-               background: @link_colour;
-               font-weight: bold;
+               background: @shiny_colour;
+               .borders(1px, solid, @hover_colour);
                padding: 3px;
        }
 }
 #sidebar-new-group {
        margin: auto;
        display: inline-block;
-       color: #efefef;
+       color: @main_alt_colour;
        text-decoration: none;
        text-align: center;
 }
@@ -2243,7 +2369,8 @@ div {
        &:hover {
                /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
                /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
-               /*background-color: #b20202;*/ }
+               /*background-color: #b20202;*/
+       }
        &:active {
                position: relative;
                top: 1px;
@@ -2252,13 +2379,14 @@ div {
 #side-peoplefind-url {
        background-color: @bg_colour;
        color: @main_colour;
-       border: 1px #999 solid;
+       .borders(1px, solid, darken(@main_alt_colour, 33.5%));
        margin-right: 3px;
        width: 75%;
-       &:hover, &:focus {
-               background-color: #efefef;
-               color: #222;
-               border: 1px 333 solid;
+       &:hover,
+       &:focus {
+               background-color: @main_alt_colour;
+               color: darken(@main_alt_colour, 80%);
+               .borders(1px, solid, darken(@main_alt_colour, 73.5%));
        }
 }
 .nets-ul {
@@ -2267,7 +2395,8 @@ div {
                margin: 10px 0 0;
        }
 }
-.nets-link, .nets-all {
+.nets-link,
+.nets-all {
        margin-left: 0px;
 }
 #netsearch-box {
@@ -2284,15 +2413,16 @@ div {
  */
 #pending-update {
        float: right;
-       color: #fff;
+       color: white;
        font-weight: bold;
-       background-color: #ff0000;
-       padding: 0 .3em;
+       background-color: red;
+       padding: 0 0.3em;
 }
 .admin {
        &.linklist {
                border: 0;
-               padding: 0; }
+               padding: 0;
+       }
        &.link {
                .list_reset;
        }
@@ -2302,11 +2432,12 @@ div {
        background: @bg_colour;
        margin: 5px;
        padding: 10px;
+       font-size: smaller;
        dl {
            clear: left;
                margin-bottom: 2px;
                padding-bottom: 2px;
-               border-bottom: 1px solid #000;
+               border-bottom: 1px solid @shadow_colour;
        }
        dt {
                width: 250px;
@@ -2317,7 +2448,7 @@ div {
                margin-left: 250px;
        }
        h3 {
-               border-bottom: 1px solid #ccc;
+               border-bottom: 1px solid darken(@main_alt_colour, 13.5%);
        }
        .submit {
                clear: left;
@@ -2327,9 +2458,8 @@ div {
                padding: 0;
        }
        .plugin {
-               list-style: none;
                display: block;
-               border: 1px solid #888;
+               .borders(1px, solid, darken(@main_alt_colour, 40%));
                padding: 1em;
                margin-bottom: 5px;
                clear: left;
@@ -2340,57 +2470,56 @@ div {
        }
        table {
                width: 100%;
-               border-bottom: 1px solid #000;
+               border-bottom: 1px solid @shadow_colour;
                margin: 5px 0;
                th {
+                       font-weight: bold;
                        text-align: left;
                }
+               td {
+                       padding: 5px;
+                       vertical-align: middle;
+               }
+               &#users {
+                       padding: 5px;
+                   img {
+                           .box(16px, 16px);
+               }
+            a {
+                           color: @main_colour;
+                           text-decoration: underline;
+            }
+               }
        }
        td .icon {
                float: left;
        }
-       table {
-               &#users img {
-                       width: 16px;
-                       height: 16px;
-               }
-       }
        .selectall {
                text-align: right;
        }
-       #users a {
-               color: @main_colour;
-               text-decoration: underline;
-       }
 }
-
 #users .name {
        color: @main_colour;
 }
+#users .tools {
+       padding: 5px 0;
+       vertical-align: middle;
+}
+
 
 /**
  * form fields
  */
-
 .field {
        overflow: auto;
-       label {
-               width: 38%;
-               display: inline-block;
-               font-size: 1.077em;
-               margin: 0 10px 1em 0;
-               border: 1px @bg_colour solid;
-               padding: 5px;
-               background: @main_colour;
-               color: #111; } }
-
+}
 .field .onoff {
        float: right;
        margin: 0 330px 0 auto;
        width: 80px;
        a {
                display: block;
-               border: 1px solid #666;
+               .borders(1px, solid, darken(@main_alt_colour, 53.5%));
                padding: 3px 6px 4px 10px;
                height: 16px;
                text-decoration: none;
@@ -2401,68 +2530,31 @@ div {
        }
        .on {
                background-position: 42px 1px;
-               background-color: #999;
-               color: #111;
+               background-color: darken(@main_alt_colour, 33.5%);
+               color: darken(@main_alt_colour, 86.5%);
                text-align: left;
        }
        .off {
                background-position: 2px 1px;
-               background-color: #ccc;
-               color: #333;
+               background-color: darken(@main_alt_colour, 13.5%);
+               color: darken(@main_alt_colour, 73.5%);
                text-align: right;
        }
 }
-
 .hidden {
-       display: none !important; }
-
+       display: none !important;
+}
 .field textarea {
        .box(80%, 100px);
 }
-
 .field_help {
-  display: block;
-  margin-left: 297px;
-  color: #aaa; }
-
-.field.radio .field_help {
-  margin-left: 297px; }
-
-label {
-       width: 38%;
-       display: inline-block;
-       font-size: 1.077em;
-       margin: 0 10px 1em 0;
-       .borders(1px, solid, @bg_colour);
-       padding: 5px;
-       background: @main_colour;
-       color: #111;
-       .box_shadow(3px, 3px, 5px);
+       display: block;
+       margin-left: 297px;
+       color: darken(@main_alt_colour, 24%);
+       font-size: small;
 }
-input {
-       .box(250px, 25px);
-       .borders(1px, solid, #999);
-       &[type="checkbox"],
-       &[type="radio"] {
-               margin: 0;
-               .box(15px, 15px);
-       }
-       &[type="submit"],
-       &[type="button"] {
-               background-color: #eee;
-               .borders(2px, outset, #aaa);
-               .rounded_corners;
-               .box_shadow(1px, 3px, 4px, 0);
-               color: #2e302e;
-               cursor: pointer;
-               font-weight: bold;
-               width: auto;
-               .text_shadow;
-       }
-       &[type="submit"]:active,
-       &[type="button"]:active {
-               .box_shadow(0, 0, 0, 0);
-       }
+.field.radio .field_help {
+       margin-left: 297px;
 }
 
 
@@ -2476,35 +2568,59 @@ input {
        position: absolute;
        display: none;
        .background {
-               background-color: #000;
+               background-color: darken(@main_alt_colour, 86.5%);
                opacity: 0.5;
                .box(100%, 100%);
                position: absolute;
                top: 0px;
-               left: 0px; }
+               left: 0px;
+       }
        .panel {
                top: 25%;
                left: 25%;
                .box(50%, 50%);
                padding: 1em;
                position: absolute;
-               border: 4px solid #000000;
-               background-color: #FFFFFF;
+               .borders(4px, solid, black);
+               background-color: white;
        }
 }
-
 #panel {
-       z-index: 100; }
-
-.grey, .gray {
-       color: gray; }
-
+       position: absolute;
+       font-size: small;
+       .rounded_corners;
+       .borders(1px, solid, @main_alt_colour);
+       background-color: @bg_alt_colour;
+       color: @main_colour;
+       padding: 1em;
+       z-index: 100;
+}
+.pager {
+       margin-top: 60px;
+       display: block;
+       clear: both;
+       text-align: center;
+       font-size: small;
+       font-weight: bold;
+       span {
+               padding: 4px;
+               margin: 4px;
+       }
+}
+.pager_current {
+       background-color: @link_colour;
+       color: @bg_colour;
+}
+.grey,
+.gray {
+       color: gray;
+}
 .orange {
-       color: orange; }
-
+       color: orange;
+}
 .red {
-       color: red; }
-
+       color: red;
+}
 .popup .panel {
        .panel_text {
                display: block;
@@ -2522,383 +2638,407 @@ input {
                position: absolute;
        }
 }
+.panel_text .progress {
+       width: 50%;
+       overflow: hidden;
+       height: auto;
+       .borders(1px, solid, darken(@main_alt_colour, 13.5%));
+       margin-bottom: 5px;
+       span {
+               float: right;
+               display: block;
+               width: 25%;
+               background-color: @main_alt_colour;
+               text-align: right;
+       }
+}
 
-.panel_text .progress {
-  width: 50%;
-  overflow: hidden;
-  height: auto;
-  border: 1px solid #cccccc;
-  margin-bottom: 5px;
-  span {
-    float: right;
-    display: block;
-    width: 25%;
-    background-color: #eeeeee;
-    text-align: right; } }
 
 /**
  * OAuth
  */
-
 .oauthapp {
-  height: auto;
-  overflow: auto;
-  border-bottom: 2px solid #cccccc;
-  padding-bottom: 1em;
-  margin-bottom: 1em;
-  img {
-    float: left;
-    width: 48px;
-    height: 48px;
-    margin: 10px;
-    &.noicon {
-      background-image: url("../../../images/icons/48/plugin.png");
-      background-position: center center;
-      background-repeat: no-repeat; } }
-  a {
-    float: left; } }
+       height: auto;
+       overflow: auto;
+       border-bottom: 2px solid darken(@main_alt_colour, 13.5%);
+       padding-bottom: 1em;
+       margin-bottom: 1em;
+       img {
+               float: left;
+               .box(48px, 48px);
+               margin: 10px;
+               &.noicon {
+                       background-image: url("../../../images/icons/48/plugin.png");
+                       background-position: center center;
+                       background-repeat: no-repeat;
+               }
+       }
+       a {
+               float: left;
+       }
+}
+
 
 /**
  * icons
  */
-
 .iconspacer {
        display: block;
        .box(16px, 16px);
 }
-
 .icon {
        display: block;
        .box;
-       background: url(dark/icons.png) no-repeat;
+       background: transparent url("dark/icons.png") no-repeat;
        border: 0;
        text-decoration: none;
        .rounded_corners;
        &:hover {
                border: 0;
-               text-decoration: none; } }
-
+               text-decoration: none;
+       }
+}
 .editicon {
-  display: inline-block;
-  width: 21px;
-  height: 21px;
-  background: url(dark/editicons.png) no-repeat;
-  border: 0;
-  text-decoration: none; }
-
+       display: inline-block;
+       .box(21px, 21px);
+       background: url("dark/editicons.png") no-repeat;
+       border: 0;
+       text-decoration: none;
+}
 .shadow {
        .box_shadow(2px, 2px, 5px, 2px);
        &:active, &:focus, &:hover {
-               box-shadow: 0 0 0 0;
+               .box_shadow(0, 0, 0, 0);
        }
 }
 .editicon:hover {
-       border: 0; }
-
+       border: 0;
+}
 .boldbb {
        background-position: 0px 0px;
        &:hover {
-               background-position: -22px 0px; } }
-
+               background-position: -22px 0px; }
+}
 .italicbb {
        background-position: 0px -22px;
        &:hover {
-               background-position: -22px -22px; } }
-
+               background-position: -22px -22px; }
+}
 .underlinebb {
        background-position: 0px -44px;
        &:hover {
-               background-position: -22px -44px; } }
-
+               background-position: -22px -44px; }
+}
 .quotebb {
        background-position: 0px -66px;
        &:hover {
-               background-position: -22px -66px; } }
-
+               background-position: -22px -66px; }
+}
 .codebb {
        background-position: 0px -88px;
        &:hover {
-               background-position: -22px -88px; } }
-
+               background-position: -22px -88px; }
+}
 .imagebb {
        background-position: -44px 0px;
        &:hover {
-               background-position: -66px 0px; } }
-
+               background-position: -66px 0px; }
+}
 .urlbb {
        background-position: -44px -22px;
        &:hover {
-               background-position: -66px -22px; } }
-
+               background-position: -66px -22px; }
+}
 .videobb {
        background-position: -44px -44px;
        &:hover {
-               background-position: -66px -44px; } }
-
+               background-position: -66px -44px; }
+}
 .icon {
        &.drop, &.drophide, &.delete {
                float: left;
-               margin: 0 2px; }
+               margin: 0 2px;
+       }
        &.s22 {
                &.delete {
                        display: block;
-                       background-position: -110px 0; }
+                       background-position: -110px 0;
+               }
                &.text {
                        padding: 10px 0px 0px 25px;
-                       width: 200px; } }
+                       width: 200px;
+               }
+       }
        &.text {
-               text-indent: 0px; }
+               text-indent: 0px;
+       }
        &.s16 {
                min-width: 16px;
-               height: 16px; } }
-
+               height: 16px;
+       }
+}
+// special case for wall items
+.wall-item-delete-wrapper.icon.delete,
+.wall-item-delete-wrapper.icon.drophide {
+       margin: 0;
+}
 .s16 .add {
        background: url("../../../images/icons/16/add.png") no-repeat;
 }
-
 .add {
-       margin: 0px 5px; }
-
+       margin: 0px 5px;
+}
 .article {
-       background-position: -50px 0; }
-
+       background-position: -50px 0;
+}
 .audio {
-       background-position: -70px 0; }
-
+       background-position: -70px 0;
+}
 .block {
-       background-position: -90px 0px; }
-
+       background-position: -90px 0px;
+}
 .drop, .delete {
-       background-position: -110px 0; }
-
+       background-position: -110px 0;
+}
 .drophide {
-       background-position: -130px 0; }
-
+       background-position: -130px 0;
+}
 .edit {
-       background-position: -150px 0; }
-
+       background-position: -150px 0;
+}
 .camera {
-       background-position: -170px 0; }
-
+       background-position: -170px 0;
+}
 .dislike {
-       background-position: -190px 0; }
-
+       background-position: -190px 0;
+}
 .file-as {
-       background-position: -230px -60px; }
-
+       background-position: -230px -60px;
+}
 .like {
-       background-position: -211px 0; }
-
+       background-position: -211px 0;
+}
 .link {
-       background-position: -230px 0; }
-
-.globe, .location {
-       background-position: -50px -20px; }
-
-.noglobe, .nolocation {
-       background-position: -70px -20px; }
-
+       background-position: -230px 0;
+}
+.globe,
+.location {
+       background-position: -50px -20px;
+}
+.noglobe,
+.nolocation {
+       background-position: -70px -20px;
+}
 .no {
-       background-position: -90px -20px; }
-
+       background-position: -90px -20px;
+}
 .pause {
-       background-position: -110px -20px; }
-
+       background-position: -110px -20px;
+}
 .play {
-       background-position: -130px -20px; }
-
+       background-position: -130px -20px;
+}
 .pencil {
-       background-position: -151px -18px; }
-
+       background-position: -151px -18px;
+}
 .small-pencil {
-       background-position: -170px -20px; }
-
+       background-position: -170px -20px;
+}
 .recycle {
-       background-position: -190px -20px; }
-
+       background-position: -190px -20px;
+}
 .remote-link {
-       background-position: -210px -20px; }
-
+       background-position: -210px -20px;
+}
 .share {
-       background-position: -230px -20px; }
-
+       background-position: -230px -20px;
+}
 .tools {
-       background-position: -50px -40px; }
-
+       background-position: -50px -40px;
+}
 .lock {
-       background-position: -70px -40px; }
-
+       background-position: -70px -40px;
+}
 .unlock {
-       background-position: -88px -40px; }
-
+       background-position: -88px -40px;
+}
 .video {
-       background-position: -110px -40px; }
-
+       background-position: -110px -40px;
+}
 .attach {
-       background-position: -190px -40px; }
-
+       background-position: -191px -40px;
+}
 .language {
-       background-position: -210px -40px; }
-
+       background-position: -210px -40px;
+}
 .starred {
-       background-position: -130px -60px; }
-
+       background-position: -130px -60px;
+}
 .unstarred {
-       background-position: -150px -60px; }
-
+       background-position: -150px -60px;
+}
 .tagged {
-       background-position: -170px -60px; }
-
+       background-position: -170px -60px;
+}
 .on {
-       background-position: -50px -60px; }
-
+       background-position: -50px -60px;
+}
 .off {
-       background-position: -70px -60px; }
-
+       background-position: -70px -60px;
+}
 .prev {
-       background-position: -90px -60px; }
-
+       background-position: -90px -60px;
+}
 .next {
-       background-position: -110px -60px; }
-
+       background-position: -110px -60px;
+}
 .icon.dim {
-       opacity: 0.3; }
-
+       opacity: 0.3;
+}
 #pause {
        position: fixed;
        bottom: 40px;
-       right: 30px; }
-
+       right: 30px;
+       z-index: 10;
+}
 .border {
-       .borders(1px, solid, #babdb6);
+       .borders(1px, solid, @border2);
        .rounded_corners;
        &:hover {
-               .borders(1px, solid, #babdb6);
+               .borders(1px, solid, @border2);
                .rounded_corners;
        }
 }
-
 .attachtype {
        display: block;
-       width: 20px;
-       height: 23px;
-       background-image: url(../../../images/content-types.png); }
-
+       .box(20px, 23px);
+       background-image: url(../../../images/content-types.png);
+}
 .type-video {
-       background-position: 0px 0px; }
-
+       background-position: 0px 0px;
+}
 .type-image {
-       background-position: -20px 0; }
-
+       background-position: -20px 0;
+}
 .type-audio {
-       background-position: -40px 0; }
-
+       background-position: -40px 0;
+}
 .type-text {
-       background-position: -60px 0px; }
-
+       background-position: -60px 0px;
+}
 .type-unkn {
-       background-position: -80px 0; }
+       background-position: -80px 0;
+}
+
 
 /**
  * footer
  */
-
 .cc-license {
        margin-top: 100px;
-       font-size: 0.7em; }
-
+       font-size: 0.7em;
+}
 footer {
        display: block;
-       /*margin: 50px 20%;*/
-       clear: both; }
-
+       clear: both;
+}
 #profile-jot-text {
        height: 20px;
        color: @main_colour;
+       background: @bg_colour;
        .borders;
        .rounded_corners;
        width: 99.5%;
 }
 
+
 /**
  * acl
  */
-
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
        display: block !important;
        background: @bg_colour;
-       color: @main_colour; }
-
+       color: @main_colour;
+}
+#profile-jot-acl-wrapper {
+       margin: 0 10px;
+       .borders(1px, solid, @menu_bg_colour);
+       border-top: 0;
+       font-size: small;
+       // .box_shadow;
+}
 #acl-wrapper {
        width: 660px;
-       margin: 0 auto; }
-
+       margin: 0 auto;
+}
 #acl-search {
        float: right;
        background: white url("../../../images/search_18.png") no-repeat right center;
        padding-right: 20px;
        margin: 6px;
-       color: #111; }
-
+       color: @shadow_colour;
+}
 #acl-showall {
        float: left;
        display: block;
-       width: auto;
-       height: 18px;
-       background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;
+       .box(auto, 18px);
+       background: @main_colour url("../../../images/show_all_off.png") 8px 8px no-repeat;
        padding: 7px 10px 7px 30px;
        .rounded_corners;
-       color: #999;
+       color: darken(@main_alt_colour, 33.5%);
        margin: 5px 0;
        &.selected {
-               color: #000;
-               background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } }
-
+               color: black;
+               background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;
+       }
+}
 #acl-list {
-  height: 210px;
-  border: 1px solid #ccc;
-  clear: both;
-  margin-top: 30px;
-  overflow: auto; }
-
+       height: 210px;
+       .borders(1px, solid, darken(@main_alt_colour, 13.5%);
+       clear: both;
+       margin-top: 30px;
+       overflow: auto;
+}
 /*#acl-list-content {
 }*/
-
 .acl-list-item {
        .borders;
+       .box(120px, 110px);
        display: block;
        float: left;
-       height: 110px;
        margin: 3px 0 5px 5px;
-       width: 120px;
        img {
                .box(22px, 22px);
                float: left;
-               margin: 5px 5px 20px; }
+               margin: 5px 5px 20px;
+       }
        p {
                height: 12px;
                font-size: 10px;
                margin: 0 0 22px;
-               padding: 2px 0 1px; }
+               padding: 2px 0 1px;
+       }
        a {
-               background: #eeeecc 3px 3px no-repeat;
+               background: @main_colour 3px 3px no-repeat;
                .rounded_corners;
+               .box(55px, 20px);
                clear: both;
                font-size: 10px;
                display: block;
-               width: 55px;
-               height: 20px;
                color: @bg_colour;
                margin: 5px auto 0;
                padding: 0 3px;
                text-align: center;
-               vertical-align: middle; } }
-
+               vertical-align: middle;
+       }
+}
 #acl-wrapper a:hover {
        text-decoration: none;
        color: @bg_colour;
-       border: 0; }
-
+       border: 0;
+}
 //data URI:
 // data:[<MIME-type>][;charset=<encoding>][;base64],<data>
 .acl-button-show {
@@ -2923,24 +3063,27 @@ footer {
 }
 .acl-list-item {
        &.groupshow {
-               border-color: #9ade00; }
+               border-color: @group_show;
+       }
        &.grouphide {
-               border-color: #ff4141; } }
-
+               border-color: @group_hide;
+       }
+}
 /** /acl **/
 
+
 /* autocomplete popup */
 .acpopup {
        max-height: 175px;
        max-width: 42%;
-       background-color: #555753;
-       color: #fff;
+       background-color: @menu_bg_colour;
+       color: white;
        overflow: auto;
        z-index: 100000;
-       border: 1px solid #cccccc;
+       border: 1px solid darken(@main_alt_colour, 13.5%);
 }
 .acpopupitem {
-       background-color: #555753;
+       background-color: @menu_bg_colour;
        padding: 4px;
        clear: left;
        img {
@@ -2948,7 +3091,7 @@ footer {
                margin-right: 4px;
        }
        &.selected {
-               color: #2e302e;
+               color: @bg_alt_colour;
                background-color: @main_alt_colour;
        }
 }
@@ -2957,113 +3100,47 @@ footer {
        margin: 5px 5px 5px 81%;
 }
 .qcomment {
-  opacity: 0.5;
-  &:hover {
-    opacity: 1.0; } }
-
+       opacity: 0.5;
+       &:hover {
+               opacity: 1.0;
+       }
+}
 #network-star-link {
-  margin-top: 10px; }
-
+       margin-top: 10px;
+}
 .network-star {
-  float: left;
-  margin-right: 5px;
-  &.icon.starred {
-    display: inline-block; } }
-
+       float: left;
+       margin-right: 5px;
+       &.icon.starred {
+               display: inline-block;
+       }
+}
 #fileas-sidebar {}
 
 .fileas-ul {
-  padding: 0; }
+       padding: 0;
+}
+
 
 /*
  * addons theming
  */
-
 #sidebar-page-list {
-  ul {
-    padding: 0;
-    margin: 5px 0; }
-  li {
-    list-style: none; } }
-
-#jappix_mini {
-  margin-left: 130px;
-  position: fixed;
-  bottom: 0;
-  right: 175px !important;
-  /* override the jappix css */
-  z-index: 999; }
-
-//* media stuff */
-@media handheld {
-       body {
-               font-size: 15pt;
-       }
-}
-//* Smartphones (portrait and landscape) ----------- */
-@media only screen and (min-device-width: 320px)
-       and (max-device-width: 480px) {
-       body {
-               font-size: 10px;
-       }
-}
-//* Smartphones (landscape) ----------- */
-@media only screen and (min-width: 321px) {
-       body {
-               font-size: 10px;
-       }
-}
-//* Smartphones (portrait) ----------- */
-@media only screen and (max-width: 320px) {
-       body {
-               font-size: 10px;
-       }
-}
-//* iPads (portrait and landscape) ----------- */
-@media only screen and (min-device-width: 768px)
-       and (max-device-width: 1024px) {
-       body {
-               font-size: 16px;
-       }
-}
-//* iPads (landscape) ----------- */
-@media only screen and (min-device-width: 768px)
-       and (max-device-width: 1024px)
-       and (orientation: landscape) {
-       body {
-               font-size: 16px;
-       }
-}
-//* iPads (portrait) ----------- */
-@media only screen and (min-device-width: 768px)
-       and (max-device-width: 1024px)
-       and (orientation: portrait) {
-       body {
-               font-size: 16px;
-       }
-}
-//* Desktops and laptops ----------- */
-//adjusted to 1024 from 1224.
-//not everybody has a fucking big screen ffs
-@media only screen and (min-width: 1024px) {
-       body {
-               font-size: 16px;
-       }
-}
-//* Large screens - */
-@media only screen and (min-width: 1520px) {
-       body {
-               font-size: 18px;
+       ul {
+               padding: 0;
+               margin: 5px 0;
        }
-}
-//* iPhone 4 ----------- */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
-       only screen and (min-device-pixel-ratio: 1.5) {
-       body {
-               font-size: 16px;
+       li {
+               list-style: none;
        }
 }
-.test {
-       color: @link_colour;
-       background-color: darken(@main_alt_colour, 13%);
+#jappix_mini {
+       margin-left: 130px;
+       position: fixed;
+       bottom: 0;
+       /* override the jappix css */
+       right: 175px !important;
+       z-index: 999;
 }
+
+@import "../css/media";