re #10772 try to decrease conflicts

mantidproject · Dec 16, 2014 · 656e5a3 · 656e5a3
1 parent d2f9c0d
commit 656e5a3
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.ui b/Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.ui
@@ -45,23 +45,24 @@ QDialog#FirstTimeSetup QLabel{
     font-weight: bold;
 }
 QDialog#FirstTimeSetup QCheckbox{
-	font: 12px&quot;Segoe UI&quot;;
+	font: 12px &quot;Segoe UI&quot;;
     font-weight: bold;
 }
 QDialog#FirstTimeSetup QGroupBox{
 	font: 12px &quot;Segoe UI&quot;;
     font-weight: bold;
 }
 QDialog#FirstTimeSetup QPushButton{
-	font: 12px&quot;Segoe UI&quot;;
+	font: 12px &quot;Segoe UI&quot;;
 }
 QDialog#FirstTimeSetup QComboBox{
 	font: 12px &quot;Segoe UI&quot;;
 }
 QDialog#FirstTimeSetup QCommandLinkButton{
 	font: 28px &quot;Segoe UI&quot;;
     font-weight: bold;
-}</string>
+}
+</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <property name="leftMargin">
@@ -237,8 +238,7 @@ QDialog#FirstTimeSetup QCommandLinkButton{
        </property>
        <property name="styleSheet">
         <string notr="true">color: rgb(0, 105, 0);
-font: 28px &quot;Segoe UI&quot;;
-font-weight: bold;</string>
+font-size: 28px</string>
        </property>
        <property name="text">
         <string>Tutorials</string>
@@ -258,8 +258,7 @@ font-weight: bold;</string>
        </property>
        <property name="styleSheet">
         <string notr="true">color: rgb(0, 105, 0);
-font: 28px &quot;Segoe UI&quot;;
-font-weight: bold;</string>
+font-size: 28px</string>
        </property>
        <property name="text">
         <string>Version </string>