summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/ui/login.ui
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-12-23 02:35:28 -0400
committerKali Kaneko <kali@leap.se>2013-12-23 02:35:28 -0400
commitf056eaa85fb3cf23555b23631050976d9800b704 (patch)
tree693ff2c168f5ad702ccfe810cacb8b974a58563f /src/leap/bitmask/gui/ui/login.ui
parent4425bc74d6bb679f143538027f28602bfe973425 (diff)
parentbdc638e6fc3dadaaf9c60a19f4e850c5450cfc3e (diff)
Merge branch 'develop' into debian-0.5.0-rc
Diffstat (limited to 'src/leap/bitmask/gui/ui/login.ui')
-rw-r--r--src/leap/bitmask/gui/ui/login.ui4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui
index e7ca1652..7e8f9daf 100644
--- a/src/leap/bitmask/gui/ui/login.ui
+++ b/src/leap/bitmask/gui/ui/login.ui
@@ -215,7 +215,7 @@
<number>0</number>
</property>
<property name="bottomMargin">
- <number>24</number>
+ <number>0</number>
</property>
<item row="1" column="1">
<spacer name="horizontalSpacer">
@@ -255,7 +255,7 @@
<widget class="QLabel" name="lblLoginStatus">
<property name="styleSheet">
<string notr="true">color: rgb(132, 132, 132);
-font: 75 12pt &quot;Lucida Grande&quot;;</string>
+font: 75 12pt;</string>
</property>
<property name="text">
<string/>