Merge remote branch 'upstream/master'

[friendica.git] / view / theme / dispy / dark / _base.less

diff --git a/view/theme/dispy/dark/_base.less b/view/theme/dispy/dark/_base.less
index 77472a2f5cf5b0118eaff5f01b3433226b053cae..000cdbd5abef80a78f8e897dc402e522d51202ae 100644 (file)
--- a/view/theme/dispy/dark/_base.less
+++ b/view/theme/dispy/dark/_base.less
@@ -13,6 +13,9 @@
 // you "compile" the css (with `lessc`), but css (/**/) comments
 // do. i use them to our advantage :).
 
+// import our reset styles first
+@import "../css/reset";
+
 //* backgrounds */
 @dk_bg_colour: #1d1f1d;
 @bg_colour: #2e2f2e;
@@ -20,7 +23,6 @@
 @med_bg_colour: #4e4f4e;
 @menu_bg_colour: #555753;
 
-
 //* font colour, aka color: */
 @lt_main_colour: #ffff99;
 @main_colour: #eeeecc;
@@ -45,6 +47,7 @@
 @orange: #f8911b;
 @lt_orange: #fcaf3e;
 @shadow_colour: darken(@main_alt_colour, 86.5%);
+@lt_shadow_colour: #888888;
 @friendica_blue: #3465a4;
 @border2: #babdb6;
 @group_show: #9ade00;
@@ -63,6 +66,9 @@
 //@hover_colour: #729fcf;
 @hover_colour: @dk_link_colour;
 
+// other colours
+@med_border_colour: #c8bebe;
+
 //* box shadows */
 @menu_shadow: 5px 0 10px 0 @shadow_colour;
 @main_shadow: 3px 3px 3px 10px 0 @shadow_colour;
@@ -93,7 +99,7 @@
 //*/
 
 //* text-shadow */
-.text_shadow (@h: 1px, @v: 1px, @c: #111) {
+.text_shadow (@h: 1px, @v: 1px, @c: @shadow_colour) {
        -moz-text-shadow: @h @v @c;
        -o-text-shadow: @h @v @c;
        -webkit-text-shadow: @h @v @c;
@@ -101,7 +107,7 @@
        text-shadow: @h @v @c;
 }
 //* transitions */
-.transition (@type: all, @dur: 0.5s, @effect: ease-in-out) {
+.transition (@type: all, @dur: 0.75s, @effect: ease-in-out) {
     -webkit-transition: @arguments;
     -moz-transition: @arguments;
     -o-transition: @arguments;
@@ -113,7 +119,9 @@
 .borders (@size: 1px, @style: solid, @colour: @main_colour) {
        border: @size @style @colour;
 }
-
+.med_borders (@sz: 2px, @st: solid, @c: @med_border_colour) {
+       border: @sz @st @c;
+}
 //* rounded box corners */
 .rounded_corners (@r: 5px) {
        -o-border-radius: @r;
@@ -138,10 +146,16 @@
 }
 //* font size sizing */
 .default_font () {
-       font-size: 16px;
+       font-size: 14pt;
        line-height: 1.1em;
        font-family: sans-serif;
 }
+.font_size_adjust () {
+       -webkit-text-size-adjust: 100%;
+       -ms-text-size-adjust: 100%;
+       -o-text-size-adjust: 100%;
+       font-size-adjust: 100%;
+}
 
 //* reset ul, ol */
 .list_reset () {