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

Commit

Permalink
Merge pull request #2626 from RocketChat/chore/adjustments_ui
Browse files Browse the repository at this point in the history 
[CHORE] UI adjustments on quotes & replies
  • Loading branch information
@rafaelks
rafaelks authored Apr 1, 2019
2 parents 45bc26a + 42f7942 commit ac1a172
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Rocket.Chat/Views/Chat/New Chat/Cells/QuoteCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ extension QuoteCell {
let theme = self.theme ?? .light
containerView.backgroundColor = theme.chatComponentBackground
purpose.textColor = theme.auxiliaryText
username.textColor = theme.actionTintColor
username.textColor = theme.bodyText
text.textColor = theme.bodyText
containerView.layer.borderColor = theme.borderColor.cgColor
}
Expand Down
5 changes: 2 additions & 3 deletions Rocket.Chat/Views/Chat/New Chat/Cells/QuoteCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@
<constraint firstAttribute="height" constant="23" id="VAA-x8-dEs"/>
</constraints>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<color key="textColor" red="0.1137254902" green="0.4549019608" blue="0.96078431369999995" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<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">
<rect key="frame" x="15" y="61" width="258" height="36"/>
<rect key="frame" x="15" y="57" width="258" height="40"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
<color key="textColor" red="0.047058823530000002" green="0.050980392159999999" blue="0.058823529409999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -62,7 +61,7 @@
<constraint firstItem="Oyn-h1-OvH" firstAttribute="top" secondItem="B3H-28-ZKR" secondAttribute="top" constant="16" id="M6R-FW-xXh"/>
<constraint firstAttribute="trailing" secondItem="Alc-xZ-4VT" secondAttribute="trailing" constant="15" id="fUn-qs-O2E"/>
<constraint firstItem="TOv-60-iaq" firstAttribute="leading" secondItem="B3H-28-ZKR" secondAttribute="leading" constant="15" id="j1v-Sb-zqI"/>
<constraint firstItem="xIq-TW-qcq" firstAttribute="top" secondItem="TOv-60-iaq" secondAttribute="bottom" constant="4" id="lhJ-IE-s0Q"/>
<constraint firstItem="xIq-TW-qcq" firstAttribute="top" secondItem="TOv-60-iaq" secondAttribute="bottom" id="lhJ-IE-s0Q"/>
<constraint firstItem="Alc-xZ-4VT" firstAttribute="leading" secondItem="TOv-60-iaq" secondAttribute="trailing" constant="8" id="rbc-Rn-vCT"/>
<constraint firstItem="Alc-xZ-4VT" firstAttribute="top" secondItem="B3H-28-ZKR" secondAttribute="top" constant="19" id="saI-os-EY4"/>
<constraint firstItem="TOv-60-iaq" firstAttribute="top" secondItem="Oyn-h1-OvH" secondAttribute="bottom" id="wb5-Yx-ZIx"/>
Expand Down
2 changes: 1 addition & 1 deletion Rocket.Chat/Views/Chat/New Chat/Cells/QuoteMessageCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extension QuoteMessageCell {
messageUsername.textColor = theme.titleText
date.textColor = theme.auxiliaryText
purpose.textColor = theme.auxiliaryText
username.textColor = theme.actionTintColor
username.textColor = theme.bodyText
text.textColor = theme.bodyText
containerView.layer.borderColor = theme.borderColor.cgColor
}
Expand Down
4 changes: 2 additions & 2 deletions Rocket.Chat/Views/Chat/New Chat/Cells/QuoteMessageCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<nil key="highlightedColor"/>
</label>
<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">
<rect key="frame" x="15" y="61" width="236" height="14.5"/>
<rect key="frame" x="15" y="57" width="236" height="18.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" red="0.047058823530000002" green="0.050980392159999999" blue="0.058823529409999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -85,7 +85,7 @@
<constraint firstItem="35A-7N-lVK" firstAttribute="top" secondItem="nHB-nk-DRf" secondAttribute="bottom" id="MbD-mt-n1N"/>
<constraint firstItem="35A-7N-lVK" firstAttribute="leading" secondItem="VLV-ym-FZM" secondAttribute="leading" constant="15" id="NuK-jg-7Xm"/>
<constraint firstItem="YC5-ts-L8T" firstAttribute="leading" secondItem="VLV-ym-FZM" secondAttribute="leading" constant="15" id="W73-Vt-GqB"/>
<constraint firstItem="YC5-ts-L8T" firstAttribute="top" secondItem="35A-7N-lVK" secondAttribute="bottom" constant="4" id="WYI-Yb-8LB"/>
<constraint firstItem="YC5-ts-L8T" firstAttribute="top" secondItem="35A-7N-lVK" secondAttribute="bottom" id="WYI-Yb-8LB"/>
<constraint firstAttribute="trailing" secondItem="YC5-ts-L8T" secondAttribute="trailing" constant="15" id="WtL-sW-5eJ"/>
<constraint firstAttribute="bottom" secondItem="YC5-ts-L8T" secondAttribute="bottom" constant="15" id="YRp-qV-IU6"/>
<constraint firstItem="24j-n8-BYB" firstAttribute="leading" secondItem="35A-7N-lVK" secondAttribute="trailing" constant="8" id="YaK-8n-ymS"/>
Expand Down

0 comments on commit ac1a172

Please sign in to comment.