]> git.mxchange.org Git - friendica.git/commitdiff
major reworking of dispy dark. light to follow
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 3 May 2012 18:25:18 +0000 (14:25 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 3 May 2012 18:25:18 +0000 (14:25 -0400)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
view/theme/dispy/bottom.tpl
view/theme/dispy/dark/_base.less [new file with mode: 0644]
view/theme/dispy/dark/connect.png [deleted file]
view/theme/dispy/dark/style.css
view/theme/dispy/dark/style.less
view/theme/dispy/icons/connect.png [new file with mode: 0644]
view/theme/dispy/jot.tpl
view/theme/dispy/js/modernizr.custom.2.5.3.js [new file with mode: 0644]
view/theme/dispy/js/modernizr.custom.2.5.3.min.js [new file with mode: 0644]
view/theme/dispy/light/_base.less [new file with mode: 0644]
view/theme/dispy/profile_vcard.tpl

index 130bfb25ae4f3004d79a552ef80e1d3d386f4a2f..1af83e4c8c9d4dde52ced203c209255a54752f43 100644 (file)
@@ -44,3 +44,4 @@ function cmtBbOpen(id) {
        $(".comment-edit-bb-" + id).show();
 }
 </script>
+<script type="text/javascript" src="$baseurl/view/theme/dispy/js/modernizr.custom.2.5.3.min.js"></script>
diff --git a/view/theme/dispy/dark/_base.less b/view/theme/dispy/dark/_base.less
new file mode 100644 (file)
index 0000000..c26332b
--- /dev/null
@@ -0,0 +1,136 @@
+// _base.less
+//
+// the base file for dispy's dark "sub-theme".
+//
+// Notes:
+// this is used to define mixins (think of them as functions)
+// and variables. the mixins are the ".foo () {}" things, vars are
+// like "@bar".
+//
+// (BTW, this will make it a LOT easier to maintain.)
+// 
+// Dev. Note: the // style comments don't show up at all when
+// you "compile" the css (with `lessc`), but css (/**/) comments
+// do. i use them to our advantage :).
+
+//* backgrounds */
+@dk_bg_colour: #1d1f1d;
+@bg_colour: #2e2f2e;
+@bg_alt_colour: #2e302e;
+@med_bg_colour: #4e4f4e;
+@menu_bg_colour: #555753;
+
+//* font colour, aka color: */
+@lt_main_colour: #ffff99;
+@main_colour: #eeeecc;
+@main_alt_colour: #eeeeee;
+// darken(@main_alt_colour, 13%) > #cdcdcd
+// darken(@main_alt_colour, 60%) > #555555
+@disabled_colour: #ddddbb;
+@shiny_colour: #2e3436;
+@red_orange: #ff2000;
+@orange: #f8911b;
+@lt_orange: #fcaf3e;
+@shadow_colour: #111111;
+@friendica_blue: #3465a4;
+@notice: #3320bc;
+@info: #1353b1;
+@alert: #ff0000;
+
+@lt_main_colour: lighten(@bg_colour, 10%);
+@dk_main_colour: darken(@bg_colour, 10%);
+
+//* links */
+@link_colour: #88a9d2;
+@dk_link_colour: darken(@link_colour, 10%);
+@lt_link_colour: lighten(@link_colour, 10%);
+//@hover_colour: #729fcf;
+@hover_colour: @dk_link_colour;
+
+//* box shadows */
+@menu_shadow: 5px 0 10px 0 @shadow_colour;
+@main_shadow: 3px 3px 3px 10px 0 @shadow_colour;
+
+// default here was @main_shadow
+.box_shadow(@h: 5px, @v: 5px, @blur: 5px, @spread: 0px, @colour: @shadow_colour) {
+       -moz-box-shadow: @h @v @blur @spread @colour;
+       -o-box-shadow: @h @v @blur @spread @colour;
+       -webkit-box-shadow: @h @v @blur @spread @colour;
+       -ms-box-shadow: @h @v @blur @spread @colour;
+       box-shadow: @h @v @blur @spread @colour;
+}
+//* http://css-tricks.com/snippets/css/css-box-shadow/
+//* box-shadow:
+//* 1. The horizontal offset of the shadow, positive means
+//* the shadow will be on the right of the box, a negative
+//* offset will put the shadow on the left of the box.
+//* 2. The vertical offset of the shadow, a negative one
+//* means the box-shadow will be above the box, a
+//* positive one means the shadow will be below the box.
+//* 3. The blur radius (optional), if set to 0 the shadow
+//* will be sharp, the higher the number, the more blurred
+//* it will be.
+//* 4. The spread radius (optional), positive values increase
+//* the size of the shadow, negative values decrease the size.
+//* Default is 0 (the shadow is same size as blur).
+//* 5. Colo[u]r
+//*/
+
+//* text-shadow */
+.text_shadow (@h: 1px, @v: 1px, @c: #111) {
+       -moz-text-shadow: @h @v @c;
+       -o-text-shadow: @h @v @c;
+       -webkit-text-shadow: @h @v @c;
+       -ms-text-shadow: @h @v @c;
+       text-shadow: @h @v @c;
+}
+//* transitions */
+.transition (@type: all, @dur: 0.5s, @effect: ease-in-out) {
+    -webkit-transition: @arguments;
+    -moz-transition: @arguments;
+    -o-transition: @arguments;
+    -ms-transition: @arguments;
+    transition: @arguments;
+}
+
+//* borders */
+.borders (@size: 1px, @style: solid, @colour: @main_colour) {
+       border: @size @style @colour;
+}
+
+//* rounded box corners */
+.rounded_corners (@r: 5px) {
+       -o-border-radius: @r;
+       -webkit-border-radius: @r;
+       -moz-border-radius: @r;
+       -ms-border-radius: @r;
+       border-radius: @r;
+}
+
+//* pre wrap */
+.wrap () {
+       white-space: pre-wrap;
+       white-space: pre;
+       word-wrap: none;
+}
+//* font size sizing */
+.default_font () {
+       font-size: 16px;
+       line-height: 1.1em;
+       font-family: sans-serif;
+}
+
+//* reset ul, ol */
+.list_reset () {
+       margin: 0px;
+       padding: 0px;
+       list-style: none;
+       list-style-position: inside;
+}
+
+//* box size: width, height */
+.box (@w: 20px, @h: 20px) {
+       width: @w;
+       height: @h;
+}
+
diff --git a/view/theme/dispy/dark/connect.png b/view/theme/dispy/dark/connect.png
deleted file mode 100644 (file)
index b76fc13..0000000
Binary files a/view/theme/dispy/dark/connect.png and /dev/null differ
index de4f3a6dc62a20ddbdc0129ab303f25eee454fff..4a21a76fb7c7921c803950ae89f3fc160b4a74cf 100644 (file)
@@ -2,36 +2,39 @@ article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display
 audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
 audio:not([controls]),[hidden]{display:none;}
 html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#eec;background-color:#2e2f2e;}
-button,input,select,textarea{font-family:sans-serif;color:#eec;background-color:#2e2f2e;}
-select{border:1px #555 dotted;padding:3px;margin:3px;color:#eec;background:#2e2f2e;}
-option{padding:3px;color:#eec;background:#2e2f2e;}option[selected="selected"]{color:#2e2f2e;background:#eec;}
-ul,ol{padding:0;}
+body{margin:0;padding:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#eeeecc;background-color:#2e2f2e;}
+button,input,select,textarea{color:#eeeecc;background-color:#2e2f2e;}
+select{border:1px #555 dotted;padding:1px;margin:3px;color:#eeeecc;background:#2e2f2e;}
+option{padding:1px;color:#eeeecc;background:#2e2f2e;}option[selected="selected"]{color:#2e2f2e;background:#eeeecc;}
+ul,ol{margin:0px;padding:0px;list-style:none;list-style-position:inside;}
+tr:nth-child(even){background-color:#474947;}
 :focus{outline:0;}
-[disabled="disabled"]{background:#4e4f4f;color:#ddb;}
-ins{background-color:#2e302e;color:#ff9;text-decoration:none;}
-mark{background-color:#2e302e;color:#ff9;font-style:italic;font-weight:bold;}
+[disabled="disabled"]{background:#4e4f4e;color:#ddddbb;}
+ins,mark{background-color:#2e302e;color:#474947;}
+ins{text-decoration:none;}
+mark{font-style:italic;font-weight:bold;}
 pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;}
-pre,.wall-item-body code{white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
+pre,.wall-item-body code{white-space:pre-wrap;white-space:pre;word-wrap:none;}
 q{quotes:none;}q:before,q:after{content:"";content:none;}
 small{font-size:85%;}
 sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
 sub{bottom:-0.25em;}
 sup{top:-0.5em;}
 img{border:0 none;}
-a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover img{text-decoration:none;}
-blockquote{background:#444;color:#eec;text-indent:5px;padding:5px;border:1px #aaa solid;border-radius:5px;}
-a:hover{color:#729fcf;border-bottom:1px dotted #729fcf;}
+a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover{color:#638ec4;border-bottom:1px dotted #638ec4;}
+a:hover img{text-decoration:none;}
+blockquote{background:#444;color:#eeeecc;text-indent:5px;padding:5px;border:1px #aaa solid;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 .required{display:inline;color:#ff0;font-size:16px;font-weight:bold;margin:3px;}
-.fakelink,.lockview{color:#729fcf;cursor:pointer;}
-.fakelink:hover{color:#729fcf;}
+.fakelink,.lockview{color:#88a9d2;cursor:pointer;}
+.fakelink:hover{color:#638ec4;}
 .smalltext{font-size:0.7em;}
-#panel{position:absolute;font-size:0.8em;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #fff;background-color:#2e302e;color:#eeeeec;padding:1em;}
+#panel{position:absolute;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeeee;background-color:#2e302e;color:#eeeecc;padding:1em;}
 .pager{margin-top:60px;display:block;clear:both;text-align:center;}.pager span{padding:4px;margin:4px;}
-.pager_current{background-color:#729fcf;color:#fff;}
+.pager_current{background-color:#88a9d2;color:#eeeeee;}
 .action{margin:5px 0;}
 .tool{margin:5px 0;list-style:none;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
+[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;padding:3px;margin:5px 0;font-weight:bold;}
 #asidemain .field{overflow:hidden;width:200px;}
 #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;}
 #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;}
@@ -41,10 +44,10 @@ a:hover{color:#729fcf;border-bottom:1px dotted #729fcf;}
 #asidemain #login_openid{position:relative !important;float:none !important;margin-left:0px !important;height:auto !important;width:200px !important;}
 #login_openid #id_openid_url{width:180px !important;overflow:hidden !important;}
 #login_openid label{width:180px !important;}
-nav{height:60px;background-color:#1d1f1d;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;}
+nav{height:60px;background-color:#1d1f1d;color:#eeeeee;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeee;border:0px;}nav a:hover{text-decoration:none;color:#eeeeee;border:0px;}
 nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
-ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;-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{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#2e302e;background-color:#eeeeec;}
-ul#user-menu-popup li a.nav-sep{border-top:1px solid #eeeeec;}
+ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#eeeecc;background-color:#2e302e;}
+ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;}
 nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(dark/icons.png) 0 0 no-repeat;}
 #nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
 #nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;}
@@ -58,24 +61,24 @@ nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin
 #nav-notify-link:hover{background-position:-66px -110px;}
 #nav-network-link{background-position:0px -177px;}#nav-network-link:hover{background-position:-22px -177px;}
 #nav-search-link{background-position:0 -44px;}#nav-search-link:hover{background-position:-22px -44px;}
-#profile-link,#profile-title,#wall-image-upload,#wall-file-upload,#profile-attach-wrapper,#profile-audio,#profile-link,#profile-location,#profile-nolocation,#profile-title,#jot-title,#profile-upload-wrapper,#profile-video,#profile-jot-submit,#wall-image-upload-div,#wall-file-upload-div,.icon,.hover,.focus,.pointer{cursor:pointer;}
-div.jGrowl div.notice{background:#511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;color:#ffffff;padding-left:58px;}
-div.jGrowl div.info{background:#364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;color:#ffffff;padding-left:58px;}
+#jot-title,#profile-link,#profile-title,#profile-attach-wrapper,#profile-audio,#profile-link,#profile-location,#profile-nolocation,#profile-title,#profile-upload-wrapper,#profile-video,#profile-jot-submit,#wall-image-upload,#wall-file-upload,#wall-image-upload-div,#wall-file-upload-div,.icon,.hover,.focus,.pointer{cursor:pointer;}
+div.jGrowl div.notice{background:#3320bc url("../../../images/icons/48/notice.png") no-repeat 5px center;color:white;padding-left:58px;margin-top:50px;}
+div.jGrowl div.info{background:#1353b1 url("../../../images/icons/48/info.png") no-repeat 5px center;color:white;padding-left:58px;margin-top:50px;}
 #nav-notifications-menu{margin:30px 0 0 -20px;width:275px;max-height:300px;overflow-y:auto;font-size:9pt;}#nav-notifications-menu .contactname{font-weight:bold;font-size:0.9em;}
 #nav-notifications-menu img{float:left;margin-right:5px;}
 #nav-notifications-menu .notif-when{font-size:0.8em;display:block;}
-#nav-notifications-menu li{word-wrap:normal;border-bottom:1px solid #000;}#nav-notifications-menu li:hover{color:black;}
+#nav-notifications-menu li{word-wrap:normal;border-bottom:1px solid black;}#nav-notifications-menu li:hover{color:black;}
 #nav-notifications-menu a:hover{color:black;text-decoration:underline;}
-nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("../../../images/icons/22/notify_on.png");}
+nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");}
 .show{display:block;}
-#notifications{height:20px;width:170px;position:absolute;top:-19px;left:4px;}
-#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;border-radius:5px;z-index:100;width:300px;height:60px;}
+#notifications{width:170px;height:20px;position:absolute;top:-19px;left:4px;}
+#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:300px;height:60px;}
 #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
 .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
-.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;}
-#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;font-size:8pt;margin:8px;width:10em;height:14px;}
+.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
+#search-text{border:1px solid #eeeecc;background:#2e2f2e;color:#eeeecc;font-size:8pt;margin:8px;width:10em;height:14px;}
 #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;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
+#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
 #user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;}
 .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#222;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
 .nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
@@ -86,98 +89,96 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #intro-update{background-position:-120px 0px;}
 #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
 #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
-.menu-popup{position:absolute;display:none;width:11em;background:#ffffff;color:#2d2d2d;margin:0px;padding:0px;list-style:none;border:3px solid #364e59;z-index:100000;-webkit-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);-moz-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);}.menu-popup a{display:block;color:#2d2d2d;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#bdcdd4;}
-.menu-popup .menu-sep{border-top:1px solid #9eabb0;}
+.menu-popup{position:absolute;display:none;width:11em;background:white;color:#2e2f2e;margin:0px;padding:0px;border:3px solid #2e3436;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#b9c1c3;}
+.menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
 .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
-.menu-popup .empty{padding:5px;text-align:center;color:#9eabb0;}
+.menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;}
 .notif-item{font-size:small;}.notif-item a{vertical-align:middle;}
 .notif-image{width:32px;height:32px;padding:7px 7px 0px 0px;}
-.notify-seen{background:#ddd;}
-#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
-#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
-#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #ccccce;}
+.notify-seen{background:#bbbbbb;}
+#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
+#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
+#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #eeeecc;}
 #asidemain{float:left;font-size:smaller;margin:20px 0 20px 35px;width:25%;display:inline;}
 #asideright,#asideleft{display:none;}
 .vcard .fn{font-size:1.7em;font-weight:bold;border-bottom:1px solid #729fcf;padding-bottom:3px;}
-.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;}
+.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
 #asidemain h4{font-size:1.2em;}
 #asidemain #viewcontacts{text-align:right;}
 #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
-.aprofile dt{background:#eec;color:#2e2f2e;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;}
+.aprofile dt{background:#eeeecc;color:#2e2f2e;font-weight:bold;-moz-box-shadow:1px 1px 5px 0 5px 5px 0px #111111;-o-box-shadow:1px 1px 5px 0 5px 5px 0px #111111;-webkit-box-shadow:1px 1px 5px 0 5px 5px 0px #111111;-ms-box-shadow:1px 1px 5px 0 5px 5px 0px #111111;box-shadow:1px 1px 5px 0 5px 5px 0px #111111;margin:15px 0 5px;padding-left:5px;}
 #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
-#dfrn-request-link{background:#3465a4 url(dark/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#eec;display:block;font-size:1.2em;padding:0.2em 0.5em;}
-#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
-.ttright{margin:0px 0px 0px 0px;}
+#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeecc;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;}
+#wallmessage-link{color:#eeeeee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
+.ttright{margin:0px;}
 .contact-block-div{width:50px;height:50px;float:left;}
 .contact-block-textdiv{width:150px;height:34px;float:left;}
-#contact-block-end{clear:both;}
-#jot{margin:10px 0 20px 0px;width:100%;}#jot #jot-tools{margin:0px;padding:0px;height:35px;overflow:none;width:100%;}#jot #jot-tools span{float:left;margin:10px 20px 2px 0px;}#jot #jot-tools span a{display:block;}
+#jot{margin:10px 0 20px 0px;width:100%;}#jot #jot-tools{margin:0px;padding:0px;width:100%;height:35px;overflow:none;}#jot #jot-tools span{float:left;margin:10px 20px 2px 0px;}#jot #jot-tools span a{display:block;}
 #jot #jot-tools .perms{float:right;width:40px;}
-#jot #jot-tools li.loading{float:right;background-color:#ffffff;width:20px;vertical-align:center;text-align:center;border-top:2px solid #9eabb0;height:38px;}#jot #jot-tools li.loading img{margin-top:10px;}
-#jot #jot-title{border:1px solid #ccc;margin:0 0 5px;height:20px;width:90%;font-weight:bold;border-radius:5px;vertical-align:middle;}
-#jot-category{margin:5px 0;border-radius:5px;border:1px #999 solid;color:#aaa;font-size:smaller;}#jot-category:focus{color:#eee;}
-#jot #character-counter{width:6%;float:right;text-align:right;height:15px;line-height:20px;padding:2px 20px 5px 0;}
-#profile-jot-text_parent{box-shadow:5px 0 10px 0 #111;}
+#jot #jot-tools li.loading{float:right;background-color:white;width:20px;height:38px;vertical-align:center;text-align:center;border-top:2px solid #9eabb0;}#jot #jot-tools li.loading img{margin-top:10px;}
+#jot #jot-title{border:1px solid #cdcdcd;margin:0 0 5px;width:90%;height:20px;font-weight:bold;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;vertical-align:middle;}
+#jot-category{margin:5px 0;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #9a9a9a;color:#a9a9a9;font-size:smaller;}#jot-category:focus{color:#eeeeee;}
+#jot #character-counter{width:6%;height:15px;float:right;text-align:right;line-height:20px;padding:2px 20px 5px 0;}
+#profile-jot-text_parent{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;}
 #profile-jot-text_tbl{margin-bottom:10px;background:#777;}
 #profile-jot-text_ifr{width:99.900002% !important;}
 #profile-jot-text_toolbargroup,.mceCenter tr{background:#777;}
-[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eec;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eec;}
+[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;}
 .defaultSkin tr.mceFirst{background:#777;}
-.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eec;}
-.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eec;}
+.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeecc;}
+.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeecc;}
 #profile-attach-wrapper,#profile-audio-wrapper,#profile-link-wrapper,#profile-location-wrapper,#profile-nolocation-wrapper,#profile-title-wrapper,#profile-upload-wrapper,#profile-video-wrapper{float:left;margin:0 20px 0 0;}
 #profile-rotator-wrapper{float:right;}
-#profile-jot-tools-end,#profile-jot-banner-end{clear:both;}
 #profile-jot-email-wrapper{margin:10px 10% 0;border:1px solid #555753;border-bottom:0;}
-#profile-jot-email-label{background-color:#555753;color:#ccccce;padding:5px;}
+#profile-jot-email-label{background-color:#555753;color:#eeeecc;padding:5px;}
 #profile-jot-email{width:90%;margin:5px;}
 #profile-jot-networks{margin:0 10%;border:1px solid #555753;border-top:0;border-bottom:0;padding:5px;}
 #profile-jot-net{margin:5px 0;}
 #jot-preview-link{margin:0 0 0 10px;border:0;text-decoration:none;float:right;}
 .icon-text-preview{margin:0 0 -18px 0;display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat -128px -40px;border:0;text-decoration:none;float:right;cursor:pointer;}
-#profile-jot-perms{float:right;background-color:#555753;height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0px;margin:0 10px 0 10px;}
+#profile-jot-perms{float:right;background-color:#555753;width:22px;height:22px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;border:0px;margin:0 10px 0 10px;}
 #profile-jot-plugin-wrapper{width:1px;margin:10px 0 0 0;float:right;}
-#profile-jot-submit-wrapper{float:right;width:100%;list-style:none;margin:10px 0 0 0;padding:0;}
-#profile-jot-submit{height:auto;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:2px outset #222420;margin:0;float:right;text-shadow:1px 1px #111;width:auto;}#profile-jot-submit:active{box-shadow:0 0 0 0;}
-#jot-perms-icon{height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0;}
-#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;display:block !important;}
-#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{width:47%;float:left;}
-#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;float:right;}
-#acl-permit-text{background-color:#555753;color:#ccccce;padding:5px;float:left;}
-#jot-public{background-color:#555753;color:#ff0000;padding:5px;float:left;}
-#acl-deny-text{background-color:#555753;color:#ccccce;padding:5px;float:left;}
-#acl-permit-text-end,#acl-deny-text-end{clear:both;}
-#jot-title-desc{color:#ccc;}
+#profile-jot-submit-wrapper{float:right;width:100%;margin:10px 0 0 0;padding:0;}
+#profile-jot-submit{height:auto;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:2px outset #2e3436;margin:0;float:right;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;width:auto;}#profile-jot-submit:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
+#jot-perms-icon{width:20px;height:22px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;}
+#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555555;border-top:0;display:block !important;border:1px solid #555753 solid #eeeecc;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}
+#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper,#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;}
+#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{float:left;}
+#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{float:right;}
+#acl-permit-text{background-color:#555555;color:#eeeecc;padding:5px;float:left;}
+#jot-public{background-color:#555555;color:#ff0000;padding:5px;float:left;}
+#acl-deny-text{background-color:#555555;color:#eeeecc;padding:5px;float:left;}
+#jot-title-desc{color:#cdcdcd;}
 #profile-jot-desc{color:#ff2000;margin:5px 0;}
 #jot-title-wrapper{margin-bottom:5px;}
 #jot-title-display{font-weight:bold;}
 .jothidden{display:none;}
-#jot-preview-content{background-color:#3e3f3e;color:#eec;border:1px #eec solid;border-radius:5px;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;border-radius:0px;}
+#jot-preview-content{background-color:#2e302e;color:#eeeecc;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;}
 #sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
 .tabs{list-style:none;margin:10px 0;padding:0;}.tabs li{display:inline;font-size:smaller;font-weight:bold;}
-.tab{border:1px solid #729fcf;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#88a9d2;color:#2e2f2e;}
-.tab.active{background:#88a9d2;color:#2e2f2e;}.tab.active a{color:#2e2f2e;}
+.tab{border:1px solid #88a9d2;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#88a9d2;color:#2e2f2e;}
+.tab.active{background:#eeeecc;color:#2e2f2e;}.tab.active a{color:#2e2f2e;}
 .tab a{border:0;text-decoration:none;}
-.wall-item-outside-wrapper{border:1px solid #aaa;border-radius:5px;box-shadow:5px 0 10px 0 #111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
+.wall-item-outside-wrapper{border:1px solid #aaaaaa;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
 .wall-item-outside-wrapper-end{clear:both;}
 .wall-item-content-wrapper{position:relative;padding:10px;width:auto;}
 .wall-item-outside-wrapper .wall-item-comment-wrapper{}
-.shiny{background:#2e3436;border-radius:5px;}
-.wall-outside-wrapper .shiny{border-radius:5px;}
+.shiny{background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
+.wall-outside-wrapper .shiny{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 .heart{color:red;}
 .wall-item-content{overflow-x:auto;margin:0px 15px 0px 5px;}
 [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:15px 0 0 0;padding:0px;}
 .wall-item-photo-menu{display:none;}
-.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;height:20px;width:90px;top:85px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
 .wall-item-info{float:left;width:110px;}
-.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
-.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}
-.wall-item-subtools1{height:30px;list-style:none outside none;margin:20px 0 30px -20px;padding:0;width:30px;}
+.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}
+.wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:20px 0 30px -20px;padding:0;}
 .wall-item-subtools2{height:25px;list-style:none outside none;margin:-75px 0 0 5px;padding:0;width:25px;}
 .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1em;}
 .wall-item-body{margin:20px 20px 10px 0px;text-align:left;overflow-x:auto;}
-.wall-item-lock-wrapper{float:right;height:22px;margin:0 -5px 0 0;width:22px;opacity:1;}
+.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
 .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#878883;margin:5px 0 5px 120px;}
 .wall-item-author,.wall-item-actions-author{clear:left;font-size:0.8em;color:#878883;margin:20px 20px 0 110px;}
 .wall-item-ago{display:inline;padding-left:10px;}
@@ -188,8 +189,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;width:30px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;}
 .wallwall .wall-item-photo-end{clear:both;}
 .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
-.wall-item-photo-menu{min-width:92px;border:2px solid #FFFFFF;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-webkit-border-radius:0px 5px 5px 5px;-moz-border-radius:0px 5px 5px 5px;border-radius:0px 5px 5px 5px;}.wall-item-photo-menu ul{margin:0px;padding:0px;list-style:none;}
-.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
+.wall-item-photo-menu{min-width:92px;border:2px solid #ffffff;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;}
 #item-delete-selected{overflow:auto;width:100%;}
 #connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
 .ccollapse-wrapper{font-size:0.9em;margin-left:80px;}
@@ -202,16 +202,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;}
 .comment-wwedit-wrapper{}
 .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;}
+[class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;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{margin-left:10px;}
 .my-comment-photo{width:40px;height:40px;padding:5px;}
 [class^="comment-edit-text"]{margin:5px 0 10px 20px;width:84.5%;}
 .comment-edit-text-empty{height:20px;border:2px #c8bebe solid;border-radius:5px;color:#c8bebe;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}.comment-edit-text-empty:hover{color:#999999;}
-.comment-edit-text-full{height:10em;border-radius:5px;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}
+.comment-edit-text-full{height:10em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}
 .comment-edit-submit-wrapper{width:90%;margin:5px 5px 10px 50px;text-align:right;}
-.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:0;}
-.wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#2e2f2e;width:95%;}
+.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;}
+.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;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#adc4e0;}
 div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
 div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
 .profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
@@ -223,14 +223,13 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #advanced-profile-with{margin-left:200px;}
 .photos{height:auto;overflow:auto;}
 #photo-top-links{margin-bottom:30px;}
-.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;background-color:#222;color:#2e2f2e;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;}
+.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;background-color:#222;color:#2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;}
 #photo-photo{max-width:100%;}#photo-photo img{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{-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
-.photo-top-album-name{position:absolute;bottom:0;padding:0 5px;}
-.caption{position:absolute;bottom:0;margin:0 5px;}
+.photo-top-photo,.photo-album-photo{-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
+.photo-top-album-name,.caption{position:absolute;bottom:0;padding:0 5px;}
 #photo-photo{position:relative;float:left;}
-#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
+#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background:#ffffff center center no-repeat;opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
 #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;}
@@ -239,7 +238,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #photo-next-link .icon{display:none;}
 #photo-prev-link .icon{display:none;}
 #photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;}
-#photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeec;padding:1px;}
+#photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeee;padding:1px;}
 #photos-upload-album-select,#photos-upload-newalbum{width:99%;}
 #photos-upload-perms-menu{text-align:right;}
 #photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;}
@@ -251,7 +250,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #photo-edit-end{margin-bottom:35px;}
 #photo-caption{font-size:110%;font-weight:bold;margin-top:15px;margin-bottom:15px;}
 .prvmail-text{width:100%;}
-#prvmail-subject{width:100%;color:#2e2f2e;background:#eec;}
+#prvmail-subject{width:100%;color:#2e2f2e;background:#eeeecc;}
 #prvmail-submit-wrapper{margin-top:10px;}
 #prvmail-submit{float:right;margin-top:0;}
 #prvmail-submit-wrapper div{margin-right:5px;float:left;}
@@ -263,7 +262,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .mail-list-sender-name,.mail-list-date{font-style:italic;}
 .mail-list-subject{font-size:1.2em;}
 .mail-list-delete-wrapper{float:right;}
-.mail-list-outside-wrapper-end{clear:both;border-bottom:1px #eec dotted;}
+.mail-list-outside-wrapper-end{clear:both;border-bottom:1px #eeeecc dotted;}
 .mail-conv-sender{float:left;margin:0px 5px 5px 0px;}
 .mail-conv-sender-photo{width:32px;height:32px;}
 .mail-conv-sender-name{float:left;}
@@ -277,27 +276,27 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .contact-entry-photo{margin-left:20px;}
 .contact-entry-name{width:120px;font-weight:bold;}
 .contact-entry-photo{position:relative;}
-.contact-entry-edit-links .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background-color:#fff;}
-#contact-entry-url,[id^="contact-entry-url"]{font-size:smaller;}
-#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;font-style:italic;}
+.contact-entry-edit-links .icon{border:1px solid #babdb6;-o-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;background-color:#fff;}
+#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;}
 #contact-edit-photo-wrapper{position:relative;float:left;padding:20px;}
 #contact-edit-direction-icon{position:absolute;top:60px;left:0;}
 #contact-edit-nav-wrapper{margin-left:0px;}
-#contact-edit-links{margin-top:23px;}#contact-edit-links ul{list-style-type:none;}
+#contact-edit-links{margin-top:23px;}#contact-edit-links ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}
 #contact-drop-links{margin-left:5px;}
-#contact-edit-nav-wrapper .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+#contact-edit-nav-wrapper .icon{border:1px solid #babdb6;-o-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;}
 #contact-edit-poll-wrapper{margin-left:0px;}
 #contact-edit-last-update-text{margin-bottom:15px;}
 #contact-edit-last-updated{font-weight:bold;}
 #contact-edit-poll-text{display:inline;}
 #contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
 #contact-edit-end{clear:both;margin-bottom:65px;}
-.contact-photo-menu-button{position:absolute;background-image:url("dark/photo-menu.jpg");background-position:top left;background-repeat:no-repeat;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;}
-.contact-photo-menu{width:auto;border:2px solid #444;background:#2e2f2e;color:#eec;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu ul{margin:0px;padding:0px;list-style:none;}
+.contact-photo-menu-button{position:absolute;background:url("dark/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;}
+.contact-photo-menu{width:auto;border:2px solid #444;background:#2e2f2e;color:#eeeecc;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu ul{margin:0px;padding:0px;list-style:none;}
 .contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:#fff;background:#3465A4;text-decoration:none;}
 #id_openid_url{background:url(dark/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
-#settings-nickname-desc{background-color:#eec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding:5px;color:#111;}
+#settings-nickname-desc{background-color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;color:#111;}
 #settings-default-perms{margin-bottom:20px;}
 #register-form div,#profile-edit-form div{clear:both;}
 .settings-block label{clear:left;}
@@ -307,19 +306,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .profile-edit-side-div{display:none;}
 #profiles-menu-trigger{margin:0px 0px 0px 25px;}
 .profile-listing{float:left;margin:20px 20px 0px 0px;}
-.icon-profile-edit{background:url("dark/icons.png") -150px 0px no-repeat;border:0;cursor:pointer;display:block;float:right;width:20px;height:20px;margin:0 0 -18px;position:absolute;text-decoration:none;top:113px;right:260px;}
-#profile-edit-links ul{margin:20px 0;padding:0;list-style:none;}
+.icon-profile-edit{background:url("dark/icons.png") -150px 0px no-repeat;border:0;cursor:pointer;display:block;width:20px;height:20px;margin:0 0 -18px;text-decoration:none;top:113px;right:260px;}
+#profile-edit-links ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:20px 0;}
 .marital{margin-top:5px;}
 #register-sitename{display:inline;font-weight:bold;}
-#advanced-expire-popup{background:#2e2f2e;color:#eec;}
+#advanced-expire-popup{background:#2e2f2e;color:#eeeecc;}
 #id_ssl_policy{width:374px;}
 #theme-preview img{margin:10px 10px 10px 288px;}
 .group-delete-wrapper{margin:-31px 50px 0 0;float:right;}
 #group-edit-submit-wrapper{margin:0 0 10px 0;display:inline;}
 #group-edit-desc{margin:10px 0px;}
-#group-members,#prof-members{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
-#group-all-contacts,#prof-all-contacts{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
-#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#eeeeec;background-color:#555753;margin:0;padding:5px;}
+#group-members,#prof-members{height:200px;overflow:auto;border:1px solid #555753;-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
+#group-all-contacts,#prof-all-contacts{height:200px;overflow:auto;border:1px solid #555753;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#eeeeee;background-color:#555753;margin:0;padding:5px;}
 #group-separator,#prof-separator{display:none;}
 #cropimage-wrapper{float:left;}
 #crop-image-form{clear:both;}
@@ -349,7 +348,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .prevcal,.nextcal{float:left;margin-left:32px;margin-right:32px;margin-top:64px;}
 .event-calendar-end{clear:both;}
 .calendar{font-family:monospace;}
-.today{font-weight:bold;color:#FF0000;}
+.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;}
 #event-datetime-break{margin-bottom:10px;}
@@ -366,28 +365,28 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #item-delete-selected-end{clear:both;}
 #item-delete-selected-icon{float:left;margin-right:5px;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
-.fc-state-highlight{background:#eec;color:#2e2f2e;}
+.fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
 .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
 #group-sidebar{margin-bottom:10px;}
-.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#88a9d2;font-weight:bold;}
-.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{color:#2e2f2e;}
+.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#eeeecc;font-weight:bold;}
+.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{color:#88a9d2;background:#2e2f2e;}
 .groupsideedit{margin-right:10px;}
 #sidebar-group-ul{padding-left:0;}
-#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list ul{list-style-type:none;list-style-position:inside;}
-#sidebar-group-list li{margin-top:10px;}
-#sidebar-group-list .icon{display:inline-block;height:12px;width:12px;}
+#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
+#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
+.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#2e2f2e;background:#88a9d2;font-weight:bold;padding:3px;}
 #sidebar-new-group{margin:auto;display:inline-block;color:#efefef;text-decoration:none;text-align:center;}
 #peoplefind-sidebar form{margin-bottom:10px;}
 #sidebar-new-group:hover{}
 #sidebar-new-group:active{position:relative;top:1px;}
-#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
-.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
+#side-peoplefind-url{background-color:#2e2f2e;color:#eeeecc;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
+.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
 .nets-link,.nets-all{margin-left:0px;}
 #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
 #pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
 .admin.linklist{border:0;padding:0;}
-.admin.link{list-style-position:inside;}
-#adminpage{color:#eec;background:#2e2f2e;margin:5px;padding:10px;}#adminpage dl{clear:left;margin-bottom:2px;padding-bottom:2px;border-bottom:1px solid #000;}
+.admin.link{margin:0px;padding:0px;list-style:none;list-style-position:inside;}
+#adminpage{color:#eeeecc;background:#2e2f2e;margin:5px;padding:10px;}#adminpage dl{clear:left;margin-bottom:2px;padding-bottom:2px;border-bottom:1px solid #000;}
 #adminpage dt{width:250px;float:left;font-weight:bold;}
 #adminpage dd{margin-left:250px;}
 #adminpage h3{border-bottom:1px solid #ccc;}
@@ -398,27 +397,26 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #adminpage table{width:100%;border-bottom:1px solid #000;margin:5px 0;}#adminpage table th{text-align:left;}
 #adminpage td .icon{float:left;}
 #adminpage table#users img{width:16px;height:16px;}
-#adminpage table tr:hover{color:#2e2f2e;background-color:#eec;}
 #adminpage .selectall{text-align:right;}
-#adminpage #users a{color:#eec;text-decoration:underline;}
-#users .name{color:#eec;}
-.field{overflow:auto;}.field label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #2e2f2e solid;padding:5px;background:#eec;color:#111;}
+#adminpage #users a{color:#eeeecc;text-decoration:underline;}
+#users .name{color:#eeeecc;}
+.field{overflow:auto;}.field label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #2e2f2e solid;padding:5px;background:#eeeecc;color:#111;}
 .field .onoff{float:right;margin:0 330px 0 auto;width:80px;}.field .onoff a{display:block;border:1px solid #666;padding:3px 6px 4px 10px;height:16px;text-decoration:none;}
-.field .onoff .on{background:url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;color:#111;text-align:left;}
-.field .onoff .off{background:url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;color:#333;text-align:right;}
+.field .onoff .on,.field .onoff .off{background-image:url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q==');background-repeat:no-repeat;}
+.field .onoff .on{background-position:42px 1px;background-color:#999;color:#111;text-align:left;}
+.field .onoff .off{background-position:2px 1px;background-color:#ccc;color:#333;text-align:right;}
 .hidden{display:none !important;}
 .field textarea{width:80%;height: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;border:1px #2e2f2e solid;padding:5px;background:#eec;color:#111;}
-input{width:250px;height:25px;border:1px #999 solid;}input[type="text"],input[type="password"],input[type="search"]{width:250px;height:25px;border:1px #999 solid;}
-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;border:2px outset #aaa;border-radius:5px;box-shadow:1px 3px 4px 0 #111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;text-shadow:1px 1px #000;-webkit-border-radius:5px;-moz-border-radius:5px;}
-input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;}
+label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:5px;background:#eeeecc;color:#111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
+input{width:250px;height:25px;border:1px solid #999999;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;}
+input[type="submit"],input[type="button"]{background-color:#eee;border:2px outset #aaaaaa;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;}
+input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
 .popup{width:100%;height:100%;top:0px;left:0px;position:absolute;display:none;}.popup .background{background-color:#000;opacity:0.5;width:100%;height:100%;position:absolute;top:0px;left:0px;}
 .popup .panel{top:25%;left:25%;width:50%;height:50%;padding:1em;position:absolute;border:4px solid #000000;background-color:#FFFFFF;}
 #panel{z-index:100;}
-.grey{color:grey;}
+.grey,.gray{color:gray;}
 .orange{color:orange;}
 .red{color:red;}
 .popup .panel .panel_text{display:block;overflow:auto;height:80%;}
@@ -428,9 +426,9 @@ input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;}
 .oauthapp{height:auto;overflow:auto;border-bottom:2px solid #cccccc;padding-bottom:1em;margin-bottom:1em;}.oauthapp img{float:left;width:48px;height:48px;margin:10px;}.oauthapp img.noicon{background-image:url("../../../images/icons/48/plugin.png");background-position:center center;background-repeat:no-repeat;}
 .oauthapp a{float:left;}
 .iconspacer{display:block;width:16px;height:16px;}
-.icon{display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat;border:0;text-decoration:none;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
+.icon{display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat;border:0;text-decoration:none;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
 .editicon{display:inline-block;width:21px;height:21px;background:url(dark/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;}
+.shadow{-moz-box-shadow:2px 2px 5px 2px #111111;-o-box-shadow:2px 2px 5px 2px #111111;-webkit-box-shadow:2px 2px 5px 2px #111111;-ms-box-shadow:2px 2px 5px 2px #111111;box-shadow:2px 2px 5px 2px #111111;}.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;}
@@ -483,7 +481,7 @@ input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;}
 .next{background-position:-110px -60px;}
 .icon.dim{opacity:0.3;}
 #pause{position:fixed;bottom:40px;right:30px;}
-.border{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.border:hover{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.border{border:1px solid #babdb6;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.border:hover{border:1px solid #babdb6;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 .attachtype{display:block;width:20px;height:23px;background-image:url(../../../images/content-types.png);}
 .type-video{background-position:0px 0px;}
 .type-image{background-position:-20px 0;}
@@ -492,25 +490,25 @@ input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;}
 .type-unkn{background-position:-80px 0;}
 .cc-license{margin-top:100px;font-size:0.7em;}
 footer{display:block;clear:both;}
-#profile-jot-text{height:20px;color:#eec;border:1px solid #eec;border-radius:5px;width:99.5%;}
-#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eec;}
+#profile-jot-text{height:20px;color:#eeeecc;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
+#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;}
 #acl-wrapper{width:660px;margin:0 auto;}
 #acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111;}
-#acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;color:#999;margin:5px 0;}#acl-showall.selected{color:#000;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;}
+#acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#999;margin:5px 0;}#acl-showall.selected{color:#000;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;}
-.acl-list-item{border:1px solid #eec;display:block;float:left;height:110px;margin:3px 0 5px 5px;width:120px;}.acl-list-item img{width:22px;height:22px;float:left;margin:5px 5px 20px;}
+.acl-list-item{border:1px solid #eeeecc;display:block;float:left;height:110px;margin:3px 0 5px 5px;width:120px;}.acl-list-item img{width:22px;height:22px;float:left;margin:5px 5px 20px;}
 .acl-list-item p{height:12px;font-size:10px;margin:0 0 22px;padding:2px 0 1px;}
-.acl-list-item a{background:#eeeecc 3px 3px no-repeat;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;clear:both;font-size:10px;display:block;width:55px;height:20px;color:#2e2f2e;margin:5px auto 0;padding:0 3px;text-align:center;vertical-align:middle;}
+.acl-list-item a{background:#eeeecc 3px 3px no-repeat;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;clear:both;font-size:10px;display:block;width:55px;height:20px;color:#2e2f2e;margin:5px auto 0;padding:0 3px;text-align:center;vertical-align:middle;}
 #acl-wrapper a:hover{text-decoration:none;color:#2e2f2e;border:0;}
-.acl-button-show{background-image:url('../../../images/show_off.png');margin:0 auto;}
-.acl-button-hide{background-image:url('../../../images/hide_off.png');margin:0 auto;}
-.acl-button-show.selected{color:#2e2f2e;background-color:#9ade00;background-image:url(../../../images/show_on.png);}
-.acl-button-hide.selected{color:#2e2f2e;background-color:#ff4141;background-image:url(../../../images/hide_on.png);}
+.acl-button-show{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg==');margin:0 auto;}
+.acl-button-hide{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII=');margin:0 auto;}
+.acl-button-show.selected{background:#9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII=');color:#2e2f2e;}
+.acl-button-hide.selected{background:#ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg==');color:#2e2f2e;}
 .acl-list-item.groupshow{border-color:#9ade00;}
 .acl-list-item.grouphide{border-color:#ff4141;}
 .acpopup{max-height:175px;max-width:42%;background-color:#555753;color:#fff;overflow:auto;z-index:100000;border:1px solid #cccccc;}
 .acpopupitem{background-color:#555753;padding:4px;clear:left;}.acpopupitem img{float:left;margin-right:4px;}
-.acpopupitem.selected{color:#2e302e;background-color:#eeeeec;}
+.acpopupitem.selected{color:#2e302e;background-color:#eeeeee;}
 .qcomment-wrapper{padding:0px;margin:5px 5px 5px 81%;}
 .qcomment{opacity:0.5;}.qcomment:hover{opacity:1.0;}
 #network-star-link{margin-top:10px;}
@@ -519,4 +517,4 @@ footer{display:block;clear:both;}
 #sidebar-page-list ul{padding:0;margin:5px 0;}
 #sidebar-page-list li{list-style:none;}
 #jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;}
-@media handheld{body{font-size:15pt;}}
+@media handheld{body{font-size:15pt;}}@media only screen and (min-device-width:320px) and (max-device-width:480px){body{font-size:10px;}}@media only screen and (min-width:321px){body{font-size:10px;}}@media only screen and (max-width:320px){body{font-size:10px;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px){body{font-size:16px;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:landscape){body{font-size:16px;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait){body{font-size:16px;}}@media only screen and (min-width:1024px){body{font-size:16px;}}@media only screen and (min-width:1520px){body{font-size:18px;}}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-device-pixel-ratio:1.5){body{font-size:16px;}}.test{color:#88a9d2;background-color:#cdcdcd;}
index 41fd2c8aa298665ed0c44e1133af38511be0edbf..6d76044bacc6cee53e4f8079400f84036238462a 100644 (file)
 /* from html5boilerplate */
 /* these are to tell browsers they should be displayed a certain way */
 
-article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
-  display: block; }
-
-audio, canvas, video, time {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1; }
-
+@import "_base";
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+       display: block;
+}
+audio,
+canvas,
+video,
+time {
+       display: inline-block;
+       *display: inline;
+       *zoom: 1;
+}
 audio:not([controls]), [hidden] {
-  display: none; }
-
-/* 
- *  Base
- */
+       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
+ * 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: 100%;
+       overflow-y: scroll;
+       -webkit-text-size-adjust: 100%;
+       -ms-text-size-adjust: 100%;
+}
 body {
-  margin: 0;
-  font-size: 16px;
-  line-height: 1.1em;
-  font-family: sans-serif;
-  color: #eec;
-  background-color: #2e2f2e; }
-
+       margin: 0;
+       padding: 0;
+       .default_font;
+       color: @main_colour;
+       background-color: @bg_colour;
+}
 button, input, select, textarea {
-  font-family: sans-serif;
-  color: #eec;
-  background-color: #2e2f2e; }
-
+       color: @main_colour;
+       background-color: @bg_colour;
+}
 select {
-  border: 1px #555 dotted;
-  padding: 3px;
-  margin: 3px;
-  color: #eec;
-  background: #2e2f2e; }
-
+       border: 1px #555 dotted;
+       padding: 1px;
+       margin: 3px;
+       color: @main_colour;
+       background: @bg_colour;
+}
 option {
-  padding: 3px;
-  color: #eec;
-  background: #2e2f2e;
-  &[selected="selected"] {
-    color: #2e2f2e;
-    background: #eec; } }
-
+       padding: 1px;
+       color: @main_colour;
+       background: @bg_colour;
+       &[selected="selected"] {
+               color: @bg_colour;
+               background: @main_colour;
+       }
+}
 ul, ol {
-  padding: 0; }
-
+       .list_reset;
+}
+tr:nth-child(even) {
+       background-color: lighten(@bg_colour, 10%);
+}
 /* remember to define focus styles! */
-
 :focus {
-  outline: 0; }
-
+       outline: 0;
+}
 [disabled="disabled"] {
-  background: #4e4f4f;
-  color: #ddb; }
-
+       background: @med_bg_colour;
+       color: @disabled_colour;
+}
 /* remember to highlight inserts somehow! */
-
+ins, mark {
+       background-color: @bg_alt_colour;
+       color: @lt_main_colour;
+}
 ins {
-  background-color: #2e302e;
-  color: #ff9;
-  text-decoration: none; }
-
+       text-decoration: none;
+}
 mark {
-  background-color: #2e302e;
-  color: #ff9;
-  font-style: italic;
-  font-weight: bold; }
-
+       font-style: italic;
+       font-weight: bold;
+}
 /* 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; }
-
+       font-family: monospace, monospace;
+       _font-family: monospace;
+       font-size: 1em;
+}
 /* Improve readability of pre-formatted text in all browsers */
-
 pre, .wall-item-body code {
-  white-space: pre;
-  white-space: pre-wrap;
-  word-wrap: break-word; }
-
+       .wrap;
+}
 q {
-  quotes: none;
-  &:before, &:after {
-    content: "";
-    content: none; } }
-
+       quotes: none;
+       &:before, &:after {
+               content: "";
+               content: none;
+       }
+}
 small {
-  font-size: 85%; }
-
+       font-size: 85%;
+}
 /* Position subscript and superscript content without affecting line-height: h5bp.com/k */
-
 sub, sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
+       font-size: 75%;
+       line-height: 0;
+       position: relative;
+       vertical-align: baseline;
+}
 sub {
-  bottom: -0.25em; }
-
+       bottom: -0.25em;
+}
 sup {
-  top: -0.5em; }
-
+       top: -0.5em;
+}
 img {
-  border: 0 none; }
-
+       border: 0 none;
+}
 a {
-  color: #88a9d2;
-  text-decoration: none;
-  margin-bottom: 1px;
-  &:hover img {
-    text-decoration: none; } }
-
+       color: @link_colour;
+       text-decoration: none;
+       margin-bottom: 1px;
+       &:hover {
+               color: @hover_colour;
+               border-bottom: 1px dotted @hover_colour;
+       }
+       &:hover img {
+               text-decoration: none;
+       }
+}
 blockquote {
-  background: #444;
-  color: #eec;
-  text-indent: 5px;
-  padding: 5px;
-  border: 1px #aaa solid;
-  border-radius: 5px; }
-
-a:hover {
-  color: #729fcf;
-  border-bottom: 1px dotted #729fcf; }
-
+       background: #444;
+       color: @main_colour;
+       text-indent: 5px;
+       padding: 5px;
+       border: 1px #aaa solid;
+       .rounded_corners;
+}
 .required {
-  display: inline;
-  color: #ff0;
-  font-size: 16px;
-  font-weight: bold;
-  margin: 3px; }
-
+       display: inline;
+       color: #ff0;
+       font-size: 16px;
+       font-weight: bold;
+       margin: 3px;
+}
 .fakelink, .lockview {
-  color: #729fcf;
-  cursor: pointer; }
-
+       color: @link_colour;
+       cursor: pointer;
+}
 .fakelink:hover {
-  color: #729fcf; }
-
+       color: @hover_colour;
+}
 .smalltext {
-  font-size: 0.7em; }
-
+       font-size: 0.7em;
+}
 #panel {
-  position: absolute;
-  font-size: 0.8em;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  border: 1px solid #fff;
-  background-color: #2e302e;
-  color: #eeeeec;
-  padding: 1em; }
-
+       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; } }
-
+       margin-top: 60px;
+       display: block;
+       clear: both;
+       text-align: center;
+       span {
+               padding: 4px;
+               margin: 4px;
+       }
+}
 .pager_current {
-  background-color: #729fcf;
-  color: #fff; }
+       background-color: @link_colour;
+       color: @main_alt_colour;
+}
+
 
 /**
  * global
  */
 /* .tool .action */
-
 .action {
-  margin: 5px 0; }
-
+       margin: 5px 0;
+}
 .tool {
-  margin: 5px 0;
-  list-style: none; }
-
+       margin: 5px 0;
+       list-style: none;
+}
 #articlemain {
-  width: 100%;
-  height: 100%;
-  margin: 0 auto; }
+       .box(100%, 100%);
+       margin: 0 auto;
+}
+[class$="-desc"], [id$="-desc"] {
+       color: @bg_colour;
+       background: @main_colour;
+       .rounded_corners;
+       .box_shadow(3px, 3px, 5px);
+       padding: 3px;
+       margin: 5px 0;
+       font-weight: bold;
+}
+
 
 /**
  * login
  */
-
 #asidemain .field {
-  overflow: hidden;
-  width: 200px; }
-
+       overflow: hidden;
+       width: 200px;
+}
 #login-extra-links {
-  overflow: auto !important;
-  padding-top: 60px !important;
-  width: 100% !important;
-  a {
-    margin-right: 20px; } }
-
+       overflow: auto !important;
+       padding-top: 60px !important;
+       width: 100% !important;
+       a {
+               margin-right: 20px;
+       }
+}
 #login_standard {
-  display: block !important;
-  float: none !important;
-  height: 100% !important;
-  position: relative !important;
-  width: 100% !important;
-  .field label {
-    width: 200px !important; }
-  input {
-    margin: 0 0 8px !important;
-    width: 210px !important;
-    &[type="text"] {
-      margin: 0 0 8px !important;
-      width: 210px !important; } } }
-
+       display: block !important;
+       float: none !important;
+       height: 100% !important;
+       position: relative !important;
+       width: 100% !important;
+       .field label {
+               width: 200px !important;
+       }
+       input {
+               margin: 0 0 8px !important;
+               width: 210px !important;
+               &[type="text"] {
+                       margin: 0 0 8px !important;
+                       width: 210px !important; }
+       }
+}
 #login-submit-wrapper {
-  margin: 0 !important; }
-
+       margin: 0 !important;
+}
 #login-submit-button {
-  margin-left: 0px !important; }
-
+       margin-left: 0px !important;
+}
 #asidemain #login_openid {
-  position: relative !important;
-  float: none !important;
-  margin-left: 0px !important;
-  height: auto !important;
-  width: 200px !important; }
-
+       position: relative !important;
+       float: none !important;
+       margin-left: 0px !important;
+       height: auto !important;
+       width: 200px !important;
+}
 #login_openid {
-  #id_openid_url {
-    width: 180px !important;
-    overflow: hidden !important; }
-  label {
-    width: 180px !important; } }
+       #id_openid_url {
+               width: 180px !important;
+               overflow: hidden !important; }
+       label {
+               width: 180px !important;
+       } }
+
 
 /**
  * nav
  */
-
 nav {
-  height: 60px;
-  background-color: #1d1f1d;
-  color: #eeeeec;
-  position: relative;
-  padding: 20px 20px 10px 95px;
-  a {
-    text-decoration: none;
-    color: #eeeeec;
-    border: 0px;
-    &:hover {
-      text-decoration: none;
-      color: #eeeeec;
-      border: 0px; } }
-  #banner {
-    display: block;
-    position: absolute;
-    left: 51px;
-    top: 25px;
-    #logo-text a {
-      font-size: 40px;
-      font-weight: bold;
-      margin-left: 3px; } } }
-
+       height: 60px;
+       background-color: @dk_bg_colour;
+       color: @main_alt_colour;
+       position: relative;
+       padding: 20px 20px 10px 95px;
+       a {
+               text-decoration: none;
+               color: @main_alt_colour;
+               border: 0px;
+               &:hover {
+                       text-decoration: none;
+                       color: @main_alt_colour;
+                       border: 0px; } }
+       #banner {
+               display: block;
+               position: absolute;
+               left: 51px;
+               top: 25px;
+               #logo-text a {
+                       font-size: 40px;
+                       font-weight: bold;
+                       margin-left: 3px; } }
+}
 ul#user-menu-popup {
-  display: none;
-  position: absolute;
-  background-color: #555753;
-  width: 100%;
-  padding: 10px 0px;
-  margin: 0px;
-  top: 20px;
-  left: 0;
-  -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;
-  li {
-    display: block;
-    a {
-      display: block;
-      padding: 5px;
-      &:hover {
-        color: #2e302e;
-        background-color: #eeeeec; }
-      &.nav-sep {
-        border-top: 1px solid #eeeeec; } } } }
-
+       display: none;
+       position: absolute;
+       background-color: @menu_bg_colour;
+       width: 100%;
+       padding: 10px 0px;
+       margin: 0px;
+       top: 20px;
+       left: 0;
+       .rounded_corners(0 0 5px 5px);
+       .box_shadow(5px, 5px, 10px, 0px);
+       z-index: 10000;
+       li {
+               display: block;
+               a {
+                       display: block;
+                       padding: 5px;
+                       &:hover {
+                               color: @main_colour;
+                               background-color: @bg_alt_colour;
+                       }
+                       &.nav-sep {
+                               border-top: 1px solid @bg_alt_colour; } } }
+}
 nav .nav-link {
-  display: inline-block;
-  width: 22px;
-  height: 22px;
-  overflow: hidden;
-  margin: 0px 5px 5px;
-  text-indent: 50px;
-  background: transparent url(dark/icons.png) 0 0 no-repeat; }
-
+       display: inline-block;
+       .box(22px, 22px);
+       overflow: hidden;
+       margin: 0px 5px 5px;
+       text-indent: 50px;
+       background: transparent url(dark/icons.png) 0 0 no-repeat;
+}
 #nav-apps-link {
-  background-position: 0 -66px;
-  &:hover {
-    background-position: -22px -66px; } }
-
+       background-position: 0 -66px;
+       &:hover {
+               background-position: -22px -66px; }
+}
 #nav-community-link, #nav-contacts-link {
-  background-position: 0 -22px;
-  &:hover {
-    background-position: -22px -22px; } }
-
+       background-position: 0 -22px;
+       &:hover {
+               background-position: -22px -22px; }
+}
 #nav-directory-link {
-  background-position: -44px -154px;
-  &:hover {
-    background-position: -66px -154px; } }
-
+       background-position: -44px -154px;
+       &:hover {
+               background-position: -66px -154px; }
+}
 #nav-help-link {
-  background-position: 0 -110px;
-  &:hover {
-    background-position: -22px -110px; } }
-
+       background-position: 0 -110px;
+       &:hover {
+               background-position: -22px -110px; }
+}
 #nav-home-link {
-  background-position: -44px -132px;
-  &:hover {
-    background-position: -66px -132px; } }
-
+       background-position: -44px -132px;
+       &:hover {
+               background-position: -66px -132px; }
+}
 #nav-intro-link {
-  background-position: 0px -190px;
-  &:hover {
-    background-position: -44px -190px; } }
-
+       background-position: 0px -190px;
+       &:hover {
+               background-position: -44px -190px; }
+}
 #nav-login-link, #nav-logout-link {
-  background-position: 0 -88px;
-  &:hover {
-    background-position: -22px -88px; } }
-
+       background-position: 0 -88px;
+       &:hover {
+               background-position: -22px -88px; }
+}
 #nav-messages-link {
-  background-position: -44px -88px;
-  &:hover {
-    background-position: -66px -88px; } }
-
+       background-position: -44px -88px;
+       &:hover {
+               background-position: -66px -88px; }
+}
 #nav-notify-link, #nav-notifications-linkmenu {
-  background-position: -44px -110px; }
-
+       background-position: -44px -110px;
+}
 #nav-notify-link:hover {
-  background-position: -66px -110px; }
-
+       background-position: -66px -110px;
+}
 #nav-network-link {
-  background-position: 0px -177px;
-  &:hover {
-    background-position: -22px -177px; } }
-
+       background-position: 0px -177px;
+       &:hover {
+               background-position: -22px -177px; }
+}
 #nav-search-link {
-  background-position: 0 -44px;
-  &:hover {
-    background-position: -22px -44px; } }
-
-#profile-link, #profile-title, #wall-image-upload, #wall-file-upload, #profile-attach-wrapper, #profile-audio, #profile-link, #profile-location, #profile-nolocation, #profile-title, #jot-title, #profile-upload-wrapper, #profile-video, #profile-jot-submit, #wall-image-upload-div, #wall-file-upload-div, .icon, .hover, .focus, .pointer {
-  cursor: pointer; }
+       background-position: 0 -44px;
+       &:hover {
+               background-position: -22px -44px;
+       }
+}
+#jot-title,
+#profile-link,
+#profile-title,
+#profile-attach-wrapper,
+#profile-audio,
+#profile-link,
+#profile-location,
+#profile-nolocation,
+#profile-title,
+#profile-upload-wrapper,
+#profile-video,
+#profile-jot-submit,
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.icon,
+.hover,
+.focus,
+.pointer {
+       cursor: pointer;
+}
 
 /* popup notifications */
 
 div.jGrowl div {
-  &.notice {
-    background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
-    color: #ffffff;
-    padding-left: 58px; }
-  &.info {
-    background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
-    color: #ffffff;
-    padding-left: 58px; } }
+       &.notice {
+               background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center;
+               color: white;
+               padding-left: 58px;
+               margin-top: 50px;
+       }
+       &.info {
+               background: @info url("../../../images/icons/48/info.png") no-repeat 5px center;
+               color: white;
+               padding-left: 58px;
+               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; }
-  .notif-when {
-    font-size: 0.8em;
-    display: block; }
-  li {
-    word-wrap: normal;
-    border-bottom: 1px solid #000;
-    &:hover {
-      color: black; } }
-  a:hover {
-    color: black;
-    text-decoration: underline; } }
+       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; }
+       .notif-when {
+               font-size: 0.8em;
+               display: block; }
+       li {
+               word-wrap: normal;
+               border-bottom: 1px solid black;
+               &:hover {
+                       color: black; }
+       }
+       a:hover {
+               color: black;
+               text-decoration: underline; }
+}
 
 nav #nav-notifications-linkmenu {
-  &.on .icon.s22.notify, &.selected .icon.s22.notify {
-    background-image: url("../../../images/icons/22/notify_on.png"); } }
-
+       &.on .icon.s22.notify,
+       &.selected .icon.s22.notify {
+               // background-image: url("../../../images/icons/22/notify_on.png");
+               background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");
+       }
+}
 .show {
-  display: block; }
-
+       display: block;
+}
 #notifications {
-  height: 20px;
-  width: 170px;
-  position: absolute;
-  top: -19px;
-  left: 4px; }
-
+       .box(170px, 20px);
+       position: absolute;
+       top: -19px;
+       left: 4px;
+}
 #nav-floater {
-  position: fixed;
-  top: 20px;
-  right: 1%;
-  padding: 5px;
-  background: #1d1f1d;
-  color: transparent;
-  border-radius: 5px;
-  z-index: 100;
-  width: 300px;
-  height: 60px; }
+       position: fixed;
+       top: 20px;
+       right: 1%;
+       padding: 5px;
+       background: @dk_bg_colour;
+       color: transparent;
+       .rounded_corners;
+       z-index: 100;
+       .box(300px, 60px);
+}
 
 #nav-buttons {
-  clear: both;
-  list-style: none;
-  padding: 0px;
-  margin: 0px;
-  height: 25px;
-  > li {
-    padding: 0;
-    display: inline-block;
-    margin: 0px -4px 0px 0px; } }
-
+       clear: both;
+       list-style: none;
+       padding: 0px;
+       margin: 0px;
+       height: 25px;
+       > li {
+               padding: 0;
+               display: inline-block;
+               margin: 0px -4px 0px 0px;
+       }
+}
 .floaterflip {
-  display: block;
-  position: fixed;
-  z-index: 110;
-  top: 56px;
-  right: 19px;
-  width: 22px;
-  height: 22px;
-  overflow: hidden;
-  margin: 0px;
-  background: transparent url(dark/icons.png) -190px -60px no-repeat; }
-
+       display: block;
+       position: fixed;
+       z-index: 110;
+       top: 56px;
+       right: 19px;
+       .box(22px, 22px);
+       overflow: hidden;
+       margin: 0px;
+       background: transparent url(dark/icons.png) -190px -60px no-repeat;
+}
 .search-box {
-  display: inline-block;
-  margin: 5px;
-  position: fixed;
-  right: 0px;
-  bottom: 0px;
-  z-index: 100;
-  background: #1d1f1d;
-  border-radius: 5px; }
-
+       display: inline-block;
+       margin: 5px;
+       position: fixed;
+       right: 0px;
+       bottom: 0px;
+       z-index: 100;
+       background: @dk_bg_colour;
+       .rounded_corners;
+}
 #search-text {
-  border: 1px #eec solid;
-  background: #2e2f2e;
-  color: #eec;
-  font-size: 8pt;
-  margin: 8px;
-  width: 10em;
-  height: 14px; }
-
+       .borders;
+       background: @bg_colour;
+       color: @main_colour;
+       font-size: 8pt;
+       margin: 8px;
+       .box(10em, 14px);
+}
 #scrollup {
-  position: fixed;
-  right: 5px;
-  bottom: 40px;
-  z-index: 100;
-  a:hover {
-    text-decoration: none;
-    border: 0; } }
-
+       position: fixed;
+       right: 5px;
+       bottom: 40px;
+       z-index: 100;
+       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;
-  position: relative;
-  background-color: #555753;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  background: #555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;
-  clear: both;
-  top: 4px;
-  left: 10px;
-  padding: 2px;
-  > a {
-    vertical-align: top; } }
-
+       .box_shadow(5px, 0, 10px, 0);
+       display: block;
+       width: 75%;
+       margin: 3px 0 0 0;
+       position: relative;
+       .rounded_corners;
+       background-color: @menu_bg_colour;
+       background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");
+       background-position: 98% center;
+       background-repeat: no-repeat;
+       clear: both;
+       top: 4px;
+       left: 10px;
+       padding: 2px;
+       > a {
+               vertical-align: top;
+       }
+}
 #user-menu-label {
-  font-size: 12px;
-  padding: 3px 20px 9px 5px;
-  height: 10px; }
-
+       font-size: 12px;
+       padding: 3px 20px 9px 5px;
+       height: 10px;
+}
 .nav-ajax-update, .nav-ajax-left {
-  width: 30px;
-  height: 19px;
-  background: transparent url(dark/notifications.png) 0 0 no-repeat;
-  color: #222;
-  font-weight: bold;
-  font-size: 0.8em;
-  padding-top: 0.2em;
-  text-align: center;
-  float: left;
-  margin: 0 -1px 0 3px;
-  display: block;
-  visibility: hidden; }
-
+       .box(30px, 19px);
+       background: transparent url(dark/notifications.png) 0 0 no-repeat;
+       color: #222;
+       font-weight: bold;
+       font-size: 0.8em;
+       padding-top: 0.2em;
+       text-align: center;
+       float: left;
+       margin: 0 -1px 0 3px;
+       display: block;
+       visibility: hidden;
+}
 .nav-ajax-update.show, .nav-ajax-left.show {
-  visibility: visible; }
-
+       visibility: visible;
+}
 #net-update {
