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

Fixed style regression #624

Merged
merged 1 commit into from
Jun 23, 2016
Merged

Fixed style regression #624

merged 1 commit into from
Jun 23, 2016

Conversation

noisecapella
Copy link
Contributor

What are the relevant tickets?

Fixes #620

What's this PR do?

Moves the react-mdl CSS back into dashboard.js. It overrides many common style rules which is why we're seeing different styles with it included. We're only using bootstrap CSS on the 404 page currently so this shouldn't cause any problems.

How should this be manually tested?

First, turn on DEBUG mode so we can view the 404 page. You can do this by setting DEBUG=False in settings.py and adding your host name to the ALLOWED_HOSTS list.

Then run NODE_ENV=production ./webpack_if_prod.sh in your terminal to generate static assets. Next, run docker-compose run web ./manage.py collectstatic to copy static assets into staticfiles/.

After that, look at the two screenshots for the program page in #620. Go to a program page and verify that it looks like it did before, more or less. Go to /xyz/ and verify the 404 page still works as expected, and also click the dropdown and click 'logout' to make sure that works.

@bdero bdero temporarily deployed to micromasters-ci-pr-624 June 22, 2016 21:13 Inactive
@giocalitri giocalitri self-assigned this Jun 23, 2016
@giocalitri
Copy link
Contributor

@noisecapella just FYI, at the addresses /404/ and /500/ you can see the error pages with DEBUG=True

@giocalitri
Copy link
Contributor

👍

@noisecapella noisecapella merged commit ea42af3 into master Jun 23, 2016
@noisecapella noisecapella deleted the gs/fix_style_regression branch June 23, 2016 14:31
This was referenced Jul 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants