fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Final mark as an average from individual marks
[edumed.git]
/
edumed
/
static
/
css
/
base.scss
diff --git
a/edumed/static/css/base.scss
b/edumed/static/css/base.scss
index
c29938d
..
38f8a09
100644
(file)
--- a/
edumed/static/css/base.scss
+++ b/
edumed/static/css/base.scss
@@
-1,9
+1,7
@@
@import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);
@import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);
-$px: .0625em;
-$oranji: #ed7831;
-$ciemny: #363a3e;
-$zielony: #16a487;
+@import "vars";
+@import "mixins";
a {
a {
@@
-16,10
+14,8
@@
a {
}
body {
}
body {
-
font-family: Dosis
;
+
@include base-font
;
margin: 0;
margin: 0;
- background: white;
- color: $ciemny;
}
.clr {
clear: both;
}
.clr {
clear: both;