-  background-position: 0px 0px; }
-
+       background-position: 0px 0px;
+}
 #mail-update {
-  background-position: -30px 0; }
-
+       background-position: -30px 0;
+}
 #notify-update {
-  background-position: -60px 0px; }
-
+       background-position: -60px 0px;
+}
 #home-update {
-  background-position: -90px 0px; }
-
+       background-position: -90px 0px;
+}
 #intro-update {
-  background-position: -120px 0px; }
-
+       background-position: -120px 0px;
+}
 #lang-select-icon {
-  cursor: pointer;
-  position: fixed;
-  left: 28px;
-  bottom: 6px;
-  z-index: 10; }
-
+       cursor: pointer;
+       position: fixed;
+       left: 28px;
+       bottom: 6px;
+       z-index: 10;
+}
 #language-selector {
-  position: fixed;
-  bottom: 2px;
-  left: 52px;
-  z-index: 10; }
-
+       position: fixed;
+       bottom: 2px;
+       left: 52px;
+       z-index: 10;
+}
 .menu-popup {
-  position: absolute;
-  display: none;
-  width: 11em;
-  background: #ffffff;
-  color: #2d2d2d;
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  border: 3px solid #364e59;
-  z-index: 100000;
-  -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-  -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-  box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-  a {
-    display: block;
-    color: #2d2d2d;
-    padding: 5px 10px;
-    text-decoration: none;
-    &:hover {
-      background-color: #bdcdd4; } }
-  .menu-sep {
-    border-top: 1px solid #9eabb0; }
-  li {
-    float: none;
-    overflow: auto;
-    height: auto;
-    display: block;
-    img {
-      float: left;
-      width: 16px;
-      height: 16px;
-      padding-right: 5px; } }
-  .empty {
-    padding: 5px;
-    text-align: center;
-    color: #9eabb0; } }
-
+       position: absolute;
+       display: none;
+       width: 11em;
+       background: white;
+       color: @bg_colour;
+       margin: 0px;
+       padding: 0px;
+       .borders(3px, solid, @shiny_colour);
+       z-index: 100000;
+       .box_shadow;
+       a {
+               display: block;
+               color: @bg_colour;
+               padding: 5px 10px;
+               text-decoration: none;
+               &:hover {
+                       background-color: lighten(@shiny_colour, 55%);
+               }
+       }
+       .menu-sep {
+           border-top: 1px solid @med_bg_colour;
+       }
+       li {
+               float: none;
+               overflow: auto;
+               height: auto;
+               display: block;
+               img {
+                       float: left;
+                       .box(16px, 16px);
+                       padding-right: 5px;
+               }
+       }
+       .empty {
+               padding: 5px;
+               text-align: center;
+               color: lighten(@shiny_colour, 45%);
+       }
+}
 .notif-item {
-  font-size: small;
-  a {
-    vertical-align: middle; } }
-
+       font-size: small;
+       a {
+               vertical-align: middle;
+       }
+}
 .notif-image {
-  width: 32px;
-  height: 32px;
-  padding: 7px 7px 0px 0px; }
-
+       .box(32px, 32px);
+       padding: 7px 7px 0px 0px;
+}
 .notify-seen {
-  background: #ddd; }
+       background: darken(@main_alt_colour, 20%);
+}
+
 
 /**
  * sysmsg
  */
-
 #sysmsg_info {
-  position: fixed;
-  bottom: 0;
-  -moz-box-shadow: 3px 3px 3px 10px 0 #000;
-  -webkit-box-shadow: 3px 3px 10px 0 #000;
-  box-shadow: 3px 3px 10px 0 #000;
-  padding: 10px;
-  background-color: #fcaf3e;
-  border: 2px solid #f8911b;
-  border-bottom: 0;
-  padding-bottom: 50px;
-  z-index: 1000; }
-
+       position: fixed;
+       bottom: 0;
+       .box_shadow(@main_shadow);
+       padding: 10px;
+       background-color: @lt_orange;
+       .borders(2px, solid, @orange);
+       border-bottom: 0;
+       padding-bottom: 50px;
+       z-index: 1000;
+}
 #sysmsg {
-  position: fixed;
-  bottom: 0;
-  -moz-box-shadow: 3px 3px 10px 0 #000;
-  -webkit-box-shadow: 3px 3px 10px 0 #000;
-  box-shadow: 3px 3px 10px 0 #000;
-  padding: 10px;
-  background-color: #fcaf3e;
-  border: 2px solid #f8911b;
-  border-bottom: 0;
-  padding-bottom: 50px;
-  z-index: 1000; }
-
+       position: fixed;
+       bottom: 0;
+       .box_shadow(@main_shadow);
+       padding: 10px;
+       background-color: @lt_orange;
+       .borders(2px, solid, @orange);
+       border-bottom: 0;
+       padding-bottom: 50px;
+       z-index: 1000;
+}
 #sysmsg_info br, #sysmsg br {
-  display: block;
-  margin: 2px 0px;
-  border-top: 1px solid #ccccce; }
+       display: block;
+       margin: 2px 0px;
+       border-top: 1px solid @main_colour;
+}
+
 
 /**
  * aside
  */
-
 #asidemain {
-  float: left;
-  font-size: smaller;
-  margin: 20px 0 20px 35px;
-  width: 25%;
-  display: inline; }
+       float: left;
+       font-size: smaller;
+       margin: 20px 0 20px 35px;
+       width: 25%;
+       display: inline;
+}
 
 /* for now, disappear these */
-
 #asideright, #asideleft {
-  display: none; }
-
+       display: none;
+}
 .vcard {
-  .fn {
-    font-size: 1.7em;
-    font-weight: bold;
-    border-bottom: 1px solid #729fcf;
-    padding-bottom: 3px; }
-  #profile-photo-wrapper {
-    margin: 20px;
-    img {
-      box-shadow: 3px 3px 10px 0 #000; } } }
-
-/* http://css-tricks.com/snippets/css/css-box-shadow/
-* box-shadow:
-* 1. The horizontal offset of the shadow, positive means
-* the shadow will be on the right of the box, a negative
-* offset will put the shadow on the left of the box.
-* 2. The vertical offset of the shadow, a negative one
-* means the box-shadow will be above the box, a
-* positive one means the shadow will be below the box.
-* 3. The blur radius (optional), if set to 0 the shadow
-* will be sharp, the higher the number, the more blurred
-* it will be.
-* 4. The spread radius (optional), positive values increase
-* the size of the shadow, negative values decrease the size.
-* Default is 0 (the shadow is same size as blur).
-* 5. Colo[u]r
-*/
-
+       .fn {
+               font-size: 1.7em;
+               font-weight: bold;
+               border-bottom: 1px solid #729fcf;
+               padding-bottom: 3px;
+       }
+       #profile-photo-wrapper {
+               margin: 20px;
+               img {
+                       .box_shadow(3px, 3px, 10px, 0);
+               }
+       }
+}
 #asidemain {
        h4 {
                font-size: 1.2em; }
@@ -703,701 +737,715 @@ nav #nav-notifications-linkmenu {
                        .contact-block-div {
                                float: left;
                                margin: 0 5px 5px 0;
-                               width: 50px;
-                               height: 50px;
+                               .box(50px, 50px);
                                padding: 3px;
-                               position: relative;
-                       }
-               }
-       }
+                               position: relative; } } }
 }
 
 .aprofile dt {
-  background: #eec;
-  color: #2e2f2e;
-  font-weight: bold;
-  box-shadow: 1px 1px 5px 0 #000;
-  margin: 15px 0 5px;
-  padding-left: 5px; }
-
+       background: @main_colour;
+       color: @bg_colour;
+       font-weight: bold;
+       .box_shadow(1px 1px 5px 0);
+       margin: 15px 0 5px;
+       padding-left: 5px;
+}
 #profile-extra-links ul {
-  margin-left: 0px;
-  padding-left: 0px;
-  list-style: none; }
-
+       margin-left: 0px;
+       padding-left: 0px;
+       list-style: none;
+}
 #dfrn-request-link {
-  background: #3465a4 url(dark/connect.png) no-repeat 95% center;
-  border-radius: 5px 5px 5px 5px;
-  color: #eec;
-  display: block;
-  font-size: 1.2em;
-  padding: 0.2em 0.5em; }
-
+       .rounded_corners;
+       color: @main_colour;
+       display: block;
+       font-size: 1.2em;
+       padding: 0.2em 0.5em;
+       background-color: @friendica_blue;
+       // background-image: url(icons/connect.png);
+       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");
+       background-repeat: no-repeat;
+       background-position: 95% center;
+}
 #wallmessage-link {
-  /*background: #3465A4 url(dark/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; }
-
+       ///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/
+       ///*border-radius: 5px 5px 5px 5px;*/
+       color: @main_alt_colour;
+       display: block;
+       font-size: 1.2em;
+       padding: 0.2em 0.5em;
+}
 .ttright {
-  margin: 0px 0px 0px 0px; }
+       margin: 0px;
+}
+
 
 /**
  * contacts block
  */
-
 .contact-block-div {
-  width: 50px;
-  height: 50px;
-  float: left; }
-
+       .box(50px, 50px);
+       float: left;
+}
 .contact-block-textdiv {
-  width: 150px;
-  height: 34px;
-  float: left; }
+       .box(150px, 34px);
+       float: left;
+}
 
-#contact-block-end {
-  clear: both; }
 
 /**
  * jot
  */
-
 #jot {
-  /*width: 785px;*/
-  margin: 10px 0 20px 0px;
-  width: 100%;
-  #jot-tools {
-    margin: 0px;
-    padding: 0px;
-    height: 35px;
-    overflow: none;
-    width: 100%;
-    /*background-color: #0e232e;*/
-    /*border-bottom: 2px solid #9eabb0;*/
-    span {
-      float: left;
-      margin: 10px 20px 2px 0px;
-      a {
-        display: block; } }
-    .perms {
-      float: right;
-      width: 40px; }
-    li.loading {
-      float: right;
-      background-color: #ffffff;
-      width: 20px;
-      vertical-align: center;
-      text-align: center;
-      border-top: 2px solid #9eabb0;
-      height: 38px;
-      img {
-        margin-top: 10px; } } }
-  #jot-title {
-    border: 1px solid #ccc;
-    margin: 0 0 5px;
-    height: 20px;
-    width: 90%;
-    font-weight: bold;
-    border-radius: 5px;
-    vertical-align: middle; } }
-
+       margin: 10px 0 20px 0px;
+       width: 100%;
+       #jot-tools {
+               margin: 0px;
+               padding: 0px;
+               .box(100%, 35px);
+               overflow: none;
+               span {
+                       float: left;
+                       margin: 10px 20px 2px 0px;
+               a {
+                       display: block;
+               }
+               }
+               .perms {
+                       float: right;
+                       width: 40px;
+               }
+               li.loading {
+                       float: right;
+                       background-color: white;
+                       .box(20px, 38px);
+                       vertical-align: center;
+                       text-align: center;
+                       border-top: 2px solid #9eabb0;
+                       img {
+                               margin-top: 10px;
+                       }
+               }
+       }
+       #jot-title {
+           .borders(1px, solid, darken(@main_alt_colour, 13%));
+               margin: 0 0 5px;
+               .box(90%, 20px);
+               font-weight: bold;
+               .rounded_corners;
+               vertical-align: middle;
+       }
+}
 #jot-category {
-  margin: 5px 0;
-  border-radius: 5px;
-  border: 1px #999 solid;
-  color: #aaa;
-  font-size: smaller;
-  &:focus {
-    color: #eee; } }
-
+       margin: 5px 0;
+       .rounded_corners;
+       .borders(1px, solid, darken(@main_alt_colour, 33%));
+       color: darken(@main_alt_colour, 27%);
+       font-size: smaller;
+       &:focus {
+               color: @main_alt_colour;
+       }
+}
 #jot #character-counter {
-  width: 6%;
-  float: right;
-  text-align: right;
-  height: 15px;
-  line-height: 20px;
-  padding: 2px 20px 5px 0; }
-
+       .box(6%, 15px);
+       float: right;
+       text-align: right;
+       line-height: 20px;
+       padding: 2px 20px 5px 0;
+}
 #profile-jot-text_parent {
-  box-shadow: 5px 0 10px 0 #111; }
-
+       .box_shadow(5px, 0, 10px, 0, @shadow_colour);
+}
 #profile-jot-text_tbl {
-  margin-bottom: 10px;
-  background: #777; }
-
+       margin-bottom: 10px;
+       background: #777;
+}
 #profile-jot-text_ifr {
-  width: 99.900002% !important; }
-
+       width: 99.900002% !important;
+}
 #profile-jot-text_toolbargroup, .mceCenter tr {
-  background: #777; }
-
+       background: #777;
+}
 [id$="jot-text_ifr"] {
-  width: 99.900002% !important;
-  color: #2e2f2e;
-  background: #eec;
-  .mceContentBody {
-    color: #2e2f2e;
-    background: #eec; } }
-
+       width: 99.900002% !important;
+       color: @bg_colour;
+       background: @main_colour;
+       .mceContentBody {
+               color: @bg_colour;
+               background: @main_colour;
+       }
+}
 .defaultSkin {
-  tr.mceFirst {
-    background: #777; }
-  td {
-    &.mceFirst, &.mceLast {
-      background-color: #eec; } }
-  span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
-    background-color: #eec; } }
-
-#profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, #profile-location-wrapper, #profile-nolocation-wrapper, #profile-title-wrapper, #profile-upload-wrapper, #profile-video-wrapper {
-  float: left;
-  margin: 0 20px 0 0; }
-
+       tr.mceFirst {
+               background: #777;
+       }
+       td {
+               &.mceFirst, &.mceLast {
+                       background-color: @main_colour;
+               }
+       }
+       span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
+               background-color: @main_colour;
+       }
+}
+#profile-attach-wrapper,
+#profile-audio-wrapper,
+#profile-link-wrapper,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
+#profile-title-wrapper,
+#profile-upload-wrapper,
+#profile-video-wrapper {
+       float: left;
+       margin: 0 20px 0 0;
+}
 #profile-rotator-wrapper {
-  float: right; }
-
-#profile-jot-tools-end, #profile-jot-banner-end {
-  clear: both; }
-
+       float: right;
+}
 #profile-jot-email-wrapper {
-  margin: 10px 10% 0;
-  border: 1px solid #555753;
-  border-bottom: 0; }
-
+       margin: 10px 10% 0;
+       .borders(1px, solid, @menu_bg_colour);
+       border-bottom: 0;
+}
 #profile-jot-email-label {
-  background-color: #555753;
-  color: #ccccce;
-  padding: 5px; }
-
+       background-color: @menu_bg_colour;
+       color: @main_colour;
+       padding: 5px;
+}
 #profile-jot-email {
-  width: 90%;
-  margin: 5px; }
-
+       width: 90%;
+       margin: 5px;
+}
 #profile-jot-networks {
-  margin: 0 10%;
-  border: 1px solid #555753;
-  border-top: 0;
-  border-bottom: 0;
-  padding: 5px; }
-
+       margin: 0 10%;
+       border: 1px solid @menu_bg_colour;
+       border-top: 0;
+       border-bottom: 0;
+       padding: 5px;
+}
 #profile-jot-net {
-  margin: 5px 0; }
-
+       margin: 5px 0;
+}
 #jot-preview-link {
-  margin: 0 0 0 10px;
-  border: 0;
-  text-decoration: none;
-  float: right; }
-
+       margin: 0 0 0 10px;
+       border: 0;
+       text-decoration: none;
+       float: right;
+}
 .icon-text-preview {
-  margin: 0 0 -18px 0;
-  display: block;
-  width: 20px;
-  height: 20px;
-  background: url(dark/icons.png) no-repeat -128px -40px;
-  border: 0;
-  text-decoration: none;
-  float: right;
-  cursor: pointer; }
-
+       margin: 0 0 -18px 0;
+       display: block;
+       .box(20px, 20px);
+       background: url(dark/icons.png) no-repeat -128px -40px;
+       border: 0;
+       text-decoration: none;
+       float: right;
+       cursor: pointer;
+}
 #profile-jot-perms {
-  float: right;
-  background-color: #555753;
-  height: 22px;
-  width: 20px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  overflow: hidden;
-  border: 0px;
-  margin: 0 10px 0 10px; }
-
+       float: right;
+       background-color: @menu_bg_colour;
+       .box(22px, 22px);
+       .rounded_corners;
+       overflow: hidden;
+       border: 0px;
+       margin: 0 10px 0 10px;
+}
 #profile-jot-plugin-wrapper {
-  width: 1px;
-  margin: 10px 0 0 0;
-  float: right; }
-
+       width: 1px;
+       margin: 10px 0 0 0;
+       float: right;
+}
 #profile-jot-submit-wrapper {
-  float: right;
-  width: 100%;
-  list-style: none;
-  margin: 10px 0 0 0;
-  padding: 0; }
-
+       float: right;
+       width: 100%;
+       margin: 10px 0 0 0;
+       padding: 0;
+}
 #profile-jot-submit {
-  height: auto;
-  background-color: #555753;
-  color: #eeeeec;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  border: 2px outset #222420;
-  margin: 0;
-  float: right;
-  text-shadow: 1px 1px #111;
-  width: auto;
-  &:active {
-    box-shadow: 0 0 0 0; } }
-
+       height: auto;
+       background-color: @menu_bg_colour;
+       color: @main_alt_colour;
+       .rounded_corners;
+       .borders(2px, outset, @shiny_colour);
+       margin: 0;
+       float: right;
+       .text_shadow;
+       width: auto;
+       &:active {
+               .box_shadow(0, 0, 0, 0);
+       }
+}
 #jot-perms-icon {
-  height: 22px;
-  width: 20px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  overflow: hidden;
-  border: 0; }
-
-#profile-jot-acl-wrapper {
-  margin: 0 10px;
-  border: 1px solid #555753;
-  border-top: 0;
-  display: block !important; }
-
-#group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper {
-  width: 47%;
-  float: left; }
-
-#contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper {
-  width: 47%;
-  float: right; }
-
+       .box(20px, 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;
+}
+#group_allow_wrapper,
+#group_deny_wrapper,
+#acl-permit-outer-wrapper,
+#contact_allow_wrapper,
+#contact_deny_wrapper,
+#acl-deny-outer-wrapper {
+       width: 47%;
+}
+#group_allow_wrapper,
+#group_deny_wrapper,
+#acl-permit-outer-wrapper {
+       float: left;
+}
+#contact_allow_wrapper,
+#contact_deny_wrapper,
+#acl-deny-outer-wrapper {
+       float: right;
+}
 #acl-permit-text {
-  background-color: #555753;
-  color: #ccccce;
-  padding: 5px;
-  float: left; }
-
+       background-color: darken(@main_alt_colour, 60%);
+       color: @main_colour;
+       padding: 5px;
+       float: left;
+}
 #jot-public {
-  background-color: #555753;
-  color: #ff0000;
-  padding: 5px;
-  float: left; }
-
+       background-color: darken(@main_alt_colour, 60%);
+       color: @alert;
+       padding: 5px;
+       float: left;
+}
 #acl-deny-text {
-  background-color: #555753;
-  color: #ccccce;
-  padding: 5px;
-  float: left; }
-
-#acl-permit-text-end, #acl-deny-text-end {
-  clear: both; }
-
+       background-color: darken(@main_alt_colour, 60%);
+       color: @main_colour;
+       padding: 5px;
+       float: left;
+}
 #jot-title-desc {
-  color: #ccc; }
-
+       color: darken(@main_alt_colour, 13%);
+}
 #profile-jot-desc {
-  color: #ff2000;
-  margin: 5px 0; }
-
+       color: @red_orange;
+       margin: 5px 0;
+}
 #jot-title-wrapper {
-  margin-bottom: 5px; }
-
+       margin-bottom: 5px;
+}
 #jot-title-display {
-  font-weight: bold; }
-
+       font-weight: bold;
+}
 .jothidden {
-  display: none; }
-
+       display: none;
+}
 #jot-preview-content {
-  background-color: #3e3f3e;
-  color: #eec;
-  border: 1px #eec solid;
-  border-radius: 5px;
-  padding: 3px 3px 6px 10px;
-  .wall-item-outside-wrapper {
-    border: 0;
-    border-radius: 0px; } }
+       background-color: @bg_alt_colour;
+       color: @main_colour;
+       .borders(1px, solid, @main_colour);
+       .rounded_corners;
+       padding: 3px 3px 6px 10px;
+       .wall-item-outside-wrapper {
+           border: 0;
+               .rounded_corners(0px 0px 0px 0px);
+       }
+}
+
 
 /**
  * section
  */
-
 #sectionmain {
-  margin: 20px;
-  font-size: 0.8em;
-  min-width: 475px;
-  width: 67%;
-  float: left;
-  display: inline; }
+       margin: 20px;
+       font-size: 0.8em;
+       min-width: 475px;
+       width: 67%;
+       float: left;
+       display: inline;
+}
+
 
 /**
  * tabs
  */
-
 .tabs {
-  list-style: none;
-  margin: 10px 0;
-  padding: 0;
-  li {
-    display: inline;
-    font-size: smaller;
-    font-weight: bold; } }
-
+       list-style: none;
+       margin: 10px 0;
+       padding: 0;
+       li {
+               display: inline;
+               font-size: smaller;
+               font-weight: bold;
+       }
+}
 .tab {
-  border: 1px solid #729fcf;
-  padding: 4px;
-  &:hover, &.active:hover, &:active {
-    background: #88a9d2;
-    color: #2e2f2e; }
-  &.active {
-    background: #88a9d2;
-    color: #2e2f2e;
-    a {
-      color: #2e2f2e; } }
-  a {
-    border: 0;
-    text-decoration: none; } }
+       border: 1px solid @link_colour;
+       padding: 4px;
+       &:hover, &.active:hover, &:active {
+               background: @link_colour;
+               color: @bg_colour;
+       }
+       &.active {
+               background: @main_colour;
+               color: @bg_colour;
+               a {
+                       color: @bg_colour;
+               }
+       }
+       a {
+               border: 0;
+               text-decoration: none;
+       }
+}
 
 /**
  * items
  */
-
 .wall-item-outside-wrapper {
-  border: 1px solid #aaa;
-  border-radius: 5px;
-  box-shadow: 5px 0 10px 0 #111;
-  &.comment {
-    margin-top: 5px; } }
-
+       .borders(1px, solid, #aaa);
+       .rounded_corners;
+       .box_shadow(5px, 0, 10px, 0);
+       &.comment {
+               margin-top: 5px;
+       }
+}
 .wall-item-outside-wrapper-end {
-  clear: both; }
-
+       clear: both;
+}
 .wall-item-content-wrapper {
-  position: relative;
-  padding: 10px;
-  width: auto; }
-
+       position: relative;
+       padding: 10px;
+       width: auto;
+}
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
-  /*margin-left: 90px;*/ }
-
+       /*margin-left: 90px;*/
+}
 .shiny {
-  background: #2e3436;
-  border-radius: 5px; }
-
+       background: @shiny_colour;
+       .rounded_corners;
+}
 .wall-outside-wrapper .shiny {
-  border-radius: 5px; }
-
+       .rounded_corners;
+}
 .heart {
-  color: red; }
-
+       color: red;
+}
 .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 ;) */
-
+       overflow-x: auto;
+       margin: 0px 15px 0px 5px;
+}
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
-  margin: 15px 0 0 0;
-  padding: 0px;
-  /*overflow-x: auto;*/ }
-
+       margin: 15px 0 0 0;
+       padding: 0px;
+}
 .wall-item-photo-menu {
-  display: none; }
-
+       display: none;
+}
 .wall-item-photo-menu-button {
-  display: none;
-  text-indent: -99999px;
-  background: #555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;
-  position: absolute;
-  overflow: hidden;
-  height: 20px;
-  width: 90px;
-  top: 85px;
-  left: 0;
-  -webkit-border-radius: 0 0 5px 5px;
-  -moz-border-radius: 0 0 5px 5px;
-  border-radius: 0 0 5px 5px; }
-
+       display: none;
+       text-indent: -99999px;
+       background: @menu_bg_colour url(dark/menu-user-pin.jpg) no-repeat 75px center;
+       position: absolute;
+       overflow: hidden;
+       .box(90px, 20px);
+       top: 85px;
+       left: 0;
+       .rounded_corners(0 0 5px 5px);
+}
 .wall-item-info {
-  float: left;
-  width: 110px; }
-
+       float: left;
+       width: 110px;
+}
 .wall-item-photo-wrapper {
-  width: 80px;
-  height: 80px;
-  position: relative;
-  padding: 5px;
-  background-color: #555753;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px; }
-
+       .box(80px, 80px);
+       position: relative;
+       padding: 5px;
+       background-color: @menu_bg_colour;
+       .rounded_corners;
+}
 [class^="wall-item-tools"] * {
-  /*margin: 0 0 5px 0;*/
-  > * {
-    /*margin: 0 0 5px 0;*/ } }
-
+       /*margin: 0 0 5px 0;*/
+       > * {
+               /*margin: 0 0 5px 0;*/
+       }
+}
 .wall-item-tools {
-  float: right;
-  opacity: 0.4;
-  -webkit-transition: all 1s ease-in-out;
-  -moz-transition: all 1s ease-in-out;
-  -o-transition: all 1s ease-in-out;
-  -ms-transition: all 1s ease-in-out;
-  transition: all 1s ease-in-out;
-  &:hover {
-    opacity: 1;
-    -webkit-transition: all 1s ease-in-out;
-    -moz-transition: all 1s ease-in-out;
-    -o-transition: all 1s ease-in-out;
-    -ms-transition: all 1s ease-in-out;
-    transition: all 1s ease-in-out; } }
-
+       float: right;
+       opacity: 0.4;
+       .transition;
+       &:hover {
+               opacity: 1;
+               .transition;
+       }
+}
 .wall-item-subtools1 {
-  height: 30px;
-  list-style: none outside none;
-  margin: 20px 0 30px -20px;
-  padding: 0;
-  width: 30px; }
-
+       .box(30px, 30px);
+       list-style: none outside none;
+       margin: 20px 0 30px -20px;
+       padding: 0;
+}
 .wall-item-subtools2 {
-  height: 25px;
-  list-style: none outside none;
-  margin: -75px 0 0 5px;
-  padding: 0;
-  width: 25px; }
-
+       height: 25px;
+       list-style: none outside none;
+       margin: -75px 0 0 5px;
+       padding: 0;
+       width: 25px;
+}
 .wall-item-title {
-  font-size: 1.2em;
-  font-weight: bold;
-  margin-bottom: 1em; }
-
+       font-size: 1.2em;
+       font-weight: bold;
+       margin-bottom: 1em;
+}
 .wall-item-body {
-  margin: 20px 20px 10px 0px;
-  text-align: left;
-  overflow-x: auto; }
-
+       margin: 20px 20px 10px 0px;
+       text-align: left;
+       overflow-x: auto;
+}
 .wall-item-lock-wrapper {
-  float: right;
-  height: 22px;
-  margin: 0 -5px 0 0;
-  width: 22px;
-  opacity: 1; }
-
-.wall-item-dislike, .wall-item-like {
-  clear: left;
-  font-size: 0.8em;
-  color: #878883;
-  margin: 5px 0 5px 120px; }
-
-.wall-item-author, .wall-item-actions-author {
-  clear: left;
-  font-size: 0.8em;
-  color: #878883;
-  margin: 20px 20px 0 110px; }
-
+       float: right;
+       .box(22px, 22px);
+       margin: 0 -5px 0 0;
+       opacity: 1;
+}
+.wall-item-dislike,
+.wall-item-like {
+       clear: left;
+       font-size: 0.8em;
+       color: #878883;
+       margin: 5px 0 5px 120px;
+}
+.wall-item-author,
+.wall-item-actions-author {
+       clear: left;
+       font-size: 0.8em;
+       color: #878883;
+       margin: 20px 20px 0 110px;
+}
 .wall-item-ago {
-  display: inline;
-  padding-left: 10px; }
-
+       display: inline;
+       padding-left: 10px;
+}
 .wall-item-wrapper-end {
-  clear: both; }
-
+       clear: both;
+}
 .wall-item-location {
-  margin-top: 15px;
-  width: 100px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
-  .icon {
-    float: left; }
-  > a, .smalltext {
-    margin-left: 25px;
-    font-size: 0.7em;
-    display: block; }
-  > br {
-    display: none; } }
-
+       margin-top: 15px;
+       width: 100px;
+       overflow: hidden;
+       text-overflow: ellipsis;
+       -o-text-overflow: ellipsis;
+       .icon {
+               float: left;
+       }
+       > a, .smalltext {
+               margin-left: 25px;
+               font-size: 0.7em;
+               display: block;
+       }
+       > br {
+               display: none;
+       }
+}
 .wallwall {
-  .wwto {
-    left: 5px;
-    margin: 0;
-    position: absolute;
-    top: 75px;
-    width: 30px;
-    z-index: 10001;
-    width: 30px;
-    height: 30px;
-    img {
-      width: 30px !important;
-      height: 30px !important; } }
-  .wall-item-photo-end {
-    clear: both; } }
-
+       .wwto {
+               left: 5px;
+               margin: 0;
+               position: absolute;
+               top: 75px;
+               width: 30px;
+               z-index: 10001;
+               .box(30px, 30px);
+               img {
+                       width: 30px !important;
+                       height: 30px !important;
+               }
+       }
+       .wall-item-photo-end {
+               clear: both;
+       }
+}
 .wall-item-arrowphoto-wrapper {
-  position: absolute;
-  left: 35px;
-  top: 80px;
-  z-index: 10002; }
-
+       position: absolute;
+       left: 35px;
+       top: 80px;
+       z-index: 10002;
+}
 .wall-item-photo-menu {
-  min-width: 92px;
-  border: 2px solid #FFFFFF;
-  border-top: 0px;
-  background: #555753;
-  position: absolute;
-  left: -2px;
-  top: 101px;
-  display: none;
-  z-index: 10003;
-  -webkit-border-radius: 0px 5px 5px 5px;
-  -moz-border-radius: 0px 5px 5px 5px;
-  border-radius: 0px 5px 5px 5px;
-  ul {
-    margin: 0px;
-    padding: 0px;
-    list-style: none; }
-  li a {
-    white-space: nowrap;
-    display: block;
-    padding: 5px 2px;
-    color: #eeeeec;
-    &:hover {
-      color: #555753;
-      background: #eeeeec; } } }
-
+       min-width: 92px;
+       .borders(2px, solid, white);
+       border-top: 0px;
+       background: #555753;
+       position: absolute;
+       left: -2px;
+       top: 101px;
+       display: none;
+       z-index: 10003;
+       .rounded_corners;
+       li a {
+               white-space: nowrap;
+               display: block;
+               padding: 5px 2px;
+               color: @main_alt_colour;
+               &:hover {
+                       color: #555753;
+                       background: @main_alt_colour;
+               }
+       }
+}
 #item-delete-selected {
-  overflow: auto;
-  width: 100%; }
+       overflow: auto;
+       width: 100%;
+}
+#connect-services-header,
+#connect-services,
+#extra-help-header,
+#extra-help,
+#postit-header,
+#postit {
+       margin: 5px 0 0 0;
+}
 
