Skip to content

Commit

Permalink
Merge pull request #26 from Econify/hotfix-bad-merge-conflicts-resolu…
Browse files Browse the repository at this point in the history
…tion

[CF] Hotfix: Fix Bad Merge Conflicts Resolution
  • Loading branch information
craigfay committed Jun 30, 2022
2 parents 406cd45 + 6a262e7 commit b06a0a4
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions distill/src/template_syntax.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ impl Default for Options {
atom_style: AtomStyle::ClassAttribute,
pseudo_classes: IndexMap::default(),
breakpoints: IndexMap::default(),
breakpoint_modifier_style: BreakpointModifierStyle::Prefix,
breakpoint_modifier_style: ModifierStyle::Prefix,
breakpoint_modifier_seperator: "\\:".to_string(),
pseudo_class_modifier_style: ModifierStyle::Prefix,
pseudo_class_modifier_seperator: "\\:".to_string(),
root_variable_prefix: "_".to_string(),
}
}
Expand Down Expand Up @@ -207,11 +209,11 @@ fn get_pseudo_class_transforms(

let sep = options.breakpoint_modifier_seperator.to_string();

match options.breakpoint_modifier_style {
BreakpointModifierStyle::Prefix => {
match options.pseudo_class_modifier_style {
ModifierStyle::Prefix => {
selector = format!("{}{}{}", name, sep, selector);
}
BreakpointModifierStyle::Suffix => {
ModifierStyle::Suffix => {
selector = format!("{}{}{}", selector, sep, name);
}
}
Expand Down

0 comments on commit b06a0a4

Please sign in to comment.