aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-01 01:19:02 -0700
committerfriendica <info@friendica.com>2012-05-01 01:19:02 -0700
commitf8acb329616fbe17f8a0df9cfd84f92503359bce (patch)
tree5925672dfc56b7821a2165cb6fa82b5c6e9a45d5
parent584ac68ae4a230c7a61b2720be8bac3de34d68da (diff)
parentfacffe17451630118342690e9b653c3dffd666be (diff)
downloadvolse-hubzilla-f8acb329616fbe17f8a0df9cfd84f92503359bce.tar.gz
volse-hubzilla-f8acb329616fbe17f8a0df9cfd84f92503359bce.tar.bz2
volse-hubzilla-f8acb329616fbe17f8a0df9cfd84f92503359bce.zip
Merge https://github.com/friendica/friendica into pull
-rw-r--r--view/theme/dispy/light/style.css8
-rw-r--r--view/theme/dispy/light/style.less12
2 files changed, 11 insertions, 9 deletions
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 8fc48a80f..19ae9b6e8 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -2,10 +2,10 @@ 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:#222;background-color:#e8e8e8;}
-button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#e8e8e8;}
-select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#e8e8e8;}
-option{padding:3px;color:#222;background:#e8e8e8;}option[selected="selected"]{color:#111;background:#cca;}
+body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#111;background-color:#eee;}
+button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#eee;}
+select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#eee;}
+option{padding:3px;color:#222;background:#eee;}option[selected="selected"]{color:#111;background:#cca;}
ul,ol{padding:0;}
:focus{outline:0;}
[disabled="disabled"]{background:#ddd;color:#333;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 57b40351b..8968da42e 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -13,6 +13,8 @@
/* from html5boilerplate */
/* these are to tell browsers they should be displayed a certain way */
+//@import "_base.less";
+
article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
display: block; }
@@ -44,25 +46,25 @@ body {
font-size: 16px;
line-height: 1.1em;
font-family: sans-serif;
- color: #222;
- background-color: #e8e8e8; }
+ color: #111;
+ background-color: #eee; }
button, input, select, textarea {
font-family: sans-serif;
color: #222;
- background-color: #e8e8e8; }
+ background-color: #eee; }
select {
border: 1px #555 dotted;
padding: 3px;
margin: 3px;
color: #222;
- background: #e8e8e8; }
+ background: #eee; }
option {
padding: 3px;
color: #222;
- background: #e8e8e8;
+ background: #eee;
&[selected="selected"] {
color: #111;
background: #cca; } }