summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-08-23 09:51:56 (GMT)
committerTobias Markmann <tm@ayena.de>2016-08-23 09:53:15 (GMT)
commitaebb38a8f1e223934ff3093fc87a557156f10366 (patch)
tree049a22d2acd01ad2f574f6a850d3c260f3a353c0 /Swift/resources
parentb429450dc59c4ee4011b6b10a0af535a9003bb2e (diff)
downloadswift-aebb38a8f1e223934ff3093fc87a557156f10366.zip
swift-aebb38a8f1e223934ff3093fc87a557156f10366.tar.bz2
Improve chat view font handling
This changes the minimal font scaling to 0.8em, so that the font size in the chat view can be smaller than the font size in the rest of the application. At 1.0em the font in the chat view has the same size as the rest of the application. Also changed fixed pixel sizes in main.css to relative percentage sizes. Test-Information: Verified the font size in the chat view is the same as the font size for the contact lists at 1.0em on Windows and OS X with Qt 5.5.1. Change-Id: Ib625f11cea0aacd31edee27c2dc89df5e2cbd1c4
Diffstat (limited to 'Swift/resources')
-rw-r--r--Swift/resources/themes/Default/main.css8
1 files changed, 3 insertions, 5 deletions
diff --git a/Swift/resources/themes/Default/main.css b/Swift/resources/themes/Default/main.css
index 35b55c7..05e7a04 100644
--- a/Swift/resources/themes/Default/main.css
+++ b/Swift/resources/themes/Default/main.css
@@ -2,7 +2,6 @@
body {
font-family: 'Lato', sans-serif;
- font-size: 14px;
margin: 0;
padding: 0;
}
@@ -72,7 +71,7 @@ body {
color: #ffd180;
border-top: solid 1px #ffd180;
margin-left: 20px;
- margin-right: 20px;;
+ margin-right: 20px;
}
/* Left column content */
@@ -104,7 +103,7 @@ body {
margin-bottom: 1px;
margin-right: 10px;
color: #f9f9f9;
- font-size: 10px;
+ font-size: 80%;
font-weight: 300;
}
@@ -119,7 +118,7 @@ body {
margin-bottom: 1px;
margin-right: 10px;
color: #f9f9f9;
- font-size: 10px;
+ font-size: 80%;
font-weight: 300;
}
@@ -217,7 +216,6 @@ body {
display: table-cell;
border: inherit;
margin-left: 175px;
- font-size: 14px;
color: #595959;
vertical-align: top;