From 797358fee56a79b8c783aebb87b275f2e8ad1334 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 三月 2021 09:21:07 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
index bf1eb84..284eeed 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
@@ -141,6 +141,7 @@
<constraints>
<constraint firstAttribute="height" constant="40" id="vLh-9U-8RO"/>
</constraints>
+ <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" keyboardType="alphabet"/>
<connections>
@@ -165,6 +166,7 @@
<constraints>
<constraint firstAttribute="height" constant="40" id="DjM-dg-5en"/>
</constraints>
+ <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" keyboardType="alphabet"/>
<connections>
@@ -450,6 +452,7 @@
<constraints>
<constraint firstAttribute="height" constant="34" id="FPO-BB-N1L"/>
</constraints>
+ <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" secureTextEntry="YES"/>
</textField>
@@ -912,7 +915,7 @@
<inferredMetricsTieBreakers>
<segue reference="9TP-S2-hhI"/>
<segue reference="MFl-yy-ZsP"/>
- <segue reference="VYk-37-nb6"/>
+ <segue reference="ikM-Zn-H8f"/>
</inferredMetricsTieBreakers>
<resources>
<image name="addDevice_success" width="320" height="185"/>
--
Gitblit v1.8.0