Skip to content

Commit

Permalink
Merge branch 'release/1.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@loregr
loregr committed Jan 30, 2019
2 parents 22b5295 + 0c786a9 commit d081e18
Show file tree
Hide file tree
Showing 7 changed files with 1,564 additions and 613 deletions.
30 changes: 16 additions & 14 deletions Example/LGButton/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<rect key="frame" x="0.0" y="20" width="375" height="1980"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Btu-bB-OF4">
<rect key="frame" x="0.0" y="0.0" width="375" height="1654.5"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="1653.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="vMc-PO-YZ4">
<rect key="frame" x="16" y="16" width="343" height="1622.5"/>
<rect key="frame" x="16" y="16" width="343" height="1621.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Flat background" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h5A-IU-0Ih">
<rect key="frame" x="109.5" y="0.0" width="124" height="20.5"/>
Expand Down Expand Up @@ -183,7 +183,7 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CqB-ID-VJX" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="97.5" y="549.5" width="148" height="35"/>
<rect key="frame" x="80.5" y="549.5" width="182" height="35"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
Expand Down Expand Up @@ -215,6 +215,8 @@
<userDefinedRuntimeAttribute type="color" keyPath="titleColor">
<color key="value" red="0.98823529409999999" green="0.91372549020000005" blue="0.0078431372550000003" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="leftIconString" value="google-plus"/>
<userDefinedRuntimeAttribute type="string" keyPath="leftIconFontName" value="fa"/>
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Left icon" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kM8-4L-hsv">
Expand Down Expand Up @@ -469,7 +471,7 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c6h-lz-P3f" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="75" y="1069.5" width="193" height="44.5"/>
<rect key="frame" x="75" y="1069.5" width="193" height="44"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
Expand Down Expand Up @@ -543,13 +545,13 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Async" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QF3-BN-bkO">
<rect key="frame" x="148" y="1130" width="47" height="20.5"/>
<rect key="frame" x="148" y="1129.5" width="47" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0l8-co-q04" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="114" y="1166.5" width="115" height="41"/>
<rect key="frame" x="114" y="1166" width="115" height="41"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
Expand Down Expand Up @@ -626,13 +628,13 @@
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Vertical orientation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kjq-YI-5Ah" userLabel="Vertical alignment">
<rect key="frame" x="99.5" y="1223.5" width="144.5" height="20.5"/>
<rect key="frame" x="99.5" y="1223" width="144.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jnn-9D-Hb1" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="114" y="1260" width="115" height="64.5"/>
<rect key="frame" x="114" y="1259.5" width="115" height="64"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
Expand Down Expand Up @@ -712,13 +714,13 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Gradient with Rotation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2sJ-rd-SU2">
<rect key="frame" x="86.5" y="1340.5" width="170.5" height="20.5"/>
<rect key="frame" x="86.5" y="1339.5" width="170.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S4I-pc-OhJ" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="126" y="1377" width="91" height="57"/>
<rect key="frame" x="126" y="1376" width="91" height="57"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
Expand Down Expand Up @@ -750,13 +752,13 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Left aligned text" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Swn-YR-m5C">
<rect key="frame" x="110" y="1450" width="123.5" height="20.5"/>
<rect key="frame" x="110" y="1449" width="123.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n6h-za-Bvr" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="71.5" y="1486.5" width="200" height="34"/>
<rect key="frame" x="71.5" y="1485.5" width="200" height="34"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="aNS-hS-AZ0"/>
Expand Down Expand Up @@ -805,13 +807,13 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Multiline title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pHc-aU-qSL">
<rect key="frame" x="123" y="1536.5" width="97.5" height="20.5"/>
<rect key="frame" x="123" y="1535.5" width="97.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Qm-IT-y1j" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="111.5" y="1573" width="120" height="49.5"/>
<rect key="frame" x="111.5" y="1572" width="120" height="49.5"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="120" id="c5i-jq-EId"/>
Expand Down
Loading

0 comments on commit d081e18

Please sign in to comment.