-#connect-services-header, #connect-services, #extra-help-header, #extra-help, #postit-header, #postit {
-  margin: 5px 0 0 0; }
 
 /**
  * comment
  */
-
 .ccollapse-wrapper {
-  font-size: 0.9em;
-  margin-left: 80px; }
-
+       font-size: 0.9em;
+       margin-left: 80px;
+}
 .wall-item-outside-wrapper.comment {
-  margin-left: 80px;
-  .wall-item-photo {
-    width: 40px!important;
-    height: 40px!important; }
-  .wall-item-photo-wrapper {
-    width: 40px;
-    height: 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; }
-  .wall-item-photo-menu {
-    min-width: 50px;
-    top: 60px; } }
-
+       margin-left: 80px;
+       .wall-item-photo {
+               width: 40px!important;
+               height: 40px!important;
+       }
+       .wall-item-photo-wrapper {
+               width: 40px;
+               height: 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;
+       }
+       .wall-item-photo-menu {
+               min-width: 50px;
+               top: 60px;
+       }
+}
 .comment-wwedit-wrapper {
-  /*margin: 30px 0px 0px 80px;*/ }
-
+  /*margin: 30px 0px 0px 80px;*/
+}
 .comment-edit-wrapper {
-  border-top: 1px #aaa solid; }
-
+       border-top: 1px #aaa solid;
+}
 [class^="comment-edit-bb"] {
-  list-style: none;
-  display: none;
-  margin: -40px 0 5px 60px;
-  width: 75%;
-  > 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 {
-  margin-left: 10px; }
-
+       .list_reset;
+       display: none;
+       margin: -40px 0 5px 60px;
+       width: 75%;
+       > li {
+               display: inline-block;
+               margin: 0 10px 0 0;
+               visibility: none;
+       }
+}
+.comment-wwedit-wrapper img,
+.comment-edit-wrapper img {
+       .box;
+}
+.comment-edit-photo-link,
+.comment-edit-photo {
+       margin-left: 10px;
+}
 .my-comment-photo {
-  width: 40px;
-  height: 40px;
-  padding: 5px; }
+       .box(40px, 40px);
+       padding: 5px;
+}
 
 [class^="comment-edit-text"] {
-  margin: 5px 0 10px 20px;
-  width: 84.5%; }
-
+       margin: 5px 0 10px 20px;
+       width: 84.5%;
+}
 .comment-edit-text-empty {
-  height: 20px;
-  border: 2px #c8bebe solid;
-  border-radius: 5px;
-  color: #c8bebe;
-  -webkit-transition: all 0.5s ease-in-out;
-  -moz-transition: all 0.5s ease-in-out;
-  -o-transition: all 0.5s ease-in-out;
-  -ms-transition: all 0.5s ease-in-out;
-  transition: all 0.5s ease-in-out;
-  &:hover {
-    color: #999999; } }
-
+       height: 20px;
+       border: 2px #c8bebe solid;
+       border-radius: 5px;
+       color: #c8bebe;
+       .transition;
+       &:hover {
+               color: #999999;
+       }
+}
 .comment-edit-text-full {
-  height: 10em;
-  border-radius: 5px;
-  -webkit-transition: all 0.5s ease-in-out;
-  -moz-transition: all 0.5s ease-in-out;
-  -o-transition: all 0.5s ease-in-out;
-  -ms-transition: all 0.5s ease-in-out;
-  transition: all 0.5s ease-in-out; }
-
+       height: 10em;
+       .rounded_corners;
+       .transition;
+}
 .comment-edit-submit-wrapper {
-  width: 90%;
-  margin: 5px 5px 10px 50px;
-  text-align: right; }
-
+       width: 90%;
+       margin: 5px 5px 10px 50px;
+       text-align: right;
+}
 .comment-edit-submit {
-  height: 22px;
-  background-color: #555753;
-  color: #eeeeec;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  border: 0; }
+       height: 22px;
+       background-color: #555753;
+       color: @main_alt_colour;
+       .rounded_corners;
+       border: 0;
+}
+
 
 /**
  * item text style
  */
-
 .wall-item-body code {
-  display: block;
-  padding: 0 0 10px 5px;
-  border-color: #ccc;
-  border-style: solid;
-  border-width: 1px 1px 1px 10px;
-  background: #eee;
-  color: #2e2f2e;
-  width: 95%; }
+    background-color: #444;
+    border-bottom: 1px dashed #ccc;
+    border-left-style: solid;
+    border-left-width: 10px;
+    border-top: 1px dashed #ccc;
+    display: block;
+    overflow-x: auto;
+    padding: 5px 0 15px 10px;
+    width: 95%;
+       a {
+               color: @lt_link_colour;
+       }
+}
+
 
 /**
  * profile
  */
-
 div {
-  &[id$="text"] {
-    font-weight: bold;
-    border-bottom: 1px solid #ccc; }
-  &[id$="wrapper"] {
-    height: 100%;
-    margin-bottom: 1em;
-    br {
-      clear: left; } } }
-
+       &[id$="text"] {
+               font-weight: bold;
+               border-bottom: 1px solid #ccc;
+       }
+       &[id$="wrapper"] {
+               height: 100%;
+               margin-bottom: 1em;
+               br {
+                       clear: left;
+               }
+       }
+}
 .profile-match-wrapper {
        float: left;
        margin: 0 5px 40px 0;
-       width: 120px;
-       height: 120px;
+       .box(120px, 120px);
        padding: 3px;
        position: relative;
 }
@@ -1407,11 +1455,10 @@ div {
 .profile-match-photo {
        
 }
-
 [id$="-end"], [class$="-end"] {
-  clear: both;
-  margin: 0 0 10px 0; }
-
+       clear: both;
+       margin: 0 0 10px 0;
+}
 .profile-match-end {
        margin: 0 0 5px 0;
 }
@@ -1438,59 +1485,48 @@ div {
   margin-bottom: 30px; }
 
 .photo-album-image-wrapper, .photo-top-image-wrapper {
-  float: left;
-  -moz-box-shadow: 3px 3px 10px 0 #000;
-  -webkit-box-shadow: 3px 3px 10px 0 #000;
-  box-shadow: 3px 3px 10px 0 #000;
-  background-color: #222;
-  color: #2e2f2e;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  padding-bottom: 30px;
-  position: relative;
-  margin: 0 10px 10px 0; }
+       float: left;
+       .box_shadow;
+       background-color: #222;
+       color: @bg_colour;
+       .rounded_corners;
+       padding-bottom: 30px;
+       position: relative;
+       margin: 0 10px 10px 0;
+}
 
 #photo-photo {
-  max-width: 100%;
-  img {
-    max-width: 100%; } }
-
-.photo-top-image-wrapper a:hover, #photo-photo a:hover, .photo-album-image-wrapper a:hover {
-  border-bottom: 0; }
+       max-width: 100%;
+       img {
+               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 {
-  -webkit-border-radius: 5px 5px 0 0;
-  -moz-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0; }
-
-.photo-top-album-name {
-  position: absolute;
-  bottom: 0;
-  padding: 0 5px; }
+       .rounded_corners(5px 5px 0 0);
+}
 
-.caption {
-  position: absolute;
-  bottom: 0;
-  margin: 0 5px; }
+.photo-top-album-name, .caption {
+       position: absolute;
+       bottom: 0;
+       padding: 0 5px;
+}
 
 #photo-photo {
-  position: relative;
-  float: left; }
+       position: relative;
+       float: left; }
 
 #photo-prev-link, #photo-next-link {
-  position: absolute;
-  width: 30%;
-  height: 100%;
-  background-color: rgba(255, 255, 255, 0.5);
-  opacity: 0;
-  -webkit-transition: all .2s ease-in-out;
-  -moz-transition: all .2s ease-in-out;
-  -o-transition: all .2s ease-in-out;
-  -ms-transition: all .2s ease-in-out;
-  transition: all .2s ease-in-out;
-  background-position: center center;
-  background-repeat: no-repeat; }
+       position: absolute;
+       .box(30%, 100%);
+       background: white center center no-repeat;
+       opacity: 0;
+       .transition(all, 0.2s);
+}
 
 #photo-prev-link {
        background-image: url(dark/prev.png);
@@ -1517,55 +1553,60 @@ div {
   text-indent: -900000px; }
 
 #photo-prev-link:hover {
-  opacity: 1;
-  -webkit-transition: all .2s ease-in-out;
-  -moz-transition: all .2s ease-in-out;
-  -o-transition: all .2s ease-in-out;
-  -ms-transition: all .2s ease-in-out;
-  transition: all .2s ease-in-out; }
+       opacity: 1;
+       .transition(all, 0.2s);
+}
 
 #photo-next-link {
-  &:hover {
-    opacity: 1;
-    -webkit-transition: all .2s ease-in-out;
-    -moz-transition: all .2s ease-in-out;
-    -o-transition: all .2s ease-in-out;
-    -ms-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out; }
-  .icon {
-    display: none; } }
+       &:hover {
+               opacity: 1;
+               .transition(all, 0.2s);
+       }
+       .icon {
+               display: none;
+       }
+}
 
 #photo-prev-link .icon {
   display: none; }
 
-#photos-upload-spacer, #photos-upload-new-wrapper, #photos-upload-exist-wrapper {
+#photos-upload-spacer,
+#photos-upload-new-wrapper,
+#photos-upload-exist-wrapper {
   margin-bottom: 1em; }
 
-#photos-upload-existing-album-text, #photos-upload-newalbum-div {
+#photos-upload-existing-album-text,
+#photos-upload-newalbum-div {
   background-color: #555753;
-  color: #eeeeec;
+  color: @main_alt_colour;
   padding: 1px; }
 
-#photos-upload-album-select, #photos-upload-newalbum {
+#photos-upload-album-select,
+#photos-upload-newalbum {
   width: 99%; }
 
 #photos-upload-perms-menu {
   text-align: right; }
 
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+#photo-edit-caption,
+#photo-edit-newtag,
+#photo-edit-albumname {
   float: left;
   margin-bottom: 25px; }
 
 #photo-edit-link-wrap {
   margin-bottom: 15px; }
 
-#photo-edit-caption, #photo-edit-newtag {
+#photo-edit-caption,
+#photo-edit-newtag {
   width: 100%; }
 
 #photo-like-div {
   margin-bottom: 25px; }
 
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+#photo-edit-caption-end,
+#photo-edit-tags-end,
+#photo-edit-albumname-end {
   clear: both; }
 
 #photo-edit-delete-button {
@@ -1585,12 +1626,14 @@ div {
  */
 
 .prvmail-text {
-  width: 100%; }
+       width: 100%;
+}
 
 #prvmail-subject {
-  width: 100%;
-  color: #2e2f2e;
-  background: #eec; }
+       width: 100%;
+       color: @bg_colour;
+       background: @main_colour;
+}
 
 #prvmail-submit-wrapper {
   margin-top: 10px; }
@@ -1632,21 +1675,21 @@ div {
 
 .mail-list-outside-wrapper-end {
   clear: both;
-  border-bottom: 1px #eec dotted; }
+  border-bottom: 1px @main_colour dotted; }
 
 .mail-conv-sender {
   float: left;
   margin: 0px 5px 5px 0px; }
 
 .mail-conv-sender-photo {
-  width: 32px;
-  height: 32px; }
+       .box(32px, 32px)
+}
 
 .mail-conv-sender-name {
-  float: left; }
+       float: left; }
 
 .mail-conv-date {
-  float: right; }
+       float: right; }
 
 .mail-conv-subject {
   clear: right;
@@ -1664,48 +1707,51 @@ div {
  */
 
 .view-contact-wrapper, .contact-entry-wrapper {
-  float: left;
-  margin: 0 5px 40px 0;
-  width: 120px;
-  height: 120px;
-  padding: 3px;
-  position: relative; }
+       float: left;
+       margin: 0 5px 40px 0;
+       .box(120px, 120px);
+       padding: 3px;
+       position: relative; }
 
 .contact-direction-wrapper {
-  position: absolute;
-  top: 20px; }
+       position: absolute;
+       top: 20px; }
 
 .contact-edit-links {
-  position: absolute;
-  top: 60px; }
+       position: absolute;
+       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;*/ }
+       width: 120px;
+       font-weight: bold;
+       /*overflow: hidden;*/
+}
 
 .contact-entry-photo {
   position: relative; }
 
 .contact-entry-edit-links .icon {
-  border: 1px solid #babdb6;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  background-color: #fff; }
-
-#contact-entry-url, [id^="contact-entry-url"] {
-  font-size: smaller;
-  /*overflow: scroll;*/ }
-
-#contact-entry-network, [id^="contact-entry-network"] {
-  font-size: smaller;
-  font-style: italic; }
+       border: 1px solid #babdb6;
+       .rounded_corners(3px);
+       background-color: #fff;
+}
+
+#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; }
@@ -1724,18 +1770,20 @@ div {
   margin-left: 0px; }
 
 #contact-edit-links {
-  margin-top: 23px;
-  ul {
-    list-style-type: none; } }
+       margin-top: 23px;
+       ul {
+               .list_reset;
+       }
+}
 
 #contact-drop-links {
-  margin-left: 5px; }
+       margin-left: 5px;
+}
 
 #contact-edit-nav-wrapper .icon {
-  border: 1px solid #babdb6;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px; }
+       .borders(1px, solid, #babdb6);
+       .rounded_corners(3px);
+}
 
 #contact-edit-poll-wrapper {
   margin-left: 0px; }
@@ -1757,25 +1805,23 @@ div {
   margin-bottom: 65px; }
 
 .contact-photo-menu-button {
-  position: absolute;
-  background-image: url("dark/photo-menu.jpg");
-  background-position: top left;
-  background-repeat: no-repeat;
-  margin: 0px;
-  padding: 0px;
-  width: 16px;
-  height: 16px;
-  top: 64px;
-  left: 0px;
-  overflow: hidden;
-  text-indent: 40px;
-  display: none; }
+       position: absolute;
+       background: url("dark/photo-menu.jpg") top left no-repeat transparent;
+       margin: 0px;
+       padding: 0px;
+       .box(16px, 16px);
+       top: 64px;
+       left: 0px;
+       overflow: hidden;
+       text-indent: 40px;
+       display: none;
+}
 
 .contact-photo-menu {
   width: auto;
   border: 2px solid #444;
-  background: #2e2f2e;
-  color: #eec;
+  background: @bg_colour;
+  color: @main_colour;
   position: absolute;
   left: 0px;
   top: 90px;
@@ -1805,12 +1851,11 @@ div {
   padding-left: 18px; }
 
 #settings-nickname-desc {
-  background-color: #eec;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  padding: 5px;
-  color: #111; }
+       background-color: @main_colour;
+       .rounded_corners;
+       padding: 5px;
+       color: #111;
+}
 
 #settings-default-perms {
   margin-bottom: 20px; }
@@ -1861,84 +1906,82 @@ div {
   margin: 20px 20px 0px 0px; }
 
 .icon-profile-edit {
-  background: url("dark/icons.png") -150px 0px no-repeat;
-  border: 0;
-  cursor: pointer;
-  display: block;
-  float: right;
-  width: 20px;
-  height: 20px;
-  margin: 0 0 -18px;
-  position: absolute;
-  text-decoration: none;
-  top: 113px;
-  right: 260px; }
-
+       background: url("dark/icons.png") -150px 0px no-repeat;
+       border: 0;
+       cursor: pointer;
+       display: block;
+       .box(20px, 20px);
+       margin: 0 0 -18px;
+       text-decoration: none;
+       top: 113px;
+       right: 260px;
+}
 #profile-edit-links ul {
-  margin: 20px 0;
-  padding: 0;
-  list-style: none; }
-
+       .list_reset;
+       margin: 20px 0;
+}
 .marital {
-  margin-top: 5px; }
-
+       margin-top: 5px;
+}
 #register-sitename {
-  display: inline;
-  font-weight: bold; }
-
+       display: inline;
+       font-weight: bold;
+}
 #advanced-expire-popup {
-  background: #2e2f2e;
-  color: #eec; }
-
+       background: @bg_colour;
+       color: @main_colour;
+}
 #id_ssl_policy {
-  width: 374px; }
-
+       width: 374px;
+}
 #theme-preview img {
-  margin: 10px 10px 10px 288px; }
+       margin: 10px 10px 10px 288px;
+}
 
 /**
  * contacts selector
  */
 
 .group-delete-wrapper {
-  margin: -31px 50px 0 0;
-  float: right; }
+       margin: -31px 50px 0 0;
+       float: right; }
 
 /*.group-delete-icon {
     margin: 0 0 0 10px;
 }*/
 
 #group-edit-submit-wrapper {
-  margin: 0 0 10px 0;
-  display: inline; }
+       margin: 0 0 10px 0;
+       display: inline; }
 
 #group-edit-desc {
-  margin: 10px 0px; }
+       margin: 10px 0px; }
 
 #group-members, #prof-members {
-  height: 200px;
-  overflow: auto;
-  border: 1px solid #555753;
-  -webkit-border-radius: 5px 5px 0 0;
-  -moz-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0; }
+       height: 200px;
+       overflow: auto;
+       .borders(1px, solid, #555753);
+       .rounded_corners(5px 5px 0 0);
+}
 
 #group-all-contacts, #prof-all-contacts {
-  height: 200px;
-  overflow: auto;
-  border: 1px solid #555753;
-  -webkit-border-radius: 0 0 5px 5px;
-  -moz-border-radius: 0 0 5px 5px;
-  border-radius: 0 0 5px 5px; }
+       height: 200px;
+       overflow: auto;
+       .borders(1px, solid, #555753);
+       .rounded_corners(0 0 5px 5px);
+}
 
-#group-members h3, #group-all-contacts h3, #prof-members h3, #prof-all-contacts h3 {
-  color: #eeeeec;
-  background-color: #555753;
-  margin: 0;
-  padding: 5px; }
+#group-members h3,
+#group-all-contacts h3,
+#prof-members h3,
+#prof-all-contacts h3 {
+       color: @main_alt_colour;
+       background-color: #555753;
+       margin: 0;
+       padding: 5px; }
 
 #group-separator, #prof-separator {
-  display: none; }
+       display: none; }
 
 /**
  * profile
@@ -2009,7 +2052,7 @@ div {
   font-size: 20px; }
 
 .event {
-  background: #2e2f2e; }
+  background: @bg_colour; }
 
 .vevent {
   border: 1px solid #ccc;
@@ -2055,7 +2098,7 @@ div {
 
 .today {
   font-weight: bold;
-  color: #FF0000; }
+  color: #F00; }
 
 #event-start-text, #event-finish-text {
   margin-top: 10px;
@@ -2125,8 +2168,8 @@ div {
     text-decoration: underline; } }
 
 .fc-state-highlight {
-  background: #eec;
-  color: #2e2f2e; }
+  background: @main_colour;
+  color: @bg_colour; }
 
 /**
  * directory
@@ -2145,74 +2188,88 @@ div {
  */
 
 #group-sidebar {
-  margin-bottom: 10px; }
-
-.group-selected, .nets-selected, .fileas-selected {
-  padding: 3px;
-  color: #2e2f2e;
-  background: #88a9d2;
-  font-weight: bold; }
-
-.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-  color: #2e2f2e; }
-
+       margin-bottom: 10px;
+}
+.group-selected,
+.nets-selected,
+.fileas-selected {
+       padding: 3px;
+       color: @bg_colour;
+       background: @main_colour;
+       font-weight: bold;
+}
+.group-selected:hover,
+.nets-selected:hover,
+.fileas-selected:hover {
+       color: @link_colour;
+       background: @bg_colour;
+}
 .groupsideedit {
-  margin-right: 10px; }
-
+       margin-right: 10px;
+}
 #sidebar-group-ul {
