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

New brand styles integration #8368

Merged
merged 152 commits into from
Feb 13, 2021
Merged

New brand styles integration #8368

merged 152 commits into from
Feb 13, 2021

Conversation

octavioamu
Copy link
Contributor

@octavioamu octavioamu commented Feb 5, 2021

Description

EPIC - New brand styles integration

This PR:

  • Builds on top of GPG/redesign #8360
  • Copies all stylesheets from ./app/assets/v2/css/**/**/*.css (and other locations) -> ./app/assets/v2/scss/**/**/*.scss
  • Internalises vue-innersearch.css and quill.*.css (as .scss)
  • Changes all stylesheet paths to sass equivalents (with django-libsass block's) in templates (* ~100 files)
  • Removes all stylesheets from ./app/assets/v2/css/**/**/*.css
  • Drops preloads from shared/head.html
  • Fixes stylelint path and introduces stylelint-scss (temporarily adding no-descending-specificity until we've sorted out nesting in the sass files)
  • Fixes stylesheets manually and with stylelint --fix
  • Drops typography.css from email templates (ignored by premailer) and tests
  • Adds collectstatic to travis build to enable tests to pass (with precompilation over sass assets)
  • Fixes minor styling bug on quests (global .btn being overridden by page styles)
  • Drops stylesheets that don't exist (having checked against live site)
  • Adds offline precompilation steps for production
  • Adds JS bundling to further reduce requests
  • Removes duplicated script and stylesheet inclusions
  • Removes jquery-old where appropriate (moving select2 out of the if slim block)
  • Adds jsrender to the if slim block
Refers/Fixes

Refers: #8363
Refers: #8308
Refers: #8358

gdixon and others added 30 commits February 5, 2021 15:24
@gdixon gdixon changed the title new brand styles components WIP: New brand styles integration Feb 11, 2021
@gdixon gdixon marked this pull request as ready for review February 11, 2021 00:52
@gdixon gdixon changed the title WIP: New brand styles integration New brand styles integration Feb 11, 2021
@thelostone-mc
Copy link
Member

DAMN THIS IS A FANCY PR @gdixon @octavioamu

<script src="{% static "v2/js/ipfs.js" %}"></script>
<script src="{% static "v2/js/lib/secrets.min.js" %}"></script>
<script src="{% static "v2/js/ethereumjs-accounts.js" %}"></script>
<script src="{% static "onepager/js/send.js" %}"></script>
<script src="{% static "v2/js/truncate-hash.js" %}"></script>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this not needed ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is already loaded on footer_scripts

{% compress css file admin_dashboard %}
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/admin/dashboard.scss" %} />
{% endcompress %}
{% endblock %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-indent with 2 spaces

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is done, and I've fixed another ~20 templates too!

Copy link
Member

@thelostone-mc thelostone-mc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor comments but other wise I am excited for this PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants