Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Font scaling settings and slider #4424

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
f10d9e4
Fix event tiles to smoothly resize with font.
JorikSchellekens Mar 31, 2020
1ff0f34
Fix pills.
JorikSchellekens Apr 3, 2020
27b1ce8
Scale room tile heights.
JorikSchellekens Apr 6, 2020
f54ca21
Scale read receipt images
JorikSchellekens Apr 6, 2020
d12ed33
Fix avatar alignment for room state events
JorikSchellekens Apr 6, 2020
05d11fe
Use a function to convert to rem.
JorikSchellekens Apr 6, 2020
c6bc0c7
Fix read receipt horizontal spacing at scale
JorikSchellekens Apr 6, 2020
f29717e
Fix room header vertical alignment
JorikSchellekens Apr 6, 2020
3891951
Resize room list scroll section.
JorikSchellekens Apr 6, 2020
cc601e1
Resize toggle switches with font
JorikSchellekens Apr 7, 2020
0182128
Fix settings when scaling up
JorikSchellekens Apr 7, 2020
5caec2a
lint
JorikSchellekens Apr 7, 2020
a587210
Room memebers avatars scale
JorikSchellekens Apr 7, 2020
e49c041
Commuity seleciton bar vertical alignment scale fix
JorikSchellekens Apr 7, 2020
121b53f
FIx lanugage selection alignment at scale.
JorikSchellekens Apr 7, 2020
3966e45
Fix test
JorikSchellekens Apr 7, 2020
2d2b398
lint test
JorikSchellekens Apr 7, 2020
c2a2908
Fix community line height
JorikSchellekens Apr 7, 2020
c921859
Use rem instead of em.
JorikSchellekens Apr 14, 2020
07853f4
Use font-variable instead of rem
JorikSchellekens Apr 14, 2020
18efbcc
Undo superfluous delete
JorikSchellekens Apr 14, 2020
fc04266
Skinnier pills are easier to swallow
JorikSchellekens Apr 14, 2020
7a0caaf
FIx unread count
JorikSchellekens Apr 16, 2020
83609f0
Scale user photo upload with font size
JorikSchellekens Apr 16, 2020
42ec21f
Tweak read receipt remainder text
JorikSchellekens Apr 16, 2020
e10a511
Extra right padding in user pills
JorikSchellekens Apr 21, 2020
61f2e19
Basic font settings.
JorikSchellekens Apr 14, 2020
269621a
Move theme settings to a new tab
JorikSchellekens Apr 14, 2020
bce1fa0
Simple translations
JorikSchellekens Apr 14, 2020
c182792
Use new style tab
JorikSchellekens Apr 14, 2020
af4dd27
Respond to font size changes
JorikSchellekens Apr 14, 2020
14551b1
Hide font scaling behind labs
JorikSchellekens Apr 16, 2020
0faf7b8
Set font option width
JorikSchellekens Apr 16, 2020
df73f12
Make a font slider
JorikSchellekens Apr 16, 2020
8b72756
Use the font slider
JorikSchellekens Apr 16, 2020
647d99a
Smooth font-size change transition
JorikSchellekens Apr 16, 2020
66fd0f7
Type enforcement and comments
JorikSchellekens Apr 16, 2020
f1130ec
Linting. Finally set up my linter properly
JorikSchellekens Apr 16, 2020
af3858f
Style linting
JorikSchellekens Apr 16, 2020
7c9df04
Use "Appearance" instead of "Style"
JorikSchellekens Apr 16, 2020
b1452b5
Lint lint lint
JorikSchellekens Apr 16, 2020
e455473
i18n happy
JorikSchellekens Apr 16, 2020
787e408
Explain origin of magic number
JorikSchellekens Apr 21, 2020
4d0cac1
Render should be last method declared
JorikSchellekens Apr 21, 2020
db1141b
Move to typescript
JorikSchellekens Apr 21, 2020
dd841fc
Remove references to font
JorikSchellekens Apr 21, 2020
abd94a6
Move compoenets/FontSlider to views/Slider
JorikSchellekens Apr 21, 2020
e254675
Retain copyright
JorikSchellekens Apr 21, 2020
82974bd
Space out ternaries
JorikSchellekens Apr 21, 2020
4525f71
Missed an import
JorikSchellekens Apr 21, 2020
02e0ff9
Move setting away from 'feature' settings for clarity
JorikSchellekens Apr 21, 2020
4397658
Update file name in comments
JorikSchellekens Apr 21, 2020
315a272
File rename
JorikSchellekens Apr 21, 2020
9a585fe
Move slider themes
JorikSchellekens Apr 21, 2020
dcea1f3
tslint
JorikSchellekens Apr 21, 2020
715bcb3
i18n match file moves
JorikSchellekens Apr 21, 2020
0d0da6c
Fix types, abandon propTypes
JorikSchellekens Apr 22, 2020
ba362b7
Use onSelectionChange prop
JorikSchellekens Apr 22, 2020
c99e1de
Clamp indicated value within value range
JorikSchellekens Apr 22, 2020
54a6544
Lint ternary statement
JorikSchellekens Apr 22, 2020
8d5965c
Fix incorrect call to setValue
JorikSchellekens Apr 22, 2020
26ccd6f
Cleaner clamping of value range
JorikSchellekens Apr 22, 2020
5f50fac
Make slider independant of label size
JorikSchellekens Apr 22, 2020
ee33fc1
Remove labels
JorikSchellekens Apr 22, 2020
014be5c
Add support to disable slider
JorikSchellekens Apr 22, 2020
1486bee
Make slider indpendent of settings styling
JorikSchellekens Apr 22, 2020
9879961
Remove padding for alignment reasons
JorikSchellekens Apr 22, 2020
f5d6590
Have max and min font configured in settings
JorikSchellekens Apr 22, 2020
fe175bb
Styling for the font slider
JorikSchellekens Apr 22, 2020
8f0d81e
Linearly interpolate between value intervals.
JorikSchellekens Apr 23, 2020
a16fe09
Use em to detach slider from root font-size
JorikSchellekens Apr 23, 2020
6375e25
Match padding from figma
JorikSchellekens Apr 23, 2020
28dca9e
Match figma color scheme
JorikSchellekens Apr 23, 2020
a83993f
Match margins in settings
JorikSchellekens Apr 23, 2020
c86638c
add toggle between font slider and custom setting
JorikSchellekens Apr 23, 2020
600a812
Add brush icon for appearance setting tab
JorikSchellekens Apr 23, 2020
e5cb149
Handle fontslider input errors correctly
JorikSchellekens Apr 23, 2020
a087f5e
Lint
JorikSchellekens Apr 23, 2020
06f4eca
Background opacity
JorikSchellekens Apr 23, 2020
4b4599c
tslint
JorikSchellekens Apr 23, 2020
bfba5e6
Fix member info avatar size
JorikSchellekens Apr 27, 2020
a8407c9
Use purecomponent
JorikSchellekens Apr 28, 2020
c268b98
Use faster lookup method
JorikSchellekens Apr 28, 2020
f91613f
Remove redundent selectors.
JorikSchellekens Apr 28, 2020
137b947
Lint types
JorikSchellekens Apr 28, 2020
175b5e7
Lint Slider
JorikSchellekens Apr 28, 2020
57d880c
Use correct name and indentation
JorikSchellekens Apr 28, 2020
93f24f1
Match filename to class
JorikSchellekens Apr 28, 2020
9ca843f
Correct return type in docs
JorikSchellekens Apr 28, 2020
fe326b9
Enfore function name capitalisation
JorikSchellekens Apr 28, 2020
1289367
Fix indentation
JorikSchellekens Apr 28, 2020
eb72245
fix syntax error
JorikSchellekens Apr 28, 2020
1b83faa
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-…
JorikSchellekens Apr 28, 2020
af8430b
Inverted boolean
JorikSchellekens Apr 28, 2020
4e67484
Fix i18n
JorikSchellekens Apr 28, 2020
132a753
Lint getDefaultValue
JorikSchellekens Apr 28, 2020
2acb166
Appease the prop types
JorikSchellekens Apr 29, 2020
f7b3662
Fully appease prop types
JorikSchellekens Apr 29, 2020
bab7d5f
Some lints
JorikSchellekens May 6, 2020
33a5b51
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-…
JorikSchellekens May 7, 2020
328bb7b
Remove all animations
JorikSchellekens May 13, 2020
fea2199
fix code regeression
JorikSchellekens May 13, 2020
20ec900
Set font range
JorikSchellekens May 13, 2020
fc6e522
FIx roomsublist heights.
JorikSchellekens May 13, 2020
03e090f
fix chevron
JorikSchellekens May 13, 2020
3e30df1
Slider is more responsive
JorikSchellekens May 20, 2020
55e72dd
Remove min and max font setting
JorikSchellekens May 20, 2020
6d9d4ee
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-…
JorikSchellekens May 20, 2020
82b7619
Fixes, lints and i18n
JorikSchellekens May 20, 2020
4e9a139
lint
JorikSchellekens May 20, 2020
adec5a4
fix test
JorikSchellekens May 20, 2020
50a4440
CONSTANT_CASING
JorikSchellekens May 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,7 @@ export default class AppearanceUserSettingsTab extends React.Component {
<div className="mx_AppearanceUserSettingsTab_fontSlider">
<div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
<Slider
values={_range(
SettingsStore.getValue("fontSizeMin"),
SettingsStore.getValue("fontSizeMax")+ 2,
2.5,
)}
values={[13, 14, 15, 18, 20]}
value={this.state.fontSize}
onSelectionChange={this._onFontSizeChanged}
displayFunc={value => {}}
Expand Down
4 changes: 2 additions & 2 deletions src/settings/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,12 @@ export const SETTINGS = {
"fontSizeMin": {
displayName: _td("Min font size"),
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: 14,
default: 13,
},
"fontSizeMax": {
displayName: _td("Max font size"),
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: 24,
default: 20,
},
turt2live marked this conversation as resolved.
Show resolved Hide resolved
"useCustomFontSize": {
displayName: _td("Custom font size"),
Expand Down