fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mirror olimpiada migration (shared db)
[edumed.git]
/
edumed
/
static
/
css
/
main.scss
diff --git
a/edumed/static/css/main.scss
b/edumed/static/css/main.scss
index
9b27291
..
8d21b1d
100755
(executable)
--- a/
edumed/static/css/main.scss
+++ b/
edumed/static/css/main.scss
@@
-1,30
+1,28
@@
$px: .0625em;
$px: .0625em;
+$horiz_padding: 10*$px;
+$width_offset: 20*$px;
+
@mixin main-promobox-shape() {
background: #16a487;
@mixin main-promobox-shape() {
background: #16a487;
- padding:
0.75em 20*$px
;
+ padding:
1em $horiz_padding
;
border-radius: 15*$px;
}
#main-promobox {
float: right;
border-radius: 15*$px;
}
#main-promobox {
float: right;
- width: 220*$px -
2 * 20*$px
;
+ width: 220*$px -
$width_offset
;
height: 235*$px - 2 * 1.5em;
a {
@include main-promobox-shape();
display: block;
height: 235*$px - 2 * 1.5em;
a {
@include main-promobox-shape();
display: block;
- margin-bottom: 1
.4
em;
- width: 220*$px -
4 * 20*$px
;
+ margin-bottom: 1em;
+ width: 220*$px -
$width_offset - 2*$horiz_padding
;
float: left;
float: left;
- &:first-of-type {
- padding-top: 0;
- border-top-right-radius: 0;
- border-top-left-radius: 0;
- }
&:last-of-type {
margin-bottom: 0;
}
&:last-of-type {
margin-bottom: 0;
}
@@
-36,8
+34,10
@@
$px: .0625em;
margin: 0;
text-transform: uppercase;
font-size: .9em;
margin: 0;
text-transform: uppercase;
font-size: .9em;
- width: 22
0*$px - 3 * 20*$px
;
+ width: 22
2*$px - 2 * $horiz_padding
;
float: left;
float: left;
+ padding-top: 1.25em;
+ padding-bottom: 1.25em;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
@@
-89,7
+89,6
@@
$px: .0625em;
a {
color: white;
text-transform: uppercase;
a {
color: white;
text-transform: uppercase;
- display: block;
height: 80*$px;
display: table;
padding: 5px;
height: 80*$px;
display: table;
padding: 5px;
@@
-196,6
+195,11
@@
$px: .0625em;
p {
margin: 0 0 30*$px 1.4em;
}
p {
margin: 0 0 30*$px 1.4em;
}
+ .side-banner img {
+ display: block;
+ width: 100%;
+ margin-bottom: 0.2em;
+ }
}
#main-chosen {
}
#main-chosen {