Merge branch 'error800-master'

This commit is contained in:
Florian Bruhin 2015-01-06 16:55:37 +01:00
commit 9ebf36f26b
2 changed files with 10 additions and 10 deletions

View File

@ -131,6 +131,7 @@ Contributors, sorted by the number of commits in descending order:
* rikn00
* Martin Zimmermann
* Joel Torstensson
* Error 800
* Brian Jackson
* Johannes Altmanninger
* Regina Hug
@ -140,7 +141,6 @@ Contributors, sorted by the number of commits in descending order:
* Matthias Lisin
* Helen Sherwood-Taylor
* HalosGhost
* Error 800
// QUTE_AUTHORS_END
The following people have contributed graphics:

View File

@ -275,15 +275,15 @@ class HintManager(QObject):
label: The label QWebElement.
"""
attrs = [
('display', 'inline'),
('z-index', '100000'),
('pointer-events', 'none'),
('position', 'absolute'),
('color', config.get('colors', 'hints.fg')),
('background', config.get('colors', 'hints.bg')),
('font', config.get('fonts', 'hints')),
('border', config.get('hints', 'border')),
('opacity', str(config.get('hints', 'opacity'))),
('display', 'inline !important'),
('z-index', '100000 !important'),
('pointer-events', 'none !important'),
('position', 'absolute !important'),
('color', config.get('colors', 'hints.fg') + ' !important'),
('background', config.get('colors', 'hints.bg') + ' !important'),
('font', config.get('fonts', 'hints') + ' !important'),
('border', config.get('hints', 'border') + ' !important'),
('opacity', str(config.get('hints', 'opacity')) + ' !important'),
]
# Make text uppercase if set in config