Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
f8acb32961
|
@ -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;}
|
||||
|
|
|
@ -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; } }
|
||||
|
|
Loading…
Reference in New Issue
Block a user