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

add: Typography mixins. add: Created typography variables (margin, fo… #18746

Merged
merged 5 commits into from Oct 15, 2019

Conversation

mucluck
Copy link
Contributor

@mucluck mucluck commented Sep 9, 2019

…nt-weight). moved: Typography internal variables

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

#18669

There is no way to fully customize a component.

💡 Background and solution

Created new variables for headings. Moved exists variables to default variables file. Created mixins for extends headings style.

📝 Changelog

Language Changelog
🇺🇸 English Add @typography-title-margin-top and @typography-title-margin-bottom.
🇨🇳 Chinese

☑️ Self Check before Merge

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@netlify
Copy link

netlify bot commented Sep 9, 2019

Deploy preview for ant-design ready!

Built with commit cea0a9e

https://deploy-preview-18746--ant-design.netlify.com

@buildsize
Copy link

buildsize bot commented Sep 9, 2019

File name Previous Size New Size Change
package-lock.json 848.78 KB 907 KB 58.22 KB (7%)

@codecov
Copy link

codecov bot commented Sep 9, 2019

Codecov Report

Merging #18746 into feature will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           feature   #18746   +/-   ##
========================================
  Coverage    96.93%   96.93%           
========================================
  Files          281      281           
  Lines         7576     7576           
  Branches      2073     2115   +42     
========================================
  Hits          7344     7344           
  Misses         230      230           
  Partials         2        2

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 721baa8...cea0a9e. Read the comment docs.

@orzyyyy
Copy link
Contributor

orzyyyy commented Sep 16, 2019

Sorry for no responding for a long time.

If you are sure those changes are within your expectations, then run npm test -- -u to update snapshots, for passing CI checks.

@afc163
Copy link
Member

afc163 commented Sep 18, 2019

Please drop all your unrelated changes and rebase feature to fix ci.

@mucluck mucluck force-pushed the feature-typography-less-refactor branch 3 times, most recently from 8dd6be2 to 84dc4c2 Compare September 19, 2019 21:30
@mucluck mucluck force-pushed the feature-typography-less-refactor branch from 84dc4c2 to 5657145 Compare September 19, 2019 21:31
@@ -681,3 +681,7 @@
// Typography
// ---
@typography-title-font-weight: 600;
@typography-title-margin-top: 1.2em;
@typography-title-margin-right: 0;
Copy link
Member

Choose a reason for hiding this comment

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

We don't need @typography-title-margin-right and @typography-title-margin-left, drop them and make it hard coded.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Then it will be impossible to use the margin in the theming. Why do you need to hardcode this? My projects require margin.

Copy link
Member

Choose a reason for hiding this comment

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

I don't see any neccessary of setting margin-left and margin-right to headings, could you point out for me by examples?

@afc163 afc163 changed the base branch from feature to master October 15, 2019 07:58
@afc163
Copy link
Member

afc163 commented Oct 15, 2019

/rebase

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.

None yet

3 participants