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

_common.styl: unify #donate a font-family #568

Merged
merged 2 commits into from
Nov 5, 2016
Merged

_common.styl: unify #donate a font-family #568

merged 2 commits into from
Nov 5, 2016

Conversation

JLHwung
Copy link
Contributor

@JLHwung JLHwung commented Nov 4, 2016

Unify font-family setting of #donate a with $body-font.
Previously the font-family of #donate a is hard-coded and does not consist with $body-font and this PR solves this discrepancy.

Edit: typo

@chrisvfritz
Copy link
Contributor

@JLHwung Can you clarify what problem you're solving here?

@JLHwung
Copy link
Contributor Author

JLHwung commented Nov 5, 2016

@chrisvfritz Description updated.

@chrisvfritz
Copy link
Contributor

Thanks. I made a couple more tweaks. The 11px/14px style is short for font-size: 11px and line-height: 14px by the way.

@chrisvfritz chrisvfritz merged commit 2b08fe8 into vuejs:master Nov 5, 2016
dingyiming added a commit to volksbright/document-standard-vue that referenced this pull request Nov 5, 2016
* master:
  set correct runtime-only gzipped size
  scope version-specific pages
  update tagline in config to match homepage
  2.0.5
  _common.styl: unify #donate a font-family (vuejs#568)
  improve visibility of custom input components through the guide, fixes vuejs#563
  update vue to 2.0.4
  add code examples to components one-way data flow
  revise react comparison
  improve intro for absolute beginners (close vuejs#565)

# Conflicts:
#	src/v2/api/index.md
#	src/v2/guide/comparison.md
#	src/v2/guide/components.md
#	src/v2/guide/computed.md
#	src/v2/guide/custom-directive.md
#	src/v2/guide/events.md
#	src/v2/guide/forms.md
#	src/v2/guide/index.md
#	src/v2/guide/installation.md
#	src/v2/guide/instance.md
#	src/v2/guide/list.md
#	src/v2/guide/migration-vue-router.md
#	src/v2/guide/migration-vuex.md
#	src/v2/guide/migration.md
#	src/v2/guide/mixins.md
#	src/v2/guide/reactivity.md
#	src/v2/guide/render-function.md
#	src/v2/guide/syntax.md
#	src/v2/guide/unit-testing.md
#	themes/vue/_config.yml
#	themes/vue/layout/index.ejs
#	themes/vue/layout/partials/main_menu.ejs
dingyiming added a commit to volksbright/document-standard-vue that referenced this pull request Nov 5, 2016
* 2.0-cn:
  set correct runtime-only gzipped size
  scope version-specific pages
  update tagline in config to match homepage
  2.0.5
  _common.styl: unify #donate a font-family (vuejs#568)
  improve visibility of custom input components through the guide, fixes vuejs#563
  update vue to 2.0.4
  add code examples to components one-way data flow
  revise react comparison
  improve intro for absolute beginners (close vuejs#565)

# Conflicts:
#	themes/vue/_config.yml
#	themes/vue/layout/partials/main_menu.ejs
dear-lizhihua pushed a commit to volksbright/document-standard-vue that referenced this pull request Nov 14, 2016
- 添加 贡献者展示页面
Merge branch '2.0'

* 2.0:
  set correct runtime-only gzipped size
  scope version-specific pages
  update tagline in config to match homepage
  2.0.5
  _common.styl: unify #donate a font-family (vuejs#568)
  improve visibility of custom input components through the guide, fixes vuejs#563
  update vue to 2.0.4
  add code examples to components one-way data flow
  revise react comparison
  improve intro for absolute beginners (close vuejs#565)

# Conflicts:
#	src/v2/guide/index.md
#	src/v2/guide/installation.md
Peter-WF pushed a commit to Peter-WF/vuefe.github.io that referenced this pull request Nov 18, 2016
* _common.styl: unify #donate a font-family

* Improve style of donate button for $body-font
Peter-WF pushed a commit to Peter-WF/vuefe.github.io that referenced this pull request Nov 18, 2016
* master:
  set correct runtime-only gzipped size
  scope version-specific pages
  update tagline in config to match homepage
  2.0.5
  _common.styl: unify #donate a font-family (vuejs#568)
  improve visibility of custom input components through the guide, fixes vuejs#563
  update vue to 2.0.4
  add code examples to components one-way data flow
  revise react comparison
  improve intro for absolute beginners (close vuejs#565)

# Conflicts:
#	src/v2/api/index.md
#	src/v2/guide/comparison.md
#	src/v2/guide/components.md
#	src/v2/guide/computed.md
#	src/v2/guide/custom-directive.md
#	src/v2/guide/events.md
#	src/v2/guide/forms.md
#	src/v2/guide/index.md
#	src/v2/guide/installation.md
#	src/v2/guide/instance.md
#	src/v2/guide/list.md
#	src/v2/guide/migration-vue-router.md
#	src/v2/guide/migration-vuex.md
#	src/v2/guide/migration.md
#	src/v2/guide/mixins.md
#	src/v2/guide/reactivity.md
#	src/v2/guide/render-function.md
#	src/v2/guide/syntax.md
#	src/v2/guide/unit-testing.md
#	themes/vue/_config.yml
#	themes/vue/layout/index.ejs
#	themes/vue/layout/partials/main_menu.ejs
kazupon pushed a commit to kazupon/vuejs.org that referenced this pull request Oct 1, 2017
* _common.styl: unify #donate a font-family

* Improve style of donate button for $body-font
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.

2 participants