From 8f504e0b03c00c825ded4ef0472e8463cb5af5ea Mon Sep 17 00:00:00 2001 From: Philip Belesky Date: Tue, 27 Jun 2017 10:09:51 +1000 Subject: [PATCH] CSS fixes; add bash script for rebuilding fixtures --- bin/rebuild_fixtures.sh | 6 ++++++ .../templates/scss/components/diversity-highlights.scss | 4 +++- tabbycat/templates/scss/modules/typography.scss | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 bin/rebuild_fixtures.sh diff --git a/bin/rebuild_fixtures.sh b/bin/rebuild_fixtures.sh new file mode 100644 index 00000000000..001a1910be5 --- /dev/null +++ b/bin/rebuild_fixtures.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +dj loaddata ./data/fixtures/completed_demo.json +dj migrate +dj checkpreferences +dj dumpdata --natural-foreign --natural-primary -e options -e sessions -e contenttypes --format=json -o data/fixtures/completed_demo.json \ No newline at end of file diff --git a/tabbycat/templates/scss/components/diversity-highlights.scss b/tabbycat/templates/scss/components/diversity-highlights.scss index f9bb87581f5..bff640daaf1 100644 --- a/tabbycat/templates/scss/components/diversity-highlights.scss +++ b/tabbycat/templates/scss/components/diversity-highlights.scss @@ -108,12 +108,15 @@ path.gender-nm { fill: $female; } + path.gender-male { fill: $male; } + path.gender-other { fill: $unknown; } + path.gender-other { fill: $other; } @@ -167,7 +170,6 @@ path.gender-other { } } - // For D3 path.region-0 { fill: $region-cat-0; diff --git a/tabbycat/templates/scss/modules/typography.scss b/tabbycat/templates/scss/modules/typography.scss index 1fc8204a586..94fe40ca974 100644 --- a/tabbycat/templates/scss/modules/typography.scss +++ b/tabbycat/templates/scss/modules/typography.scss @@ -4,8 +4,7 @@ // Primary Typeface @font-face { font-family: 'LatoLatinWeb'; - src: url('/static/fonts/lato-normal.woff2') format('woff2'), - url('/static/fonts/lato-normal.woff') format('woff'); + src: url('/static/fonts/lato-normal.woff2') format('woff2'), url('/static/fonts/lato-normal.woff') format('woff'); font-weight: normal; font-style: normal; text-rendering: optimizeLegibility;