Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit ac1a172

Browse files
rafaelksrafaelks
authored
Merge pull request #2626 from RocketChat/chore/adjustments_ui
[CHORE] UI adjustments on quotes & replies
2 parents 45bc26a + 42f7942 commit ac1a172

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

‎Rocket.Chat/Views/Chat/New Chat/Cells/QuoteCell.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ extension QuoteCell {
8585
let theme = self.theme ?? .light
8686
containerView.backgroundColor = theme.chatComponentBackground
8787
purpose.textColor = theme.auxiliaryText
88-
username.textColor = theme.actionTintColor
88+
username.textColor = theme.bodyText
8989
text.textColor = theme.bodyText
9090
containerView.layer.borderColor = theme.borderColor.cgColor
9191
}

‎Rocket.Chat/Views/Chat/New Chat/Cells/QuoteCell.xib‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@
3737
<constraint firstAttribute="height" constant="23" id="VAA-x8-dEs"/>
3838
</constraints>
3939
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
40-
<color key="textColor" red="0.1137254902" green="0.4549019608" blue="0.96078431369999995" alpha="1" colorSpace="calibratedRGB"/>
4140
<nil key="highlightedColor"/>
4241
</label>
4342
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xIq-TW-qcq">
44-
<rect key="frame" x="15" y="61" width="258" height="36"/>
43+
<rect key="frame" x="15" y="57" width="258" height="40"/>
4544
<fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
4645
<color key="textColor" red="0.047058823530000002" green="0.050980392159999999" blue="0.058823529409999999" alpha="1" colorSpace="calibratedRGB"/>
4746
<nil key="highlightedColor"/>
@@ -62,7 +61,7 @@
6261
<constraint firstItem="Oyn-h1-OvH" firstAttribute="top" secondItem="B3H-28-ZKR" secondAttribute="top" constant="16" id="M6R-FW-xXh"/>
6362
<constraint firstAttribute="trailing" secondItem="Alc-xZ-4VT" secondAttribute="trailing" constant="15" id="fUn-qs-O2E"/>
6463
<constraint firstItem="TOv-60-iaq" firstAttribute="leading" secondItem="B3H-28-ZKR" secondAttribute="leading" constant="15" id="j1v-Sb-zqI"/>
65-
<constraint firstItem="xIq-TW-qcq" firstAttribute="top" secondItem="TOv-60-iaq" secondAttribute="bottom" constant="4" id="lhJ-IE-s0Q"/>
64+
<constraint firstItem="xIq-TW-qcq" firstAttribute="top" secondItem="TOv-60-iaq" secondAttribute="bottom" id="lhJ-IE-s0Q"/>
6665
<constraint firstItem="Alc-xZ-4VT" firstAttribute="leading" secondItem="TOv-60-iaq" secondAttribute="trailing" constant="8" id="rbc-Rn-vCT"/>
6766
<constraint firstItem="Alc-xZ-4VT" firstAttribute="top" secondItem="B3H-28-ZKR" secondAttribute="top" constant="19" id="saI-os-EY4"/>
6867
<constraint firstItem="TOv-60-iaq" firstAttribute="top" secondItem="Oyn-h1-OvH" secondAttribute="bottom" id="wb5-Yx-ZIx"/>

‎Rocket.Chat/Views/Chat/New Chat/Cells/QuoteMessageCell.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ extension QuoteMessageCell {
117117
messageUsername.textColor = theme.titleText
118118
date.textColor = theme.auxiliaryText
119119
purpose.textColor = theme.auxiliaryText
120-
username.textColor = theme.actionTintColor
120+
username.textColor = theme.bodyText
121121
text.textColor = theme.bodyText
122122
containerView.layer.borderColor = theme.borderColor.cgColor
123123
}

‎Rocket.Chat/Views/Chat/New Chat/Cells/QuoteMessageCell.xib‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<nil key="highlightedColor"/>
6565
</label>
6666
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YC5-ts-L8T">
67-
<rect key="frame" x="15" y="61" width="236" height="14.5"/>
67+
<rect key="frame" x="15" y="57" width="236" height="18.5"/>
6868
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
6969
<color key="textColor" red="0.047058823530000002" green="0.050980392159999999" blue="0.058823529409999999" alpha="1" colorSpace="calibratedRGB"/>
7070
<nil key="highlightedColor"/>
@@ -85,7 +85,7 @@
8585
<constraint firstItem="35A-7N-lVK" firstAttribute="top" secondItem="nHB-nk-DRf" secondAttribute="bottom" id="MbD-mt-n1N"/>
8686
<constraint firstItem="35A-7N-lVK" firstAttribute="leading" secondItem="VLV-ym-FZM" secondAttribute="leading" constant="15" id="NuK-jg-7Xm"/>
8787
<constraint firstItem="YC5-ts-L8T" firstAttribute="leading" secondItem="VLV-ym-FZM" secondAttribute="leading" constant="15" id="W73-Vt-GqB"/>
88-
<constraint firstItem="YC5-ts-L8T" firstAttribute="top" secondItem="35A-7N-lVK" secondAttribute="bottom" constant="4" id="WYI-Yb-8LB"/>
88+
<constraint firstItem="YC5-ts-L8T" firstAttribute="top" secondItem="35A-7N-lVK" secondAttribute="bottom" id="WYI-Yb-8LB"/>
8989
<constraint firstAttribute="trailing" secondItem="YC5-ts-L8T" secondAttribute="trailing" constant="15" id="WtL-sW-5eJ"/>
9090
<constraint firstAttribute="bottom" secondItem="YC5-ts-L8T" secondAttribute="bottom" constant="15" id="YRp-qV-IU6"/>
9191
<constraint firstItem="24j-n8-BYB" firstAttribute="leading" secondItem="35A-7N-lVK" secondAttribute="trailing" constant="8" id="YaK-8n-ymS"/>

0 commit comments

Comments
 (0)