Merge branch 'master' of gitlab.com:chriscochrun/dotfiles

This commit is contained in:
Chris Cochrun 2021-05-02 17:13:53 -05:00
commit a035f816a7
6 changed files with 14 additions and 7 deletions

View file

@ -1541,9 +1541,12 @@ c.hints.radius = 6
# 'input:not([type])',
# 'textarea']}
c.hints.selectors['all'].append('ha-card')
c.hints.selectors['all'].append('shadow-root')
c.hints.selectors['all'].append('[ha-card]')
c.hints.selectors['all'].append('mdc-switch__native-control')
c.hints.selectors['all'].append('[for="checkbox"]')
c.hints.selectors['all'].append('label')
c.hints.selectors['all'].append('hui-button-card')
## Make characters in hint strings uppercase.
## Type: Bool

View file

@ -1,6 +1,11 @@
[FileDialog]
<<<<<<< HEAD
history=file:///home/chris/Videos/vimeo, file:///home/chris/Pictures/tfc, file:///home/chris/Pictures, file:///home/chris/Videos, file:///home/chris, file:///home/chris/Downloads
lastVisited=file:///home/chris/Downloads
=======
history=file:///home/chris/Pictures/tfc, file:///home/chris/Pictures, file:///home/chris/Videos, file:///home/chris, file:///home/chris/Downloads
lastVisited=file:///home/chris/Pictures
>>>>>>> 7178f581f46a6fbcfa03c256db5fbed1afc2faa5
qtVersion=5.15.2
shortcuts=file:, file:///home/chris
sidebarWidth=116