-  padding-left: 0; }
-
+       padding-left: 0;
+}
 #sidebar-group-list {
-  margin: 0 0 5px 0;
-  ul {
-    list-style-type: none;
-    list-style-position: inside; }
-  li {
-    margin-top: 10px; }
-  .icon {
-    display: inline-block;
-    height: 12px;
-    width: 12px; } }
-
+       margin: 0 0 5px 0;
+       li {
+               margin-top: 10px;
+       }
+       .icon {
+               display: inline-block;
+               .box(12px, 12px);
+       }
+}
+.sidebar-group-element {
+       padding: 3px;
+       &:hover {
+               color: @bg_colour;
+               background: @link_colour;
+               font-weight: bold;
+               padding: 3px;
+       }
+}
 #sidebar-new-group {
-  margin: auto;
-  display: inline-block;
-  color: #efefef;
-  text-decoration: none;
-  text-align: center; }
-
+       margin: auto;
+       display: inline-block;
+       color: #efefef;
+       text-decoration: none;
+       text-align: center;
+}
 #peoplefind-sidebar form {
-  margin-bottom: 10px; }
-
+       margin-bottom: 10px;
+}
 #sidebar-new-group {
-  &: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;*/ }
-  &:active {
-    position: relative;
-    top: 1px; } }
-
+       &: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;*/ }
+       &:active {
+               position: relative;
+               top: 1px;
+       }
+}
 #side-peoplefind-url {
-  background-color: #2e2f2e;
-  color: #eec;
-  border: 1px #999 solid;
-  margin-right: 3px;
-  width: 75%;
-  &:hover, &:focus {
-    background-color: #efefef;
-    color: #222;
-    border: 1px 333 solid; } }
-
+       background-color: @bg_colour;
+       color: @main_colour;
+       border: 1px #999 solid;
+       margin-right: 3px;
+       width: 75%;
+       &:hover, &:focus {
+               background-color: #efefef;
+               color: #222;
+               border: 1px 333 solid;
+       }
+}
 .nets-ul {
-  list-style-type: none;
-  padding-left: 0px;
-  li {
-    margin: 10px 0 0; } }
-
+       .list_reset;
+       li {
+               margin: 10px 0 0;
+       }
+}
 .nets-link, .nets-all {
-  margin-left: 0px; }
-
+       margin-left: 0px;
+}
 #netsearch-box {
        margin: 20px 0px 30px;
        width: 135px;
@@ -2221,125 +2278,147 @@ div {
        }
 }
 
+
 /**
  * admin
  */
-
 #pending-update {
-  float: right;
-  color: #fff;
-  font-weight: bold;
-  background-color: #ff0000;
-  padding: 0 .3em; }
-
+       float: right;
+       color: #fff;
+       font-weight: bold;
+       background-color: #ff0000;
+       padding: 0 .3em;
+}
 .admin {
-  &.linklist {
-    border: 0;
-    padding: 0; }
-  &.link {
-    list-style-position: inside; } }
-
+       &.linklist {
+               border: 0;
+               padding: 0; }
+       &.link {
+               .list_reset;
+       }
+}
 #adminpage {
-  color: #eec;
-  background: #2e2f2e;
-  margin: 5px;
-  padding: 10px;
-  dl {
-    clear: left;
-    margin-bottom: 2px;
-    padding-bottom: 2px;
-    border-bottom: 1px solid #000; }
-  dt {
-    width: 250px;
-    float: left;
-    font-weight: bold; }
-  dd {
-    margin-left: 250px; }
-  h3 {
-    border-bottom: 1px solid #ccc; }
-  .submit {
-    clear: left; }
-  #pluginslist {
-    margin: 0;
-    padding: 0; }
-  .plugin {
-    list-style: none;
-    display: block;
-    border: 1px solid #888;
-    padding: 1em;
-    margin-bottom: 5px;
-    clear: left; }
-  .toggleplugin {
-    float: left;
-    margin-right: 1em; }
-  table {
-    width: 100%;
-    border-bottom: 1px solid #000;
-    margin: 5px 0;
-    th {
-      text-align: left; } }
-  td .icon {
-    float: left; }
-  table {
-    &#users img {
-      width: 16px;
-      height: 16px; }
-    tr:hover {
-      color: #2e2f2e;
-      background-color: #eec; } }
-  .selectall {
-    text-align: right; }
-  #users a {
-    color: #eec;
-    text-decoration: underline; } }
+       color: @main_colour;
+       background: @bg_colour;
+       margin: 5px;
+       padding: 10px;
+       dl {
+           clear: left;
+               margin-bottom: 2px;
+               padding-bottom: 2px;
+               border-bottom: 1px solid #000;
+       }
+       dt {
+               width: 250px;
+               float: left;
+               font-weight: bold;
+       }
+       dd {
+               margin-left: 250px;
+       }
+       h3 {
+               border-bottom: 1px solid #ccc;
+       }
+       .submit {
+               clear: left;
+       }
+       #pluginslist {
+               margin: 0;
+               padding: 0;
+       }
+       .plugin {
+               list-style: none;
+               display: block;
+               border: 1px solid #888;
+               padding: 1em;
+               margin-bottom: 5px;
+               clear: left;
+       }
+       .toggleplugin {
+               float: left;
+               margin-right: 1em;
+       }
+       table {
+               width: 100%;
+               border-bottom: 1px solid #000;
+               margin: 5px 0;
+               th {
+                       text-align: left;
+               }
+       }
+       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: #eec; }
+       color: @main_colour;
+}
 
 /**
  * form fields
  */
 
 .field {
-  /*margin-bottom: 10px;*/
-  /*padding-bottom: 10px;*/
-  overflow: auto;
-  /* width: 100%;*/
-  label {
-    width: 38%;
-    display: inline-block;
-    font-size: 1.077em;
-    margin: 0 10px 1em 0;
-    border: 1px #2e2f2e solid;
-    padding: 5px;
-    background: #eec;
-    color: #111; } }
+       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;
-    padding: 3px 6px 4px 10px;
-    height: 16px;
-    text-decoration: none; }
-  .on {
-    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;
-    color: #111;
-    text-align: left; }
-  .off {
-    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;
-    color: #333;
-    text-align: right; } }
+       float: right;
+       margin: 0 330px 0 auto;
+       width: 80px;
+       a {
+               display: block;
+               border: 1px solid #666;
+               padding: 3px 6px 4px 10px;
+               height: 16px;
+               text-decoration: none;
+       }
+       .on, .off {
+               background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q==');
+               background-repeat: no-repeat;
+       }
+       .on {
+               background-position: 42px 1px;
+               background-color: #999;
+               color: #111;
+               text-align: left;
+       }
+       .off {
+               background-position: 2px 1px;
+               background-color: #ccc;
+               color: #333;
+               text-align: right;
+       }
+}
 
 .hidden {
-  display: none !important; }
+       display: none !important; }
 
 .field textarea {
-  width: 80%;
-  height: 100px; }
+       .box(80%, 100px);
+}
 
 .field_help {
   display: block;
@@ -2350,99 +2429,99 @@ div {
   margin-left: 297px; }
 
 label {
-  width: 38%;
-  display: inline-block;
-  font-size: 1.077em;
-  margin: 0 10px 1em 0;
-  border: 1px #2e2f2e solid;
-  padding: 5px;
-  background: #eec;
-  color: #111; }
-
+       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);
+}
 input {
-  width: 250px;
-  height: 25px;
-  border: 1px #999 solid;
-  &[type="text"], &[type="password"], &[type="search"] {
-    width: 250px;
-    height: 25px;
-    border: 1px #999 solid; }
-  &[type="checkbox"], &[type="radio"] {
-    border: 1px #999 solid;
-    margin: 0 0 0 0;
-    height: 15px;
-    width: 15px; }
-  &[type="submit"], &[type="button"] {
-    background-color: #eee;
-    border: 2px outset #aaa;
-    border-radius: 5px;
-    box-shadow: 1px 3px 4px 0 #111;
-    color: #2e302e;
-    cursor: pointer;
-    font-weight: bold;
-    width: auto;
-    text-shadow: 1px 1px #000;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px; }
-  &[type="submit"]:active, &[type="button"]:active {
-    box-shadow: 0 0 0 0; } }
+       .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);
+       }
+}
 
 
 /*
  * update
  */
-
 .popup {
-  width: 100%;
-  height: 100%;
-  top: 0px;
-  left: 0px;
-  position: absolute;
-  display: none;
-  .background {
-    background-color: #000;
-    opacity: 0.5;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0px;
-    left: 0px; }
-  .panel {
-    top: 25%;
-    left: 25%;
-    width: 50%;
-    height: 50%;
-    padding: 1em;
-    position: absolute;
-    border: 4px solid #000000;
-    background-color: #FFFFFF; } }
+       .box(100%, 100%);
+       top: 0px;
+       left: 0px;
+       position: absolute;
+       display: none;
+       .background {
+               background-color: #000;
+               opacity: 0.5;
+               .box(100%, 100%);
+               position: absolute;
+               top: 0px;
+               left: 0px; }
+       .panel {
+               top: 25%;
+               left: 25%;
+               .box(50%, 50%);
+               padding: 1em;
+               position: absolute;
+               border: 4px solid #000000;
+               background-color: #FFFFFF;
+       }
+}
 
 #panel {
-  z-index: 100; }
+       z-index: 100; }
 
-.grey {
-  color: grey; }
+.grey, .gray {
+       color: gray; }
 
 .orange {
-  color: orange; }
+       color: orange; }
 
 .red {
-  color: red; }
+       color: red; }
 
 .popup .panel {
-  .panel_text {
-    display: block;
-    overflow: auto;
-    height: 80%; }
-  .panel_in {
-    width: 100%;
-    height: 100%;
-    position: relative; }
-  .panel_actions {
-    width: 100%;
-    bottom: 4px;
-    left: 0px;
-    position: absolute; } }
+       .panel_text {
+               display: block;
+               overflow: auto;
+               height: 80%;
+       }
+       .panel_in {
+               .box(100%, 100%);
+               position: relative;
+       }
+       .panel_actions {
+               width: 100%;
+               bottom: 4px;
+               left: 0px;
+               position: absolute;
+       }
+}
 
 .panel_text .progress {
   width: 50%;
@@ -2484,21 +2563,20 @@ input {
  */
 
 .iconspacer {
-  display: block;
-  width: 16px;
-  height: 16px; }
+       display: block;
+       .box(16px, 16px);
+}
 
 .icon {
-  display: block;
-  width: 20px;
-  height: 20px;
-  background: url(dark/icons.png) no-repeat;
-  border: 0;
-  text-decoration: none;
-  border-radius: 5px;
-  &:hover {
-    border: 0;
-    text-decoration: none; } }
+       display: block;
+       .box;
+       background: url(dark/icons.png) no-repeat;
+       border: 0;
+       text-decoration: none;
+       .rounded_corners;
+       &:hover {
+               border: 0;
+               text-decoration: none; } }
 
 .editicon {
   display: inline-block;
@@ -2509,273 +2587,272 @@ input {
   text-decoration: none; }
 
 .shadow {
-  box-shadow: 2px 2px 5px 2px #111;
-  &:active, &:focus, &:hover {
-    box-shadow: 0 0 0 0; } }
-
+       .box_shadow(2px, 2px, 5px, 2px);
+       &:active, &:focus, &:hover {
+               box-shadow: 0 0 0 0;
+       }
+}
 .editicon:hover {
-  border: 0; }
+       border: 0; }
 
 .boldbb {
-  background-position: 0px 0px;
-  &:hover {
-    background-position: -22px 0px; } }
+       background-position: 0px 0px;
+       &:hover {
+               background-position: -22px 0px; } }
 
 .italicbb {
-  background-position: 0px -22px;
-  &:hover {
-    background-position: -22px -22px; } }
+       background-position: 0px -22px;
+       &:hover {
+               background-position: -22px -22px; } }
 
 .underlinebb {
-  background-position: 0px -44px;
-  &:hover {
-    background-position: -22px -44px; } }
+       background-position: 0px -44px;
+       &:hover {
+               background-position: -22px -44px; } }
 
 .quotebb {
-  background-position: 0px -66px;
-  &:hover {
-    background-position: -22px -66px; } }
+       background-position: 0px -66px;
+       &:hover {
+               background-position: -22px -66px; } }
 
 .codebb {
-  background-position: 0px -88px;
-  &:hover {
-    background-position: -22px -88px; } }
+       background-position: 0px -88px;
+       &:hover {
+               background-position: -22px -88px; } }
 
 .imagebb {
-  background-position: -44px 0px;
-  &:hover {
-    background-position: -66px 0px; } }
+       background-position: -44px 0px;
+       &:hover {
+               background-position: -66px 0px; } }
 
 .urlbb {
-  background-position: -44px -22px;
-  &:hover {
-    background-position: -66px -22px; } }
+       background-position: -44px -22px;
+       &:hover {
+               background-position: -66px -22px; } }
 
 .videobb {
-  background-position: -44px -44px;
-  &:hover {
-    background-position: -66px -44px; } }
+       background-position: -44px -44px;
+       &:hover {
+               background-position: -66px -44px; } }
 
 .icon {
-  &.drop, &.drophide, &.delete {
-    float: left;
-    margin: 0 2px; }
-  &.s22 {
-    &.delete {
-      display: block;
-      background-position: -110px 0; }
-    &.text {
-      padding: 10px 0px 0px 25px;
-      width: 200px; } }
-  &.text {
-    text-indent: 0px; }
-  &.s16 {
-    min-width: 16px;
-    height: 16px; } }
+       &.drop, &.drophide, &.delete {
+               float: left;
+               margin: 0 2px; }
+       &.s22 {
+               &.delete {
+                       display: block;
+                       background-position: -110px 0; }
+               &.text {
+                       padding: 10px 0px 0px 25px;
+                       width: 200px; } }
+       &.text {
+               text-indent: 0px; }
+       &.s16 {
+               min-width: 16px;
+               height: 16px; } }
 
 .s16 .add {
-  background: url("../../../images/icons/16/add.png") no-repeat; }
+       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; }
+       background-position: -230px 0; }
 
 .globe, .location {
-  background-position: -50px -20px; }
+       background-position: -50px -20px; }
 
 .noglobe, .nolocation {
-  background-position: -70px -20px; }
+       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: -190px -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; }
+       position: fixed;
+       bottom: 40px;
+       right: 30px; }
 
 .border {
-  border: 1px solid #babdb6;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  &:hover {
-    border: 1px solid #babdb6;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px; } }
+       .borders(1px, solid, #babdb6);
+       .rounded_corners;
+       &:hover {
+               .borders(1px, solid, #babdb6);
+               .rounded_corners;
+       }
+}
 
 .attachtype {
-  display: block;
-  width: 20px;
-  height: 23px;
-  background-image: url(../../../images/content-types.png); }
+       display: block;
+       width: 20px;
+       height: 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; }
+       margin-top: 100px;
+       font-size: 0.7em; }
 
 footer {
-  display: block;
-  /*margin: 50px 20%;*/
-  clear: both; }
+       display: block;
+       /*margin: 50px 20%;*/
+       clear: both; }
 
 #profile-jot-text {
-  height: 20px;
-  color: #eec;
-  border: 1px solid #eec;
-  border-radius: 5px;
-  width: 99.5%; }
+       height: 20px;
+       color: @main_colour;
+       .borders;
+       .rounded_corners;
+       width: 99.5%;
+}
 
 /**
  * acl
  */
 
 #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
-  display: block !important;
-  background: #2e2f2e;
-  color: #eec; }
+       display: block !important;
+       background: @bg_colour;
+       color: @main_colour; }
 
 #acl-wrapper {
-  width: 660px;
-  margin: 0 auto; }
+       width: 660px;
+       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; }
+       float: right;
+       background: white url("../../../images/search_18.png") no-repeat right center;
+       padding-right: 20px;
+       margin: 6px;
+       color: #111; }
 
 #acl-showall {
-  float: left;
-  display: block;
-  width: auto;
-  height: 18px;
-  background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;
-  padding: 7px 10px 7px 30px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  color: #999;
-  margin: 5px 0;
-  &.selected {
-    color: #000;
-    background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } }
+       float: left;
+       display: block;
+       width: auto;
+       height: 18px;
+       background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;
+       padding: 7px 10px 7px 30px;
+       .rounded_corners;
+       color: #999;
+       margin: 5px 0;
+       &.selected {
+               color: #000;
+               background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } }
 
 #acl-list {
   height: 210px;
@@ -2788,95 +2865,97 @@ footer {
 }*/
 
 .acl-list-item {
-  border: 1px solid #eec;
-  display: block;
-  float: left;
-  height: 110px;
-  margin: 3px 0 5px 5px;
-  width: 120px;
-  img {
-    width: 22px;
-    height: 22px;
-    float: left;
-    margin: 5px 5px 20px; }
-  p {
-    height: 12px;
-    font-size: 10px;
-    margin: 0 0 22px;
-    padding: 2px 0 1px; }
-  a {
-    background: #eeeecc 3px 3px no-repeat;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-    clear: both;
-    font-size: 10px;
-    display: block;
-    width: 55px;
-    height: 20px;
-    color: #2e2f2e;
-    margin: 5px auto 0;
-    padding: 0 3px;
-    text-align: center;
-    vertical-align: middle; } }
+       .borders;
+       display: block;
+       float: left;
+       height: 110px;
+       margin: 3px 0 5px 5px;
+       width: 120px;
+       img {
+               .box(22px, 22px);
+               float: left;
+               margin: 5px 5px 20px; }
+       p {
+               height: 12px;
+               font-size: 10px;
+               margin: 0 0 22px;
+               padding: 2px 0 1px; }
+       a {
+               background: #eeeecc 3px 3px no-repeat;
+               .rounded_corners;
+               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; } }
 
 #acl-wrapper a:hover {
-  text-decoration: none;
-  color: #2e2f2e;
-  border: 0; }
+       text-decoration: none;
+       color: @bg_colour;
+       border: 0; }
 
+//data URI:
+// data:[<MIME-type>][;charset=<encoding>][;base64],<data>
 .acl-button-show {
-  background-image: url('../../../images/show_off.png');
-  margin: 0 auto; }
-
+       // background-image: url('../../../images/show_off.png');
+       background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg==');
+       margin: 0 auto;
+}
 .acl-button-hide {
-  background-image: url('../../../images/hide_off.png');
-  margin: 0 auto; }
-
+       // background-image: url('../../../images/hide_off.png');
+       background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII=');
+       margin: 0 auto;
+}
 .acl-button-show.selected {
-  color: #2e2f2e;
-  background-color: #9ade00;
-  background-image: url(../../../images/show_on.png); }
-
+       // background: #9ade00 url(../../../images/show_on.png);
+       background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII=');
+       color: @bg_colour;
+}
 .acl-button-hide.selected {
-  color: #2e2f2e;
-  background-color: #ff4141;
-  background-image: url(../../../images/hide_on.png); }
-
+       // background: #ff4141 url(../../../images/hide_on.png);
+       background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg==');
+       color: @bg_colour;
+}
 .acl-list-item {
-  &.groupshow {
-    border-color: #9ade00; }
-  &.grouphide {
-    border-color: #ff4141; } }
+       &.groupshow {
+               border-color: #9ade00; }
+       &.grouphide {
+               border-color: #ff4141; } }
 
 /** /acl **/
 
 /* autocomplete popup */
-
 .acpopup {
-  max-height: 175px;
-  max-width: 42%;
-  background-color: #555753;
-  color: #fff;
-  overflow: auto;
-  z-index: 100000;
-  border: 1px solid #cccccc; }
-
+       max-height: 175px;
+       max-width: 42%;
+       background-color: #555753;
+       color: #fff;
+       overflow: auto;
+       z-index: 100000;
+       border: 1px solid #cccccc;
+}
 .acpopupitem {
-  background-color: #555753;
-  padding: 4px;
-  clear: left;
-  img {
-    float: left;
-    margin-right: 4px; }
-  &.selected {
-    color: #2e302e;
-    background-color: #eeeeec; } }
-
+       background-color: #555753;
+       padding: 4px;
+       clear: left;
+       img {
+               float: left;
+               margin-right: 4px;
+       }
+       &.selected {
+               color: #2e302e;
+               background-color: @main_alt_colour;
+       }
+}
 .qcomment-wrapper {
-  padding: 0px;
-  margin: 5px 5px 5px 81%; }
-
+       padding: 0px;
+       margin: 5px 5px 5px 81%;
+}
 .qcomment {
   opacity: 0.5;
   &:hover {
@@ -2915,7 +2994,76 @@ footer {
   /* override the jappix css */
   z-index: 999; }
 
-/* media stuff */
+//* media stuff */
 @media handheld {
-  body {
-    font-size: 15pt; } }
+       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;
+       }
+}
+//* 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;
+       }
+}
+.test {
+       color: @link_colour;
+       background-color: darken(@main_alt_colour, 13%);
+}
diff --git a/view/theme/dispy/icons/connect.png b/view/theme/dispy/icons/connect.png
new file mode 100644 (file)
index 0000000..b76fc13
Binary files /dev/null and b/view/theme/dispy/icons/connect.png differ
index 688ac1451ebcd64a19206f4689295871bc06c74d..c6b3394572aa3d2d749f599bb1b17a513b4a9fbc 100644 (file)
        <div id="profile-jot-submit-wrapper" class="jothidden">
 
                <div id="profile-upload-wrapper" style="display: $visitor;">
-                       <div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
+                       <div id="wall-image-upload-div"><a class="icon camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
                </div>
                <div id="profile-attach-wrapper" style="display: $visitor;">
-                       <div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
+                       <div id="wall-file-upload-div"><a class="icon attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
                </div>
                <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
-                       <a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
+                       <a class="icon link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
                </div>
                <div id="profile-video-wrapper" style="display: $visitor;">
-                       <a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
+                       <a class="icon video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
                </div>
                <div id="profile-audio-wrapper" style="display: $visitor;">
-                       <a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
+                       <a class="icon audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
                </div>
                <div id="profile-location-wrapper" style="display: $visitor;">
-                       <a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
+                       <a class="icon globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
                </div>
                <div id="profile-nolocation-wrapper" style="display: none;">
-                       <a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
+                       <a class="icon noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
                </div>
 
                <div id="profile-jot-plugin-wrapper">
diff --git a/view/theme/dispy/js/modernizr.custom.2.5.3.js b/view/theme/dispy/js/modernizr.custom.2.5.3.js
new file mode 100644 (file)
index 0000000..2502348
--- /dev/null
@@ -0,0 +1,989 @@
+/* Modernizr 2.5.3 (Custom Build) | MIT & BSD\r
+ * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-printshiv-mq-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load\r
+ */\r
+;\r
+\r
+\r
+\r
+window.Modernizr = (function( window, document, undefined ) {\r
+\r
+    var version = '2.5.3',\r
+\r
+    Modernizr = {},\r
+\r
+\r
+    docElement = document.documentElement,\r
+\r
+    mod = 'modernizr',\r
+    modElem = document.createElement(mod),\r
+    mStyle = modElem.style,\r
+\r
+    inputElem  = document.createElement('input')  ,\r
+\r
+    smile = ':)',\r
+\r
+    toString = {}.toString,\r
+\r
+    prefixes = ' -webkit- -moz- -o- -ms- '.split(' '),\r
+\r
+\r
+\r
+    omPrefixes = 'Webkit Moz O ms',\r
+\r
+    cssomPrefixes = omPrefixes.split(' '),\r
+\r
+    domPrefixes = omPrefixes.toLowerCase().split(' '),\r
+\r
+    ns = {'svg': 'http://www.w3.org/2000/svg'},\r
+\r
+    tests = {},\r
+    inputs = {},\r
+    attrs = {},\r
+\r
+    classes = [],\r
+\r
+    slice = classes.slice,\r
+\r
+    featureName, \r
+\r
+\r
+    injectElementWithStyles = function( rule, callback, nodes, testnames ) {\r
+\r
+      var style, ret, node,\r
+          div = document.createElement('div'),\r
+                body = document.body, \r
+                fakeBody = body ? body : document.createElement('body');\r
+\r
+      if ( parseInt(nodes, 10) ) {\r
+                      while ( nodes-- ) {\r
+              node = document.createElement('div');\r
+              node.id = testnames ? testnames[nodes] : mod + (nodes + 1);\r
+              div.appendChild(node);\r
+          }\r
+      }\r
+\r
+                style = ['&#173;','<style>', rule, '</style>'].join('');\r
+      div.id = mod;\r
+          (body ? div : fakeBody).innerHTML += style;\r
+      fakeBody.appendChild(div);\r
+      if(!body){\r
+                fakeBody.style.background = "";\r
+          docElement.appendChild(fakeBody);\r
+      }\r
+\r
+      ret = callback(div, rule);\r
+        !body ? fakeBody.parentNode.removeChild(fakeBody) : div.parentNode.removeChild(div);\r
+\r
+      return !!ret;\r
+\r
+    },\r
+\r
+    testMediaQuery = function( mq ) {\r
+\r
+      var matchMedia = window.matchMedia || window.msMatchMedia;\r
+      if ( matchMedia ) {\r
+        return matchMedia(mq).matches;\r
+      }\r
+\r
+      var bool;\r
+\r
+      injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) {\r
+        bool = (window.getComputedStyle ?\r
+                  getComputedStyle(node, null) :\r
+                  node.currentStyle)['position'] == 'absolute';\r
+      });\r
+\r
+      return bool;\r
+\r
+     },\r
\r
+\r
+    isEventSupported = (function() {\r
+\r
+      var TAGNAMES = {\r
+        'select': 'input', 'change': 'input',\r
+        'submit': 'form', 'reset': 'form',\r
+        'error': 'img', 'load': 'img', 'abort': 'img'\r
+      };\r
+\r
+      function isEventSupported( eventName, element ) {\r
+\r
+        element = element || document.createElement(TAGNAMES[eventName] || 'div');\r
+        eventName = 'on' + eventName;\r
+\r
+            var isSupported = eventName in element;\r
+\r
+        if ( !isSupported ) {\r
+                if ( !element.setAttribute ) {\r
+            element = document.createElement('div');\r
+          }\r
+          if ( element.setAttribute && element.removeAttribute ) {\r
+            element.setAttribute(eventName, '');\r
+            isSupported = is(element[eventName], 'function');\r
+\r
+                    if ( !is(element[eventName], 'undefined') ) {\r
+              element[eventName] = undefined;\r
+            }\r
+            element.removeAttribute(eventName);\r
+          }\r
+        }\r
+\r
+        element = null;\r
+        return isSupported;\r
+      }\r
+      return isEventSupported;\r
+    })(),\r
+\r
+\r
+    _hasOwnProperty = ({}).hasOwnProperty, hasOwnProperty;\r
+\r
+    if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) {\r
+      hasOwnProperty = function (object, property) {\r
+        return _hasOwnProperty.call(object, property);\r
+      };\r
+    }\r
+    else {\r
+      hasOwnProperty = function (object, property) { \r
+        return ((property in object) && is(object.constructor.prototype[property], 'undefined'));\r
+      };\r
+    }\r
+\r
+\r
+    if (!Function.prototype.bind) {\r
+      Function.prototype.bind = function bind(that) {\r
+\r
+        var target = this;\r
+\r
+        if (typeof target != "function") {\r
+            throw new TypeError();\r
+        }\r
+\r
+        var args = slice.call(arguments, 1),\r
+            bound = function () {\r
+\r
+            if (this instanceof bound) {\r
+\r
+              var F = function(){};\r
+              F.prototype = target.prototype;\r
+              var self = new F;\r
+\r
+              var result = target.apply(\r
+                  self,\r
+                  args.concat(slice.call(arguments))\r
+              );\r
+              if (Object(result) === result) {\r
+                  return result;\r
+              }\r
+              return self;\r
+\r
+            } else {\r
+\r
+              return target.apply(\r
+                  that,\r
+                  args.concat(slice.call(arguments))\r
+              );\r
+\r
+            }\r
+\r
+        };\r
+\r
+        return bound;\r
+      };\r
+    }\r
+\r
+    function setCss( str ) {\r
+        mStyle.cssText = str;\r
+    }\r
+\r
+    function setCssAll( str1, str2 ) {\r
+        return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));\r
+    }\r
+\r
+    function is( obj, type ) {\r
+        return typeof obj === type;\r
+    }\r
+\r
+    function contains( str, substr ) {\r
+        return !!~('' + str).indexOf(substr);\r
+    }\r
+\r
+    function testProps( props, prefixed ) {\r
+        for ( var i in props ) {\r
+            if ( mStyle[ props[i] ] !== undefined ) {\r
+                return prefixed == 'pfx' ? props[i] : true;\r
+            }\r
+        }\r
+        return false;\r
+    }\r
+\r
+    function testDOMProps( props, obj, elem ) {\r
+        for ( var i in props ) {\r
+            var item = obj[props[i]];\r
+            if ( item !== undefined) {\r
+\r
+                            if (elem === false) return props[i];\r
+\r
+                            if (is(item, 'function')){\r
+                                return item.bind(elem || obj);\r
+                }\r
+\r
+                            return item;\r
+            }\r
+        }\r
+        return false;\r
+    }\r
+\r
+    function testPropsAll( prop, prefixed, elem ) {\r
+\r
+        var ucProp  = prop.charAt(0).toUpperCase() + prop.substr(1),\r
+            props   = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');\r
+\r
+            if(is(prefixed, "string") || is(prefixed, "undefined")) {\r
+          return testProps(props, prefixed);\r
+\r
+            } else {\r
+          props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' ');\r
+          return testDOMProps(props, prefixed, elem);\r
+        }\r
+    }\r
+\r
+    var testBundle = (function( styles, tests ) {\r
+        var style = styles.join(''),\r
+            len = tests.length;\r
+\r
+        injectElementWithStyles(style, function( node, rule ) {\r
+            var style = document.styleSheets[document.styleSheets.length - 1],\r
+                                                    cssText = style ? (style.cssRules && style.cssRules[0] ? style.cssRules[0].cssText : style.cssText || '') : '',\r
+                children = node.childNodes, hash = {};\r
+\r
+            while ( len-- ) {\r
+                hash[children[len].id] = children[len];\r
+            }\r
+\r
+                       Modernizr['touch'] = ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch || (hash['touch'] && hash['touch'].offsetTop) === 9; \r
+             Modernizr['csstransforms3d'] = (hash['csstransforms3d'] && hash['csstransforms3d'].offsetLeft) === 9 && hash['csstransforms3d'].offsetHeight === 3;                  Modernizr['generatedcontent'] = (hash['generatedcontent'] && hash['generatedcontent'].offsetHeight) >= 1;                       Modernizr['fontface'] = /src/i.test(cssText) &&\r
+                                                                  cssText.indexOf(rule.split(' ')[0]) === 0;            }, len, tests);\r
+\r
+    })([\r
+                    '@font-face {font-family:"font";src:url("https://")}'                    ,['@media (',prefixes.join('touch-enabled),('),mod,')',\r
+                                '{#touch{top:9px;position:absolute}}'].join('')            ,['@media (',prefixes.join('transform-3d),('),mod,')',\r
+                                '{#csstransforms3d{left:9px;position:absolute;height:3px;}}'].join('')\r
+\r
+        ,['#generatedcontent:after{content:"',smile,'";visibility:hidden}'].join('')  \r
+    ],\r
+      [\r
+                'fontface'                         ,'touch'                 ,'csstransforms3d'  \r
+        ,'generatedcontent' \r
+\r
+    ]);    tests['flexbox'] = function() {\r
+      return testPropsAll('flexOrder');\r
+    };\r
+\r
+\r
+    tests['flexbox-legacy'] = function() {\r
+        return testPropsAll('boxDirection');\r
+    };\r
+\r
+\r
+    tests['canvas'] = function() {\r
+        var elem = document.createElement('canvas');\r
+        return !!(elem.getContext && elem.getContext('2d'));\r
+    };\r
+\r
+    tests['canvastext'] = function() {\r
+        return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function'));\r
+    };    tests['touch'] = function() {\r
+        return Modernizr['touch'];\r
+    };\r
+\r
+    tests['geolocation'] = function() {\r
+        return !!navigator.geolocation;\r
+    };\r
+\r
+    tests['postmessage'] = function() {\r
+      return !!window.postMessage;\r
+    };\r
+\r
+\r
+    tests['websqldatabase'] = function() {\r
+      return !!window.openDatabase;\r
+    };\r
+\r
+    tests['indexedDB'] = function() {\r
+      return !!testPropsAll("indexedDB",window);\r
+    };\r
+\r
+    tests['hashchange'] = function() {\r
+      return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7);\r
+    };\r
+\r
+    tests['history'] = function() {\r
+      return !!(window.history && history.pushState);\r
+    };\r
+\r
+    tests['draganddrop'] = function() {\r
+        var div = document.createElement('div');\r
+        return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div);\r
+    };\r
+\r
+    tests['websockets'] = function() {\r
+        for ( var i = -1, len = cssomPrefixes.length; ++i < len; ){\r
+          if ( window[cssomPrefixes[i] + 'WebSocket'] ){\r
+            return true;\r
+          }\r
+        }\r
+        return 'WebSocket' in window;\r
+    };\r
+\r
+\r
+    tests['rgba'] = function() {\r
+        setCss('background-color:rgba(150,255,150,.5)');\r
+\r
+        return contains(mStyle.backgroundColor, 'rgba');\r
+    };\r
+\r
+    tests['hsla'] = function() {\r
+            setCss('background-color:hsla(120,40%,100%,.5)');\r
+\r
+        return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla');\r
+    };\r
+\r
+    tests['multiplebgs'] = function() {\r
+                setCss('background:url(https://),url(https://),red url(https://)');\r
+\r
+            return /(url\s*\(.*?){3}/.test(mStyle.background);\r
+    };\r
+    tests['backgroundsize'] = function() {\r
+        return testPropsAll('backgroundSize');\r
+    };\r
+\r
+    tests['borderimage'] = function() {\r
+        return testPropsAll('borderImage');\r
+    };\r
+\r
+\r
+\r
+    tests['borderradius'] = function() {\r
+        return testPropsAll('borderRadius');\r
+    };\r
+\r
+    tests['boxshadow'] = function() {\r
+        return testPropsAll('boxShadow');\r
+    };\r
+\r
+    tests['textshadow'] = function() {\r
+        return document.createElement('div').style.textShadow === '';\r
+    };\r
+\r
+\r
+    tests['opacity'] = function() {\r
+                setCssAll('opacity:.55');\r
+\r
+                    return /^0.55$/.test(mStyle.opacity);\r
+    };\r
+\r
+\r
+    tests['cssanimations'] = function() {\r
+        return testPropsAll('animationName');\r
+    };\r
+\r
+\r
+    tests['csscolumns'] = function() {\r
+        return testPropsAll('columnCount');\r
+    };\r
+\r
+\r
+    tests['cssgradients'] = function() {\r
+        var str1 = 'background-image:',\r
+            str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));',\r
+            str3 = 'linear-gradient(left top,#9f9, white);';\r
+\r
+        setCss(\r
+                       (str1 + '-webkit- '.split(' ').join(str2 + str1) \r
+                       + prefixes.join(str3 + str1)).slice(0, -str1.length)\r
+        );\r
+\r
+        return contains(mStyle.backgroundImage, 'gradient');\r
+    };\r
+\r
+\r
+    tests['cssreflections'] = function() {\r
+        return testPropsAll('boxReflect');\r
+    };\r
+\r
+\r
+    tests['csstransforms'] = function() {\r
+        return !!testPropsAll('transform');\r
+    };\r
+\r
+\r
+    tests['csstransforms3d'] = function() {\r
+\r
+        var ret = !!testPropsAll('perspective');\r
+\r
+                        if ( ret && 'webkitPerspective' in docElement.style ) {\r
+\r
+                      ret = Modernizr['csstransforms3d'];\r
+        }\r
+        return ret;\r
+    };\r
+\r
+\r
+    tests['csstransitions'] = function() {\r
+        return testPropsAll('transition');\r
+    };\r
+\r
+\r
+\r
+    tests['fontface'] = function() {\r
+        return Modernizr['fontface'];\r
+    };\r
+\r
+    tests['generatedcontent'] = function() {\r
+        return Modernizr['generatedcontent'];\r
+    };\r
+    tests['video'] = function() {\r
+        var elem = document.createElement('video'),\r
+            bool = false;\r
+\r
+            try {\r
+            if ( bool = !!elem.canPlayType ) {\r
+                bool      = new Boolean(bool);\r
+                bool.ogg  = elem.canPlayType('video/ogg; codecs="theora"')      .replace(/^no$/,'');\r
+\r
+                bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,'');\r
+\r
+                bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,'');\r
+            }\r
+\r
+        } catch(e) { }\r
+\r
+        return bool;\r
+    };\r
+\r
+    tests['audio'] = function() {\r
+        var elem = document.createElement('audio'),\r
+            bool = false;\r
+\r
+        try { \r
+            if ( bool = !!elem.canPlayType ) {\r
+                bool      = new Boolean(bool);\r
+                bool.ogg  = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,'');\r
+                bool.mp3  = elem.canPlayType('audio/mpeg;')               .replace(/^no$/,'');\r
+\r
+                                                    bool.wav  = elem.canPlayType('audio/wav; codecs="1"')     .replace(/^no$/,'');\r
+                bool.m4a  = ( elem.canPlayType('audio/x-m4a;')            || \r
+                              elem.canPlayType('audio/aac;'))             .replace(/^no$/,'');\r
+            }\r
+        } catch(e) { }\r
+\r
+        return bool;\r
+    };\r
+\r
+\r
+    tests['localstorage'] = function() {\r
+        try {\r
+            localStorage.setItem(mod, mod);\r
+            localStorage.removeItem(mod);\r
+            return true;\r
+        } catch(e) {\r
+            return false;\r
+        }\r
+    };\r
+\r
+    tests['sessionstorage'] = function() {\r
+        try {\r
+            sessionStorage.setItem(mod, mod);\r
+            sessionStorage.removeItem(mod);\r
+            return true;\r
+        } catch(e) {\r
+            return false;\r
+        }\r
+    };\r
+\r
+\r
+    tests['webworkers'] = function() {\r
+        return !!window.Worker;\r
+    };\r
+\r
+\r
+    tests['applicationcache'] = function() {\r
+        return !!window.applicationCache;\r
+    };\r
+\r
+\r
+    tests['svg'] = function() {\r
+        return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect;\r
+    };\r
+\r
+    tests['inlinesvg'] = function() {\r
+      var div = document.createElement('div');\r
+      div.innerHTML = '<svg/>';\r
+      return (div.firstChild && div.firstChild.namespaceURI) == ns.svg;\r
+    };\r
+\r
+    tests['smil'] = function() {\r
+        return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate')));\r
+    };\r
+\r
+\r
+    tests['svgclippaths'] = function() {\r
+        return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath')));\r
+    };\r
+\r
+    function webforms() {\r
+                                            Modernizr['input'] = (function( props ) {\r
+            for ( var i = 0, len = props.length; i < len; i++ ) {\r
+                attrs[ props[i] ] = !!(props[i] in inputElem);\r
+            }\r
+            if (attrs.list){\r
+                                  attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement);\r
+            }\r
+            return attrs;\r
+        })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' '));\r
+                            Modernizr['inputtypes'] = (function(props) {\r
+\r
+            for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) {\r
+\r
+                inputElem.setAttribute('type', inputElemType = props[i]);\r
+                bool = inputElem.type !== 'text';\r
+\r
+                                                    if ( bool ) {\r
+\r
+                    inputElem.value         = smile;\r
+                    inputElem.style.cssText = 'position:absolute;visibility:hidden;';\r
+\r
+                    if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) {\r
+\r
+                      docElement.appendChild(inputElem);\r
+                      defaultView = document.defaultView;\r
+\r
+                                        bool =  defaultView.getComputedStyle &&\r
+                              defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' &&\r
+                                                                                  (inputElem.offsetHeight !== 0);\r
+\r
+                      docElement.removeChild(inputElem);\r
+\r
+                    } else if ( /^(search|tel)$/.test(inputElemType) ){\r
+                                                                                    } else if ( /^(url|email)$/.test(inputElemType) ) {\r
+                                        bool = inputElem.checkValidity && inputElem.checkValidity() === false;\r
+\r
+                    } else if ( /^color$/.test(inputElemType) ) {\r
+                                                                docElement.appendChild(inputElem);\r
+                        docElement.offsetWidth;\r
+                        bool = inputElem.value != smile;\r
+                        docElement.removeChild(inputElem);\r
+\r
+                    } else {\r
+                                        bool = inputElem.value != smile;\r
+                    }\r
+                }\r
+\r
+                inputs[ props[i] ] = !!bool;\r
+            }\r
+            return inputs;\r
+        })('search tel url email datetime date month week time datetime-local number range color'.split(' '));\r
+        }\r
+    for ( var feature in tests ) {\r
+        if ( hasOwnProperty(tests, feature) ) {\r
+                                    featureName  = feature.toLowerCase();\r
+            Modernizr[featureName] = tests[feature]();\r
+\r
+            classes.push((Modernizr[featureName] ? '' : 'no-') + featureName);\r
+        }\r
+    }\r
+\r
+    Modernizr.input || webforms();    setCss('');\r
+    modElem = inputElem = null;\r
+\r
+\r
+    Modernizr._version      = version;\r
+\r
+    Modernizr._prefixes     = prefixes;\r
+    Modernizr._domPrefixes  = domPrefixes;\r
+    Modernizr._cssomPrefixes  = cssomPrefixes;\r
+\r
+    Modernizr.mq            = testMediaQuery;\r
+\r
+    Modernizr.hasEvent      = isEventSupported;\r
+\r
+    Modernizr.testProp      = function(prop){\r
+        return testProps([prop]);\r
+    };\r
+\r
+    Modernizr.testAllProps  = testPropsAll;\r
+\r
+\r
+    Modernizr.testStyles    = injectElementWithStyles;\r
+    return Modernizr;\r
+\r
+})(this, this.document);\r
+/*! HTML5 Shiv v3.4 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */\r
+;(function(window, document) {\r
+\r
+  /** Preset options */\r
+  var options = window.html5 || {};\r
+\r
+  /** Used to skip problem elements */\r
+  var reSkip = /^<|^(?:button|form|map|select|textarea)$/i;\r
+\r
+  /** Detect whether the browser supports default html5 styles */\r
+  var supportsHtml5Styles;\r
+\r
+  /** Detect whether the browser supports unknown elements */\r
+  var supportsUnknownElements;\r
+\r
+  (function() {\r
+    var a = document.createElement('a');\r
+\r
+    a.innerHTML = '<xyz></xyz>';\r
+\r
+    //if the hidden property is implemented we can assume, that the browser supports HTML5 Styles\r
+    supportsHtml5Styles = ('hidden' in a);\r
+    supportsUnknownElements = a.childNodes.length == 1 || (function() {\r
+      // assign a false positive if unable to shiv\r
+      try {\r
+        (document.createElement)('a');\r
+      } catch(e) {\r
+        return true;\r
+      }\r
+      var frag = document.createDocumentFragment();\r
+      return (\r
+        typeof frag.cloneNode == 'undefined' ||\r
+        typeof frag.createDocumentFragment == 'undefined' ||\r
+        typeof frag.createElement == 'undefined'\r
+      );\r
+    }());\r
+\r
+  }());\r
+\r
+  /*--------------------------------------------------------------------------*/\r
+\r
+  /**\r
+   * Creates a style sheet with the given CSS text and adds it to the document.\r
+   * @private\r
+   * @param {Document} ownerDocument The document.\r
+   * @param {String} cssText The CSS text.\r
+   * @returns {StyleSheet} The style element.\r
+   */\r
+  function addStyleSheet(ownerDocument, cssText) {\r
+    var p = ownerDocument.createElement('p'),\r
+        parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;\r
+\r
+    p.innerHTML = 'x<style>' + cssText + '</style>';\r
+    return parent.insertBefore(p.lastChild, parent.firstChild);\r
+  }\r
+\r
+  /**\r
+   * Returns the value of `html5.elements` as an array.\r
+   * @private\r
+   * @returns {Array} An array of shived element node names.\r
+   */\r
+  function getElements() {\r
+    var elements = html5.elements;\r
+    return typeof elements == 'string' ? elements.split(' ') : elements;\r
+  }\r
+\r
+  /**\r
+   * Shivs the `createElement` and `createDocumentFragment` methods of the document.\r
+   * @private\r
+   * @param {Document|DocumentFragment} ownerDocument The document.\r
+   */\r
+  function shivMethods(ownerDocument) {\r
+    var cache = {},\r
+        docCreateElement = ownerDocument.createElement,\r
+        docCreateFragment = ownerDocument.createDocumentFragment,\r
+        frag = docCreateFragment();\r
+\r
+    ownerDocument.createElement = function(nodeName) {\r
+      // Avoid adding some elements to fragments in IE < 9 because\r
+      // * Attributes like `name` or `type` cannot be set/changed once an element\r
+      //   is inserted into a document/fragment\r
+      // * Link elements with `src` attributes that are inaccessible, as with\r
+      //   a 403 response, will cause the tab/window to crash\r
+      // * Script elements appended to fragments will execute when their `src`\r
+      //   or `text` property is set\r
+      var node = (cache[nodeName] || (cache[nodeName] = docCreateElement(nodeName))).cloneNode();\r
+      return html5.shivMethods && node.canHaveChildren && !reSkip.test(nodeName) ? frag.appendChild(node) : node;\r
+    };\r
+\r
+    ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +\r
+      'var n=f.cloneNode(),c=n.createElement;' +\r
+      'h.shivMethods&&(' +\r
+        // unroll the `createElement` calls\r
+        getElements().join().replace(/\w+/g, function(nodeName) {\r
+          cache[nodeName] = docCreateElement(nodeName);\r
+          frag.createElement(nodeName);\r
+          return 'c("' + nodeName + '")';\r
+        }) +\r
+      ');return n}'\r
+    )(html5, frag);\r
+  }\r
+\r
+  /*--------------------------------------------------------------------------*/\r
+\r
+  /**\r
+   * Shivs the given document.\r
+   * @memberOf html5\r
+   * @param {Document} ownerDocument The document to shiv.\r
+   * @returns {Document} The shived document.\r
+   */\r
+  function shivDocument(ownerDocument) {\r
+    var shived;\r
+    if (ownerDocument.documentShived) {\r
+      return ownerDocument;\r
+    }\r
+    if (html5.shivCSS && !supportsHtml5Styles) {\r
+      shived = !!addStyleSheet(ownerDocument,\r
+        // corrects block display not defined in IE6/7/8/9\r
+        'article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}' +\r
+        // corrects audio display not defined in IE6/7/8/9\r
+        'audio{display:none}' +\r
+        // corrects canvas and video display not defined in IE6/7/8/9\r
+        'canvas,video{display:inline-block;*display:inline;*zoom:1}' +\r
+        // corrects 'hidden' attribute and audio[controls] display not present in IE7/8/9\r
+        '[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}' +\r
+        // adds styling not present in IE6/7/8/9\r
+        'mark{background:#FF0;color:#000}'\r
+      );\r
+    }\r
+    if (!supportsUnknownElements) {\r
+      shived = !shivMethods(ownerDocument);\r
+    }\r
+    if (shived) {\r
+      ownerDocument.documentShived = shived;\r
+    }\r
+    return ownerDocument;\r
+  }\r
+\r
+  /*--------------------------------------------------------------------------*/\r
+\r
+  /**\r
+   * The `html5` object is exposed so that more elements can be shived and\r
+   * existing shiving can be detected on iframes.\r
+   * @type Object\r
+   * @example\r
+   *\r
+   * // options can be changed before the script is included\r
+   * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false };\r
+   */\r
+  var html5 = {\r
+\r
+    /**\r
+     * An array or space separated string of node names of the elements to shiv.\r
+     * @memberOf html5\r
+     * @type Array|String\r
+     */\r
+    'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video',\r
+\r
+    /**\r
+     * A flag to indicate that the HTML5 style sheet should be inserted.\r
+     * @memberOf html5\r
+     * @type Boolean\r
+     */\r
+    'shivCSS': !(options.shivCSS === false),\r
+\r
+    /**\r
+     * A flag to indicate that the document's `createElement` and `createDocumentFragment`\r
+     * methods should be overwritten.\r
+     * @memberOf html5\r
+     * @type Boolean\r
+     */\r
+    'shivMethods': !(options.shivMethods === false),\r
+\r
+    /**\r
+     * A string to describe the type of `html5` object ("default" or "default print").\r
+     * @memberOf html5\r
+     * @type String\r
+     */\r
+    'type': 'default',\r
+\r
+    // shivs the document according to the specified `html5` object options\r
+    'shivDocument': shivDocument\r
+  };\r
+\r
+  /*--------------------------------------------------------------------------*/\r
+\r
+  // expose html5\r
+  window.html5 = html5;\r
+\r
+  // shiv the document\r
+  shivDocument(document);\r
+\r
+  /*------------------------------- Print Shiv -------------------------------*/\r
+\r
+  /** Used to filter media types */\r
+  var reMedia = /^$|\b(?:all|print)\b/;\r
+\r
+  /** Used to namespace printable elements */\r
+  var shivNamespace = 'html5shiv';\r
+\r
+  /** Detect whether the browser supports shivable style sheets */\r
+  var supportsShivableSheets = !supportsUnknownElements && (function() {\r
+    // assign a false negative if unable to shiv\r
+    var docEl = document.documentElement;\r
+    return !(\r
+      typeof document.namespaces == 'undefined' ||\r
+      typeof document.parentWindow == 'undefined' ||\r
+      typeof docEl.applyElement == 'undefined' ||\r
+      typeof docEl.removeNode == 'undefined' ||\r
+      typeof window.attachEvent == 'undefined'\r
+    );\r
+  }());\r
+\r
+  /*--------------------------------------------------------------------------*/\r
+\r
+  /**\r
+   * Wraps all HTML5 elements in the given document with printable elements.\r
+   * (eg. the "header" element is wrapped with the "html5shiv:header" element)\r
+   * @private\r
+   * @param {Document} ownerDocument The document.\r
+   * @returns {Array} An array wrappers added.\r
+   */\r
+  function addWrappers(ownerDocument) {\r
+    var node,\r
+        nodes = ownerDocument.getElementsByTagName('*'),\r
+        index = nodes.length,\r
+        reElements = RegExp('^(?:' + getElements().join('|') + ')$', 'i'),\r
+        result = [];\r
+\r
+    while (index--) {\r
+      node = nodes[index];\r
+      if (reElements.test(node.nodeName)) {\r
+        result.push(node.applyElement(createWrapper(node)));\r
+      }\r
+    }\r
+    return result;\r
+  }\r
+\r
+  /**\r
+   * Creates a printable wrapper for the given element.\r
+   * @private\r
+   * @param {Element} element The element.\r
+   * @returns {Element} The wrapper.\r
+   */\r
+  function createWrapper(element) {\r
+    var node,\r
+        nodes = element.attributes,\r
+        index = nodes.length,\r
+        wrapper = element.ownerDocument.createElement(shivNamespace + ':' + element.nodeName);\r
+\r
+    // copy element attributes to the wrapper\r
+    while (index--) {\r
+      node = nodes[index];\r
+      node.specified && wrapper.setAttribute(node.nodeName, node.nodeValue);\r
+    }\r
+    // copy element styles to the wrapper\r
+    wrapper.style.cssText = element.style.cssText;\r
+    return wrapper;\r
+  }\r
+\r
+  /**\r
+   * Shivs the given CSS text.\r
+   * (eg. header{} becomes html5shiv\:header{})\r
+   * @private\r
+   * @param {String} cssText The CSS text to shiv.\r
+   * @returns {String} The shived CSS text.\r
+   */\r
+  function shivCssText(cssText) {\r
+    var pair,\r
+        parts = cssText.split('{'),\r
+        index = parts.length,\r
+        reElements = RegExp('(^|[\\s,>+~])(' + getElements().join('|') + ')(?=[[\\s,>+~#.:]|$)', 'gi'),\r
+        replacement = '$1' + shivNamespace + '\\:$2';\r
+\r
+    while (index--) {\r
+      pair = parts[index] = parts[index].split('}');\r
+      pair[pair.length - 1] = pair[pair.length - 1].replace(reElements, replacement);\r
+      parts[index] = pair.join('}');\r
+    }\r
+    return parts.join('{');\r
+  }\r
+\r
+  /**\r
+   * Removes the given wrappers, leaving the original elements.\r
+   * @private\r
+   * @params {Array} wrappers An array of printable wrappers.\r
+   */\r
+  function removeWrappers(wrappers) {\r
+    var index = wrappers.length;\r
+    while (index--) {\r
+      wrappers[index].removeNode();\r
+    }\r
+  }\r
+\r
+  /*--------------------------------------------------------------------------*/\r
+\r
+  /**\r
+   * Shivs the given document for print.\r
+   * @memberOf html5\r
+   * @param {Document} ownerDocument The document to shiv.\r
+   * @returns {Document} The shived document.\r
+   */\r
+  function shivPrint(ownerDocument) {\r
+    var shivedSheet,\r
+        wrappers,\r
+        namespaces = ownerDocument.namespaces,\r
+        ownerWindow = ownerDocument.parentWindow;\r
+\r
+    if (!supportsShivableSheets || ownerDocument.printShived) {\r
+      return ownerDocument;\r
+    }\r
+    if (typeof namespaces[shivNamespace] == 'undefined') {\r
+      namespaces.add(shivNamespace);\r
+    }\r
+\r
+    ownerWindow.attachEvent('onbeforeprint', function() {\r
+      var imports,\r
+          length,\r
+          sheet,\r
+          collection = ownerDocument.styleSheets,\r
+          cssText = [],\r
+          index = collection.length,\r
+          sheets = Array(index);\r
+\r
+      // convert styleSheets collection to an array\r
+      while (index--) {\r
+        sheets[index] = collection[index];\r
+      }\r
+      // concat all style sheet CSS text\r
+      while ((sheet = sheets.pop())) {\r
+        // IE does not enforce a same origin policy for external style sheets\r
+        if (!sheet.disabled && reMedia.test(sheet.media)) {\r
+          for (imports = sheet.imports, index = 0, length = imports.length; index < length; index++) {\r
+            sheets.push(imports[index]);\r
+          }\r
+          try {\r
+            cssText.push(sheet.cssText);\r
+          } catch(er){}\r
+        }\r
+      }\r
+      // wrap all HTML5 elements with printable elements and add the shived style sheet\r
+      cssText = shivCssText(cssText.reverse().join(''));\r
+      wrappers = addWrappers(ownerDocument);\r
+      shivedSheet = addStyleSheet(ownerDocument, cssText);\r
+    });\r
+\r
+    ownerWindow.attachEvent('onafterprint', function() {\r
+      // remove wrappers, leaving the original elements, and remove the shived style sheet\r
+      removeWrappers(wrappers);\r
+      shivedSheet.removeNode(true);\r
+    });\r
+\r
+    ownerDocument.printShived = true;\r
+    return ownerDocument;\r
+  }\r
+\r
+  /*--------------------------------------------------------------------------*/\r
+\r
+  // expose API\r
+  html5.type += ' print';\r
+  html5.shivPrint = shivPrint;\r
+\r
+  // shiv for print\r
+  shivPrint(document);\r
+\r
+}(this, document));/*yepnope1.5.3|WTFPL*/\r
+(function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,i){var j=b(a),l=j.autoCallback;j.url.split(".").pop().split("?").shift(),j.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]||h),j.instead?j.instead(a,e,f,g,i):(y[j.url]?j.noexec=!0:y[j.url]=1,f.load(j.url,j.forceCSS||!j.forceJS&&"css"==j.url.split(".").pop().split("?").shift()?"c":c,j.noexec,j.attrs,j.timeout),(d(e)||d(l))&&f.load(function(){k(),e&&e(j.origUrl,i,g),l&&l(j.origUrl,i,g),y[j.url]=2})))}function i(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var j,l,m=this.yepnope.loader;if(e(a))g(a,0,m,0);else if(w(a))for(j=0;j<a.length;j++)l=a[j],e(l)?g(l,0,m,0):w(l)?B(l):Object(l)===l&&i(l,m);else Object(a)===a&&i(a,m)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}})(this,document);\r
+Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0));};\r
+;
\ No newline at end of file
diff --git a/view/theme/dispy/js/modernizr.custom.2.5.3.min.js b/view/theme/dispy/js/modernizr.custom.2.5.3.min.js
new file mode 100644 (file)
index 0000000..1ce20bd
--- /dev/null
@@ -0,0 +1,4 @@
+/* Modernizr 2.5.3 (Custom Build) | MIT & BSD\r
+ * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-printshiv-mq-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load\r
+ */\r
+;window.Modernizr=function(a,b,c){function C(a){i.cssText=a}function D(a,b){return C(m.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a)if(i[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.substr(1),e=(a+" "+o.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+p.join(d+" ")+d).split(" "),H(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)t[c[d]]=c[d]in j;return t.list&&(t.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),t}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,g,h,i=a.length;d<i;d++)j.setAttribute("type",g=a[d]),e=j.type!=="text",e&&(j.value=k,j.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(g)&&j.style.WebkitAppearance!==c?(f.appendChild(j),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(j,null).WebkitAppearance!=="textfield"&&j.offsetHeight!==0,f.removeChild(j)):/^(search|tel)$/.test(g)||(/^(url|email)$/.test(g)?e=j.checkValidity&&j.checkValidity()===!1:/^color$/.test(g)?(f.appendChild(j),f.offsetWidth,e=j.value!=k,f.removeChild(j)):e=j.value!=k)),s[a[d]]=!!e;return s}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.5.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j=b.createElement("input"),k=":)",l={}.toString,m=" -webkit- -moz- -o- -ms- ".split(" "),n="Webkit Moz O ms",o=n.split(" "),p=n.toLowerCase().split(" "),q={svg:"http://www.w3.org/2000/svg"},r={},s={},t={},u=[],v=u.slice,w,x=function(a,c,d,e){var h,i,j,k=b.createElement("div"),l=b.body,m=l?l:b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),k.appendChild(j);return h=["&#173;","<style>",a,"</style>"].join(""),k.id=g,(l?k:m).innerHTML+=h,m.appendChild(k),l||(m.style.background="",f.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},y=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return x("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=v.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(v.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(v.call(arguments)))};return e});var J=function(c,d){var f=c.join(""),g=d.length;x(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch||(j.touch&&j.touch.offsetTop)===9,e.csstransforms3d=(j.csstransforms3d&&j.csstransforms3d.offsetLeft)===9&&j.csstransforms3d.offsetHeight===3,e.generatedcontent=(j.generatedcontent&&j.generatedcontent.offsetHeight)>=1,e.fontface=/src/i.test(h)&&h.indexOf(d.split(" ")[0])===0},g,d)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",m.join("touch-enabled),("),g,")","{#touch{top:9px;position:absolute}}"].join(""),["@media (",m.join("transform-3d),("),g,")","{#csstransforms3d{left:9px;position:absolute;height:3px;}}"].join(""),['#generatedcontent:after{content:"',k,'";visibility:hidden}'].join("")],["fontface","touch","csstransforms3d","generatedcontent"]);r.flexbox=function(){return I("flexOrder")},r["flexbox-legacy"]=function(){return I("boxDirection")},r.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},r.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},r.touch=function(){return e.touch},r.geolocation=function(){return!!navigator.geolocation},r.postmessage=function(){return!!a.postMessage},r.websqldatabase=function(){return!!a.openDatabase},r.indexedDB=function(){return!!I("indexedDB",a)},r.hashchange=function(){return z("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},r.history=function(){return!!a.history&&!!history.pushState},r.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},r.websockets=function(){for(var b=-1,c=o.length;++b<c;)if(a[o[b]+"WebSocket"])return!0;return"WebSocket"in a},r.rgba=function(){return C("background-color:rgba(150,255,150,.5)"),F(i.backgroundColor,"rgba")},r.hsla=function(){return C("background-color:hsla(120,40%,100%,.5)"),F(i.backgroundColor,"rgba")||F(i.backgroundColor,"hsla")},r.multiplebgs=function(){return C("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(i.background)},r.backgroundsize=function(){return I("backgroundSize")},r.borderimage=function(){return I("borderImage")},r.borderradius=function(){return I("borderRadius")},r.boxshadow=function(){return I("boxShadow")},r.textshadow=function(){return b.createElement("div").style.textShadow===""},r.opacity=function(){return D("opacity:.55"),/^0.55$/.test(i.opacity)},r.cssanimations=function(){return I("animationName")},r.csscolumns=function(){return I("columnCount")},r.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return C((a+"-webkit- ".split(" ").join(b+a)+m.join(c+a)).slice(0,-a.length)),F(i.backgroundImage,"gradient")},r.cssreflections=function(){return I("boxReflect")},r.csstransforms=function(){return!!I("transform")},r.csstransforms3d=function(){var a=!!I("perspective");return a&&"webkitPerspective"in f.style&&(a=e.csstransforms3d),a},r.csstransitions=function(){return I("transition")},r.fontface=function(){return e.fontface},r.generatedcontent=function(){return e.generatedcontent},r.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},r.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},r.localstorage=function(){try{return localStorage.setItem(g,g),localStorage.removeItem(g),!0}catch(a){return!1}},r.sessionstorage=function(){try{return sessionStorage.setItem(g,g),sessionStorage.removeItem(g),!0}catch(a){return!1}},r.webworkers=function(){return!!a.Worker},r.applicationcache=function(){return!!a.applicationCache},r.svg=function(){return!!b.createElementNS&&!!b.createElementNS(q.svg,"svg").createSVGRect},r.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==q.svg},r.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(l.call(b.createElementNS(q.svg,"animate")))},r.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(l.call(b.createElementNS(q.svg,"clipPath")))};for(var L in r)B(r,L)&&(w=L.toLowerCase(),e[w]=r[L](),u.push((e[w]?"":"no-")+w));return e.input||K(),C(""),h=j=null,e._version=d,e._prefixes=m,e._domPrefixes=p,e._cssomPrefixes=o,e.mq=y,e.hasEvent=z,e.testProp=function(a){return G([a])},e.testAllProps=I,e.testStyles=x,e}(this,this.document),function(a,b){function g(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function h(){var a=k.elements;return typeof a=="string"?a.split(" "):a}function i(a){var b={},c=a.createElement,e=a.createDocumentFragment,f=e();a.createElement=function(a){var e=(b[a]||(b[a]=c(a))).cloneNode();return k.shivMethods&&e.canHaveChildren&&!d.test(a)?f.appendChild(e):e},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+h().join().replace(/\w+/g,function(a){return b[a]=c(a),f.createElement(a),'c("'+a+'")'})+");return n}")(k,f)}function j(a){var b;return a.documentShived?a:(k.shivCSS&&!e&&(b=!!g(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),f||(b=!i(a)),b&&(a.documentShived=b),a)}function o(a){var b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+h().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(p(b)));return f}function p(a){var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(m+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function q(a){var b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+h().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+m+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return c.join("{")}function r(a){var b=a.length;while(b--)a[b].removeNode()}function s(a){var b,c,d=a.namespaces,e=a.parentWindow;return!n||a.printShived?a:(typeof d[m]=="undefined"&&d.add(m),e.attachEvent("onbeforeprint",function(){var d,e,f,h=a.styleSheets,i=[],j=h.length,k=Array(j);while(j--)k[j]=h[j];while(f=k.pop())if(!f.disabled&&l.test(f.media)){for(d=f.imports,j=0,e=d.length;j<e;j++)k.push(d[j]);try{i.push(f.cssText)}catch(m){}}i=q(i.reverse().join("")),c=o(a),b=g(a,i)}),e.attachEvent("onafterprint",function(){r(c),b.removeNode(!0)}),a.printShived=!0,a)}var c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea)$/i,e,f;(function(){var a=b.createElement("a");a.innerHTML="<xyz></xyz>",e="hidden"in a,f=a.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var k={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:j};a.html5=k,j(b);var l=/^$|\b(?:all|print)\b/,m="html5shiv",n=!f&&function(){var c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();k.type+=" print",k.shivPrint=s,s(b)}(this,document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,i){var j=b(a),l=j.autoCallback;j.url.split(".").pop().split("?").shift(),j.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]||h),j.instead?j.instead(a,e,f,g,i):(y[j.url]?j.noexec=!0:y[j.url]=1,f.load(j.url,j.forceCSS||!j.forceJS&&"css"==j.url.split(".").pop().split("?").shift()?"c":c,j.noexec,j.attrs,j.timeout),(d(e)||d(l))&&f.load(function(){k(),e&&e(j.origUrl,i,g),l&&l(j.origUrl,i,g),y[j.url]=2})))}function i(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var j,l,m=this.yepnope.loader;if(e(a))g(a,0,m,0);else if(w(a))for(j=0;j<a.length;j++)l=a[j],e(l)?g(l,0,m,0):w(l)?B(l):Object(l)===l&&i(l,m);else Object(a)===a&&i(a,m)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/view/theme/dispy/light/_base.less b/view/theme/dispy/light/_base.less
new file mode 100644 (file)
index 0000000..35a539a
--- /dev/null
@@ -0,0 +1,101 @@
+//*
+//* _base.less
+//*
+//*
+
+//* backgrounds */
+@dk_bg_colour: #1d1f1d;
+@bg_colour: #2e2f2e;
+@bg_alt_colour: #2e302e;
+@med_bg_colour: #4e4f4f;
+@menu_bg_colour: #555753;
+
+
+//* font colour, aka color: */
+@lt_main_colour: #ffff99;
+@main_colour: #eeeecc;
+@main_alt_colour: #eeeeee;
+@disabled_colour: #ddddbb;
+@shiny_colour: #2e3436;
+
+@lt_main_colour: lighten(@bg_colour, 10%);
+@dk_main_colour: darken(@bg_colour, 10%);
+
+//* links */
+@link_colour: #88a9d2;
+@dk_link_colour: darken(@link_colour, 10%);
+@lt_link_colour: lighten(@link_colour, 10%);
+//@hover_colour: #729fcf;
+@hover_colour: darken(@link_colour, 10%);
+
+//* box shadows */
+@menu_shadow: 5px 0 10px 0 #111;
+@main_shadow: 3px 3px 3px 10px 0 #111;
+
+// default here is @main_shadow
+.box_shadow(@h: 5px, @v: 5px, @blur: 5px, @spread: 0px, @colour: #111) {
+       -moz-box-shadow: @h @v @blur @spread @colour;
+       -o-box-shadow: @h @v @blur @spread @colour;
+       -webkit-box-shadow: @h @v @blur @spread @colour;
+       -ms-box-shadow: @h @v @blur @spread @colour;
+       box-shadow: @h @v @blur @spread @colour;
+}
+
+//* text-shadow */
+.text_shadow (@h: 1px, @v: 1px, @c: #111) {
+       -moz-text-shadow: @h @v @c;
+       -o-text-shadow: @h @v @c;
+       -webkit-text-shadow: @h @v @c;
+       -ms-text-shadow: @h @v @c;
+       text-shadow: @h @v @c;
+}
+//* transitions */
+.transition (@type: all, @dur: 0.5s, @effect: ease-in-out) {
+    -webkit-transition: @arguments;
+    -moz-transition: @arguments;
+    -o-transition: @arguments;
+    -ms-transition: @arguments;
+    transition: @arguments;
+}
+
+//* borders */
+.borders (@size: 1px, @style: solid, @colour: @main_colour) {
+       border: @size @style @colour;
+}
+
+//* rounded box corners */
+.rounded_corners (@r: 5px) {
+       -o-border-radius: @r;
+       -webkit-border-radius: @r;
+       -moz-border-radius: @r;
+       -ms-border-radius: @r;
+       border-radius: @r;
+}
+
+//* pre wrap */
+.wrap () {
+       white-space: pre-wrap;
+       white-space: pre;
+       word-wrap: break-word;
+}
+//* font size sizing */
+.default_font_size () {
+       font-size: 16px;
+       line-height: 1.1em;
+       font-family: sans-serif;
+}
+
+//* reset ul, ol */
+.list_reset () {
+       margin: 0px;
+       padding: 0px;
+       list-style: none;
+       list-style-position: inside;
+}
+
+//* box size: width, height */
+.box (@w: 20px, @h: 20px) {
+       width: @w;
+       height: @h;
+}
+
index f14ea7915e1f75c48c89577e75fd3b59bfe7f89b..cf0054a675ee85a5aded3174318e66f4dcb867cc 100644 (file)
@@ -2,7 +2,7 @@
 
        {{ if $profile.edit }}
        <div class="action">
-       <span class="icon-profile-edit"></span>
+       <span class="icon-profile-edit" rel="#profiles-menu"></span>
        <a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
        <ul id="profiles-menu" class="menu-popup">
                {{ for $profile.menu.entries as $e }}