Fixes

Author: domdfcoding

dict2css/__init__.py

@@ -273,7 +273,7 @@ def parse_style(style: List[tinycss2.ast.Node]) -> MutableMapping[str, Property]
 			styles_dict[_serialize(rule.prelude)] = parse_style(rule.content)
 
 		elif isinstance(rule, tinycss2.ast.AtRule):
-			at_rule_styles = styles_dict[f"@{rule.at_keyword} {_serialize(rule.prelude)}"]
+			at_rule_styles = styles_dict[f"@{rule.at_keyword} {_serialize(rule.prelude)}"] = {}
 
 			for child in tinycss2.parse_blocks_contents(rule.content, skip_comments=True, skip_whitespace=True):
 				at_rule_styles[_serialize(child.prelude)] = parse_style(child.content)

dict2css/serializer.py

@@ -123,16 +123,19 @@ def _set_options(
 
 		self._sort_keys: bool = sort_keys
 		self._indent_str: Optional[str] = None if minify else indent
-		self._key_separator: str = ": "
+
+		if minify:
+			self._key_separator: str = ':'
+		else:
+			self._key_separator = ": "
 
 		if not indent and not minify:
 			self._item_separator: str = "; "
 		else:
 			self._item_separator = ';'
 
 		if minify:
-			self._trailing_semicolon: bool = True
-			self._key_separator = ':'
+			self._trailing_semicolon = False
 		elif trailing_semicolon is None:
 			self._trailing_semicolon = indent is not None
 		else:
@@ -266,7 +269,7 @@ def _iterencode_list(
 			if first:
 				yield ''
 				first = False
-			elif not self._minify:
+			else:
 				yield ' '
 
 			if isinstance(value, (list, tuple)):
@@ -315,7 +318,9 @@ def _iterencode_dict(
 			indent_level += 1
 			newline_indent = '\n' + self._indent_str * indent_level
 			assert newline_indent is not None
-			yield newline_indent
+
+			if indent_level > 0:
+				yield newline_indent
 
 		first = True
 		if self._sort_keys:
@@ -359,9 +364,12 @@ def _iterencode_dict(
 		if indent_level >= 0:
 			if self._indent_closing_brace:
 				assert self._indent_str is not None
-				yield self._indent_str + '}'
-			else:
-				yield '}'
+				yield self._indent_str
+
+			yield '}'
+
+			if not self._minify:
+				yield '\n'
 
 		if self._markers is not None and marker_id is not None:
 			del self._markers[marker_id]