fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate 404 page for mil site
[edumed.git]
/
edumed
/
static
/
css
/
base.scss
diff --git
a/edumed/static/css/base.scss
b/edumed/static/css/base.scss
index
5c38509
..
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;
@@
-140,7
+136,7
@@
footer.main {
border-top: 1px solid #c9ccce;
width: 940 * $px;
padding: .2em 10 * $px;
border-top: 1px solid #c9ccce;
width: 940 * $px;
padding: .2em 10 * $px;
- margin: 40*$px auto
0
auto;
+ margin: 40*$px auto
1em
auto;
color: #9a9c9e;
p {
color: #9a9c9e;
p {
@@
-159,6
+155,9
@@
footer.main {
font-size: .75em;
}
}
font-size: .75em;
}
}
+ .footer-extra p {
+ margin-top: 0;
+ }
}
}
@@
-239,3
+238,10
@@
footer.main {
margin: 1em 0;
}
}
margin: 1em 0;
}
}
+
+.flatpage {
+ img {
+ border: 5*$px solid #eee;
+ margin: 1.3em;
+ }
+}