Skip to content

Commit

Permalink
Change words
Browse files Browse the repository at this point in the history
  • Loading branch information
jinios committed Sep 30, 2018
1 parent 6c0d4c5 commit 58ba122
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion MartHoliday/MartHoliday/SlideMenuView.xib
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<rect key="frame" x="0.0" y="0.0" width="170" height="170"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="마트휴일알리미 : )" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5oH-NE-tVe">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="마트쉬는날 : )" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5oH-NE-tVe">
<rect key="frame" x="15" y="29.5" width="105" height="16"/>
<fontDescription key="fontDescription" name="NanumSquareRoundOTFR" family="NanumSquareRoundOTF" pointSize="14"/>
<nil key="textColor"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class MainViewController: UIViewController, FavoriteConvertible, HeaderDelegate,
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
self.navigationController?.navigationBar.prefersLargeTitles = false
self.navigationItem.title = "마트휴무알리미"
self.navigationItem.title = "마트쉬는날"
setTableView()
}

Expand All @@ -80,7 +80,7 @@ class MainViewController: UIViewController, FavoriteConvertible, HeaderDelegate,
}

let slideWidth = self.view.frame.width/2
let slideHeight = (self.view.frame.height - topSafeArea - bottomSafeArea)
let slideHeight = (self.view.frame.height - topSafeArea)

self.slidetopView.frame = CGRect(x: -(slideWidth), y: topSafeArea, width: slideWidth, height: slideHeight/7)
self.slideMenu.frame = CGRect(x: -(slideWidth), y: slidetopView.frame.maxY, width: slideWidth, height: (slideHeight*6)/7)
Expand Down

0 comments on commit 58ba122

Please sign in to comment.