Skip to content

Commit 06d4838

Browse files
bummytimebummytime
authored
Merge pull request #237 from woocommerce/fix/236-revenue-labels
Dashboard: fixed revenue label alignment
2 parents f230fd8 + 47fd3d0 commit 06d4838

File tree

1 file changed

+17
-26
lines changed

1 file changed

+17
-26
lines changed

‎WooCommerce/Classes/ViewRelated/Dashboard/MyStore/PeriodDataViewController.xib‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,79 +31,73 @@
3131
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="0he-5g-kXa">
3232
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
3333
<subviews>
34-
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="PkT-rJ-Rn6">
35-
<rect key="frame" x="0.0" y="0.0" width="375" height="95"/>
34+
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="-1" translatesAutoresizingMaskIntoConstraints="NO" id="PkT-rJ-Rn6">
35+
<rect key="frame" x="0.0" y="0.0" width="375" height="87.5"/>
3636
<subviews>
3737
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="e8D-G2-abm">
38-
<rect key="frame" x="0.0" y="0.0" width="125" height="95"/>
38+
<rect key="frame" x="0.0" y="0.0" width="125.5" height="87.5"/>
3939
<subviews>
4040
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gN3-Vd-CTd">
41-
<rect key="frame" x="25" y="0.0" width="75" height="20"/>
41+
<rect key="frame" x="25.5" y="0.0" width="75" height="20"/>
4242
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
4343
<constraints>
4444
<constraint firstAttribute="height" constant="20" id="Tc1-gQ-pfk"/>
4545
</constraints>
4646
</view>
4747
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Visitors" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rHw-ak-fRR">
48-
<rect key="frame" x="40" y="20" width="45.5" height="23.5"/>
48+
<rect key="frame" x="40" y="20" width="45.5" height="16"/>
4949
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
5050
<nil key="textColor"/>
5151
<nil key="highlightedColor"/>
5252
</label>
5353
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SZF-f7-8Va">
54-
<rect key="frame" x="56.5" y="43.5" width="12" height="31.5"/>
54+
<rect key="frame" x="57" y="36" width="12" height="31.5"/>
5555
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
5656
<nil key="textColor"/>
5757
<nil key="highlightedColor"/>
5858
</label>
5959
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NaX-4V-XP2">
60-
<rect key="frame" x="16" y="75" width="93.5" height="20"/>
60+
<rect key="frame" x="16" y="67.5" width="93.5" height="20"/>
6161
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
6262
<constraints>
6363
<constraint firstAttribute="height" constant="20" id="Ekr-OV-et5"/>
6464
</constraints>
6565
</view>
6666
</subviews>
67-
<constraints>
68-
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="95" id="Asa-LM-Lbb"/>
69-
</constraints>
7067
</stackView>
7168
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="g0M-FH-Icp">
72-
<rect key="frame" x="125" y="0.0" width="125" height="95"/>
69+
<rect key="frame" x="124.5" y="0.0" width="126" height="87.5"/>
7370
<subviews>
7471
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6wR-bB-SUi">
75-
<rect key="frame" x="25" y="0.0" width="75" height="20"/>
72+
<rect key="frame" x="25.5" y="0.0" width="75" height="20"/>
7673
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
7774
<constraints>
7875
<constraint firstAttribute="height" constant="20" id="aSe-hj-qIc"/>
7976
</constraints>
8077
</view>
8178
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Orders" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vlW-do-oXj">
82-
<rect key="frame" x="42" y="20" width="41.5" height="23.5"/>
79+
<rect key="frame" x="42.5" y="20" width="41.5" height="16"/>
8380
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
8481
<nil key="textColor"/>
8582
<nil key="highlightedColor"/>
8683
</label>
8784
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6HA-Qe-PkT">
88-
<rect key="frame" x="56.5" y="43.5" width="12" height="31.5"/>
85+
<rect key="frame" x="57" y="36" width="12" height="31.5"/>
8986
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
9087
<nil key="textColor"/>
9188
<nil key="highlightedColor"/>
9289
</label>
9390
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZS1-zJ-gIn">
94-
<rect key="frame" x="25" y="75" width="75" height="20"/>
91+
<rect key="frame" x="25.5" y="67.5" width="75" height="20"/>
9592
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
9693
<constraints>
9794
<constraint firstAttribute="height" constant="20" id="lpG-gr-MtT"/>
9895
</constraints>
9996
</view>
10097
</subviews>
101-
<constraints>
102-
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="95" id="BBh-Ao-Kes"/>
103-
</constraints>
10498
</stackView>
10599
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="EqQ-GQ-06J">
106-
<rect key="frame" x="250" y="0.0" width="125" height="95"/>
100+
<rect key="frame" x="249.5" y="0.0" width="125.5" height="87.5"/>
107101
<subviews>
108102
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5Qe-3G-aXj">
109103
<rect key="frame" x="25" y="0.0" width="75" height="20"/>
@@ -119,28 +113,25 @@
119113
<nil key="highlightedColor"/>
120114
</label>
121115
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="-" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ukd-qU-WVq">
122-
<rect key="frame" x="56.5" y="36" width="12" height="39"/>
116+
<rect key="frame" x="56.5" y="36" width="12" height="31.5"/>
123117
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
124118
<nil key="textColor"/>
125119
<nil key="highlightedColor"/>
126120
</label>
127121
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B7G-os-a7y">
128-
<rect key="frame" x="25" y="75" width="75" height="20"/>
122+
<rect key="frame" x="25" y="67.5" width="75" height="20"/>
129123
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
130124
<constraints>
131125
<constraint firstAttribute="height" constant="20" id="J5a-Si-2T4"/>
132126
</constraints>
133127
</view>
134128
</subviews>
135-
<constraints>
136-
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="95" id="rdv-4l-JSk"/>
137-
</constraints>
138129
</stackView>
139130
</subviews>
140131
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
141132
</stackView>
142133
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YbU-E4-fLs">
143-
<rect key="frame" x="0.0" y="95" width="375" height="1"/>
134+
<rect key="frame" x="0.0" y="87.5" width="375" height="1"/>
144135
<subviews>
145136
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ird-S1-Bnw">
146137
<rect key="frame" x="0.0" y="0.0" width="14" height="1"/>
@@ -168,7 +159,7 @@
168159
</subviews>
169160
</stackView>
170161
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zPE-Y0-ax8">
171-
<rect key="frame" x="0.0" y="96" width="375" height="501"/>
162+
<rect key="frame" x="0.0" y="88.5" width="375" height="508.5"/>
172163
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
173164
<constraints>
174165
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="175" id="7hy-0X-Qlw"/>

0 commit comments

Comments
 (0)