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

Adjustable diff font size #1859

merged 3 commits into from Dec 21, 2018


1 participant
Copy link

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


  • 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



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

Possible Drawbacks

Some might have a different preference.

Applicable Issues

Fixes #1858




  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.




Release Notes


User Experience Research (Optional)


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


This comment has been minimized.

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.


This comment has been minimized.

Copy link

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

2 checks passed

codecov/patch Coverage not affected when comparing 0e013b6...793cc33
codecov/project 91.19% (+0.03%) compared to 0e013b6

@simurai simurai deleted the sm/font-size branch Dec 21, 2018

This was referenced Jan 2, 2019

@smashwilson smashwilson moved this from In Progress 🔧 to Merged ☑️ in Stability Sprint : 20 November 2018 - 8 January 2019 : v0.24.0 Jan 3, 2019

@smashwilson smashwilson referenced this pull request Jan 3, 2019


v0.23-2 QA Review #1879

16 of 16 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment