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 #303 from RocketChat/chore/change_star_size_position
Browse files Browse the repository at this point in the history
Fixed: adjust start button on Chat controller
  • Loading branch information
rafaelks authored Feb 20, 2017
2 parents 1288be2 + 903862c commit 064135d
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Star NavBar.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Star [email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Star [email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 12 additions & 15 deletions Rocket.Chat/Storyboards/Chat.storyboard
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ZWT-yJ-dk4">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ZWT-yJ-dk4">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -38,18 +37,16 @@
</view>
<extendedEdge key="edgesForExtendedLayout"/>
<navigationItem key="navigationItem" title="Rocket.Chat" id="NRY-HN-GEa">
<leftBarButtonItems>
<barButtonItem image="Menu" id="8AY-Oe-fcS">
<connections>
<action selector="buttonMenuDidPressed:" destination="A1E-cs-q8E" id="Rkb-iU-5Co"/>
</connections>
</barButtonItem>
<barButtonItem image="Star" id="wdP-aa-l8w">
<connections>
<action selector="buttonFavoriteDidPressed:" destination="A1E-cs-q8E" id="nff-Ej-DNe"/>
</connections>
</barButtonItem>
</leftBarButtonItems>
<barButtonItem key="leftBarButtonItem" image="Menu" id="8AY-Oe-fcS">
<connections>
<action selector="buttonMenuDidPressed:" destination="A1E-cs-q8E" id="Rkb-iU-5Co"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" image="Star NavBar" id="wdP-aa-l8w">
<connections>
<action selector="buttonFavoriteDidPressed:" destination="A1E-cs-q8E" id="nff-Ej-DNe"/>
</connections>
</barButtonItem>
</navigationItem>
<connections>
<outlet property="activityIndicatorContainer" destination="fbt-TF-z7U" id="Nmz-IG-SvM"/>
Expand Down Expand Up @@ -81,6 +78,6 @@
</scenes>
<resources>
<image name="Menu" width="22" height="22"/>
<image name="Star" width="26" height="25"/>
<image name="Star NavBar" width="22" height="21"/>
</resources>
</document>

0 comments on commit 064135d

Please sign in to comment.