Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DRAFT] Fix the mess that is css #957

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ markdown: kramdown
data_dir: _content

# Assets settings - see scripts in package.json for SASS settings.
sass:
sass_dir: assets/stylesheets/
style: compressed
sourcemap: never
#sass:
# sass_dir: stylesheets/
# style: compressed
# sourcemap: never

# Plugins
plugins:
Expand Down
2 changes: 1 addition & 1 deletion _includes/_head.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">

<link rel="stylesheet" media="all" href="{{ site.baseurl }}/assets/stylesheets/styles.css" />
<link rel="stylesheet" media="all" href="{{ site.baseurl }}/assets/css/styles.css" />
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | prepend: site.url }}" />
{{ include.append }}
<script type="application/javascript" src="{{ site.baseurl }}/assets/js/vendor/uswds-init.min.js"></script>
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"build": "npm run css && cross-env JEKYLL_ENV=production LC_CTYPE=UTF-8 bundle exec jekyll build",
"build-staging": "npm run css && cross-env JEKYLL_ENV=staging LC_CTYPE=UTF-8 bundle exec jekyll build",
"css": "npm run css:sass && npm run css:autoprefixer",
"css:sass": "sass assets/stylesheets/styles.scss _site/assets/stylesheets/styles.css --update --style=compressed --no-source-map --load-path='node_modules/@uswds/uswds/packages'",
"css:sass:watch": "sass assets/stylesheets/styles.scss _site/assets/stylesheets/styles.css --watch --style=compressed --no-source-map --load-path='node_modules/@uswds/uswds/packages'",
"css:autoprefixer": "npx postcss _site/assets/stylesheets/styles.css --map=false --use autoprefixer -d _site/assets/stylesheets",
"css:sass": "sass stylesheets/styles.scss _site/assets/css/styles.css --update --style=compressed --no-source-map --load-path='node_modules/@uswds/uswds/packages'",
"css:sass:watch": "sass stylesheets/styles.scss _site/assets/css/styles.css --watch --style=compressed --no-source-map --load-path='node_modules/@uswds/uswds/packages'",
"css:autoprefixer": "npx postcss _site/assets/css/styles.css --map=false --use autoprefixer -d _site/assets/stylesheets",
"serve": "npm run css:sass:watch & cross-env LC_CTYPE=UTF-8 bundle exec jekyll serve --livereload",
"serve-all-hosts": "npm run css & cross-env LC_CTYPE=UTF-8 bundle exec jekyll serve --host 0.0.0.0 --livereload",
"start": "npm run serve",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.