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.

Sign up for GitHub

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

Jump to bottom

Update css folder structure #9071

Merged
merged 1 commit into from
Jul 28, 2020
Merged

Update css folder structure #9071

merged 1 commit into from
Jul 28, 2020

Conversation

brad-decker
Copy link
Contributor

@brad-decker brad-decker commented Jul 24, 2020 •
edited
Loading

  1. rename variables to design-system to allow a combination of placeholder selectors (e.g %shared-styles), mixins (e.g @mixin example) and all other scss goodies alongside variables.
  2. moved breakpoint variables from the variables file in itcss to our new design system folder, I believe these will need to be updated but they are used enough to start bringing them in.
  3. moved deprecated colors into a temporary file in design-system. This was done to allow for proper import orders while maintaining the structure and comments of the css/index.scss file.
  4. Moved generic/index.scss to css/base-styles.scss because it actually has quite a bit of important styling in it and its previous location didn't relate to its significance.
  5. Moved generic/reset.scss to css/reset.scss for similar reasons
  6. Import generic/reset.scss from css/index.scss instead of css/base-styles.scss
  7. trimmed some unused styles in base-styles: I did a global search for the class names without a '.' and came up with only css files mentioned. as you review make sure I didn't remove anything critical.

Depends on:

This was referenced Jul 24, 2020
Merged
Merged
Closed
@metamaskbot
Copy link
Collaborator

Builds ready [3031430]
Page Load Metrics (665 ± 51 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint30116592713
domContentLoaded37582166410551
load37782366510551
domInteractive37582166310551

@brad-decker
Copy link
Contributor Author

Update fonts

Base automatically changed from add-euclid-fontface to develop July 27, 2020 22:15
@brad-decker brad-decker force-pushed the update-css-folder-structure branch 2 times, most recently from c6eb39d to cb319d3 Compare July 27, 2020 22:17
@metamaskbot
Copy link
Collaborator

Builds ready [cb319d3]
Page Load Metrics (705 ± 37 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint31107572512
domContentLoaded4598017027837
load4618037057837
domInteractive4598007027837

@brad-decker brad-decker marked this pull request as ready for review July 28, 2020 14:29
@brad-decker brad-decker requested a review from a team as a code owner July 28, 2020 14:29
@brad-decker brad-decker force-pushed the update-css-folder-structure branch from cb319d3 to e2b50b4 Compare July 28, 2020 19:52
Gudahtt
Gudahtt approved these changes Jul 28, 2020
View reviewed changes
Copy link
Member

@Gudahtt Gudahtt left a comment

Choose a reason for hiding this comment

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

LGTM!

@metamaskbot
Copy link
Collaborator

Builds ready [e2b50b4]
Page Load Metrics (681 ± 41 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint29118553015
domContentLoaded5778286798641
load5798306818541
domInteractive5778286788641

@brad-decker brad-decker merged commit 4cc3fff into develop Jul 28, 2020
@brad-decker brad-decker deleted the update-css-folder-structure branch July 28, 2020 20:16
Gudahtt added a commit that referenced this pull request Jul 30, 2020
@Gudahtt
Merge remote-tracking branch 'origin/develop' into build-sys-2
1e042f2 
* origin/develop: (582 commits)
  Use async/await for seedPhraseVerifier.verifyAccounts (#9100)
  Use async/await for getRestrictedMethods (#9099)
  Update dependencies (#9105)
  update email us to contact us (#9104)
  Improve source maps (#9101)
  Update font family globally (#9073)
  rpc-cap@3.1.0 (#9103)
  Use environment variable for production Sentry DSN (#9097)
  Only log error on first occurrence of missing substitution (#9096)
  Use mixins for typography instead of placeholder selectors (#9072)
  Update css folder structure (#9071)
  Disable Sentry in development (#9095)
  Use environment variable for MetaMetrics project ID (#9094)
  Use development metametrics project during tests (#9093)
  json-rpc-engine@5.2.0 (#9091)
  fixup! call initializeProvider where necessary
  call initializeProvider where necessary
  Add euclid fontface (#9018)
  fix timing-reliant network controller test
  Robustify permissions controller requestUserApproval tests (#9064)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gudahtt Gudahtt Gudahtt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@brad-decker @metamaskbot @Gudahtt