aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/css/mediaquery.nim1
-rw-r--r--test/layout/media-query.color.expected1
-rw-r--r--test/layout/media-query.html4
3 files changed, 5 insertions, 1 deletions
diff --git a/src/css/mediaquery.nim b/src/css/mediaquery.nim
index f86ea197..c1a7b837 100644
--- a/src/css/mediaquery.nim
+++ b/src/css/mediaquery.nim
@@ -427,7 +427,6 @@ proc parseMediaQuery(parser: var MediaQueryParser): Opt[MediaQuery] =
else:
return err()
elif tokval.equalsIgnoreCase("and"):
- parser.reconsume()
return parser.parseMediaAnd(res)
else:
return err()
diff --git a/test/layout/media-query.color.expected b/test/layout/media-query.color.expected
index edb263b3..86d5c0e3 100644
--- a/test/layout/media-query.color.expected
+++ b/test/layout/media-query.color.expected
@@ -1 +1,2 @@
red
+green
diff --git a/test/layout/media-query.html b/test/layout/media-query.html
index b450807f..dbf5f3a1 100644
--- a/test/layout/media-query.html
+++ b/test/layout/media-query.html
@@ -2,8 +2,12 @@
@mediA (WiDtH >= 1px) and (HeiGhT < 10000px) {
#red { color: red }
}
+@media screen and (WiDtH >= 1px) {
+ #green { color: green }
+}
@media (width >= 1px 2px) {
#red { color: blue }
}
</style>
<div id=red>red</div>
+<div id=green>green</div>