Skip to content

Commit b0b84e4

Browse files
zwaldowskizwaldowski
authored
Big Sur bare minimum (#715)
* macOS 10.13: Fix commit header bar colors * macOS 11: Fix welcome window contrast in dark mode * macOS 11: Fix alignment of "Also remove" accessory in reset alert * macOS 11: Opt out of some inset table views * macOS 11: Allow native separators in inset tables
1 parent 6726fba commit b0b84e4

18 files changed

+307
-346
lines changed

‎GitUp/Application/Base.lproj/Document.xib

Lines changed: 72 additions & 67 deletions
Large diffs are not rendered by default.

‎GitUp/Application/Base.lproj/WelcomeWindowController.xib

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
4-
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
4+
<deployment version="110000" identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
6+
<capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
67
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
78
</dependencies>
89
<objects>
@@ -20,15 +21,15 @@
2021
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
2122
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="mjY-As-hbN" userLabel="Welcome" customClass="WelcomeWindow">
2223
<rect key="contentRect" x="131" y="158" width="280" height="349"/>
23-
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
24+
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
2425
<view key="contentView" id="36m-6r-JT2">
2526
<rect key="frame" x="0.0" y="0.0" width="280" height="349"/>
2627
<autoresizingMask key="autoresizingMask"/>
2728
<subviews>
2829
<box fixedFrame="YES" boxType="custom" borderType="none" borderWidth="0.0" cornerRadius="10" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="UoN-n1-xSr">
2930
<rect key="frame" x="0.0" y="0.0" width="280" height="349"/>
3031
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
31-
<view key="contentView" ambiguous="YES" id="UVs-2r-EAT" customClass="WelcomeWindowView">
32+
<view key="contentView" id="UVs-2r-EAT" customClass="WelcomeWindowView">
3233
<rect key="frame" x="0.0" y="0.0" width="280" height="349"/>
3334
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3435
<subviews>
@@ -84,7 +85,7 @@
8485
</customView>
8586
</subviews>
8687
</view>
87-
<color key="fillColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
88+
<color key="fillColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/>
8889
</box>
8990
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="FXE-km-lcD">
9091
<rect key="frame" x="0.0" y="85" width="280" height="5"/>
@@ -102,7 +103,7 @@
102103
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
103104
<popUpButtonCell key="cell" type="bevel" title="Recently Opened…" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" autoenablesItems="NO" altersStateOfSelectedItem="NO" selectedItem="BnD-OX-t50" id="TkZ-yA-jfp">
104105
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
105-
<font key="font" metaFont="system"/>
106+
<font key="font" metaFont="menu"/>
106107
<string key="keyEquivalent"></string>
107108
<menu key="menu" autoenablesItems="NO" id="SuZ-b2-YNW">
108109
<items>
@@ -113,7 +114,7 @@
113114
</popUpButton>
114115
</subviews>
115116
</view>
116-
<color key="fillColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
117+
<color key="fillColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/>
117118
</box>
118119
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="3Ya-QW-NlZ">
119120
<rect key="frame" x="0.0" y="49" width="280" height="5"/>
@@ -169,12 +170,12 @@
169170
</box>
170171
</subviews>
171172
</view>
172-
<point key="canvasLocation" x="-185" y="548"/>
173+
<point key="canvasLocation" x="-185" y="547.5"/>
173174
</window>
174175
</objects>
175176
<resources>
176177
<image name="NSApplicationIcon" width="32" height="32"/>
177-
<image name="NSStopProgressFreestandingTemplate" width="14" height="14"/>
178+
<image name="NSStopProgressFreestandingTemplate" width="15" height="15"/>
178179
<image name="icon_forum" width="12" height="12"/>
179180
<image name="icon_twitter" width="12" height="12"/>
180181
</resources>

‎GitUpKit/Components/Base.lproj/GICommitListViewController.xib

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -26,13 +26,14 @@
2626
<rect key="frame" x="0.0" y="0.0" width="310" height="500"/>
2727
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2828
<subviews>
29-
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="71" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="XD8-on-AQk" customClass="GITableView">
29+
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="71" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="XD8-on-AQk" customClass="GITableView">
3030
<rect key="frame" x="0.0" y="0.0" width="310" height="500"/>
3131
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3232
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
33+
<tableViewGridLines key="gridStyleMask" horizontal="YES"/>
3334
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
3435
<tableColumns>
35-
<tableColumn editable="NO" width="310" minWidth="40" maxWidth="1000" id="jYE-Dh-d6l">
36+
<tableColumn editable="NO" width="298" minWidth="40" maxWidth="1000" id="jYE-Dh-d6l">
3637
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
3738
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
3839
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -52,7 +53,7 @@
5253
<rect key="frame" x="12" y="52" width="84" height="14"/>
5354
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
5455
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;SHA1&gt;" id="vGZ-yd-Q3L">
55-
<font key="font" metaFont="controlContent" size="11"/>
56+
<font key="font" metaFont="smallSystem"/>
5657
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
5758
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
5859
</textFieldCell>
@@ -61,7 +62,7 @@
6162
<rect key="frame" x="164" y="52" width="128" height="14"/>
6263
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
6364
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="right" title="&lt;DATE&gt;" id="fnB-nM-Xez">
64-
<font key="font" metaFont="controlContent" size="11"/>
65+
<font key="font" metaFont="smallSystem"/>
6566
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
6667
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
6768
</textFieldCell>
@@ -70,7 +71,7 @@
7071
<rect key="frame" x="12" y="30" width="280" height="14"/>
7172
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
7273
<textFieldCell key="cell" controlSize="small" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;SUMMARY&gt;" id="ldy-6V-89y">
73-
<font key="font" metaFont="controlContent" size="11"/>
74+
<font key="font" metaFont="smallSystem"/>
7475
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
7576
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
7677
</textFieldCell>
@@ -79,7 +80,7 @@
7980
<rect key="frame" x="12" y="8" width="280" height="14"/>
8081
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
8182
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;AUTHOR&gt;" id="Wfd-kf-H2a">
82-
<font key="font" metaFont="controlContent" size="11"/>
83+
<font key="font" metaFont="smallSystem"/>
8384
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
8485
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
8586
</textFieldCell>
@@ -100,7 +101,7 @@
100101
<rect key="frame" x="12" y="30" width="84" height="14"/>
101102
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
102103
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;TYPE&gt;" id="opM-4b-OCF">
103-
<font key="font" metaFont="controlContent" size="11"/>
104+
<font key="font" metaFont="smallSystem"/>
104105
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
105106
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
106107
</textFieldCell>
@@ -109,7 +110,7 @@
109110
<rect key="frame" x="12" y="8" width="280" height="14"/>
110111
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
111112
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;NAME&gt;" id="HEY-qh-9fe">
112-
<font key="font" metaFont="controlContent" size="11"/>
113+
<font key="font" metaFont="smallSystem"/>
113114
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
114115
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
115116
</textFieldCell>
@@ -144,7 +145,7 @@
144145
<rect key="frame" x="73" y="252" width="164" height="18"/>
145146
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
146147
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="&lt;EMPTY&gt;" id="t3C-dG-D6U">
147-
<font key="font" metaFont="menu" size="14"/>
148+
<font key="font" metaFont="system" size="14"/>
148149
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
149150
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
150151
</textFieldCell>

0 commit comments

Comments
 (0)