Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Conversation

@simurai
Copy link
Contributor

@simurai simurai commented Dec 21, 2018

Description of the Change

This PR makes the font size of diffs adjustable based on Atom's editor config. The header font size is set by the UI themes.

screen shot 2018-12-21 at 10 47 28 am

Bonus:

  • File headers now use the font family from UI themes. Before it was hard-coded.
  • Hunk headers now use the font family from the config. Before it was hard-coded.

Alternate Designs

N/A

Benefits

Users can change the font size of diffs in Atom's settings.

Possible Drawbacks

Some might have a different preference.

Applicable Issues

Fixes #1858

Metrics

N/A

Tests

  1. Open a diff
  2. Press cmd - or cmd +
  3. Observe how the code changes the font size, but the file and hunk header stay the same.

resize

Documentation

N/A

Release Notes

N/A

User Experience Research (Optional)

N/A

@simurai simurai changed the title Font size and font family for diffs Adjustable diff font size Dec 21, 2018
@codecov
Copy link

codecov bot commented Dec 21, 2018

Codecov Report

Merging #1859 into master will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1859      +/-   ##
==========================================
+ Coverage   91.15%   91.19%   +0.03%     
==========================================
  Files         196      196              
  Lines       10745    10745              
  Branches     1575     1575              
==========================================
+ Hits         9795     9799       +4     
+ Misses        950      946       -4
Impacted Files Coverage Δ
lib/git-shell-out-strategy.js 87.52% <0%> (-0.36%) ⬇️
lib/controllers/editor-conflict-controller.js 95.95% <0%> (+1.01%) ⬆️
lib/atom/decoration.js 86.74% <0%> (+2.4%) ⬆️
lib/models/conflicts/side.js 96.87% <0%> (+4.68%) ⬆️

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 0e013b6...793cc33. Read the comment docs.

@simurai
Copy link
Contributor Author

simurai commented Dec 21, 2018

Let's merge this before the next release, since it could be seen as a regression.

@simurai simurai merged commit 4127cb3 into master Dec 21, 2018
@simurai simurai deleted the sm/font-size branch December 21, 2018 10:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants