Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit b7e2391

Browse files
authored
UI Polishing (#158)
* Layout of buttons in navigation bar and tab bar corrected * Radius of address bar changed * Height of address bar changed * Address bar border color adjusted * Suggestion height adjusted * Padding in suggestions corrected * Border radius of the suggestion window corrected * Margin of the suggestion window separator set to 0 * Bookmark button tint color added * Shadow of suggestion window moved down
1 parent b6838a1 commit b7e2391

File tree

49 files changed

+131
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+131
-92
lines changed

DuckDuckGo/Assets.xcassets/Colors/AddressBarBorderColor.colorset/Contents.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"color" : {
55
"color-space" : "display-p3",
66
"components" : {
7-
"alpha" : "0.700",
8-
"blue" : "0xD4",
9-
"green" : "0xD4",
10-
"red" : "0xD4"
7+
"alpha" : "0.200",
8+
"blue" : "0x00",
9+
"green" : "0x00",
10+
"red" : "0x00"
1111
}
1212
},
1313
"idiom" : "universal"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xEF",
9+
"green" : "0x69",
10+
"red" : "0x39"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0xFF",
27+
"green" : "0x9D",
28+
"red" : "0x76"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Add.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Vector.pdf",
4+
"filename" : "Add-16.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.
Binary file not shown.
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Back.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Vector.pdf",
4+
"filename" : "Arrow-Back-16.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Bookmark.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Vector.pdf",
4+
"filename" : "Bookmark-16.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
22
"images" : [
33
{
4-
"filename" : "BookmarkFilled.pdf",
4+
"filename" : "Bookmark-Solid-16.pdf",
55
"idiom" : "universal"
66
}
77
],
88
"info" : {
99
"author" : "xcode",
1010
"version" : 1
11+
},
12+
"properties" : {
13+
"template-rendering-intent" : "template"
1114
}
1215
}
Binary file not shown.
Binary file not shown.
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Burn.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Burn-Original.pdf",
4+
"filename" : "Burn-16.pdf",
55
"idiom" : "universal"
66
}
77
],

DuckDuckGo/Assets.xcassets/Images/Close.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Vector-3.pdf",
4+
"filename" : "Vector 1.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Favorite.imageset/Contents.json

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Vector-5.pdf",
5-
"idiom" : "universal",
6-
"scale" : "1x"
7-
},
8-
{
9-
"idiom" : "universal",
10-
"scale" : "2x"
11-
},
12-
{
13-
"idiom" : "universal",
14-
"scale" : "3x"
4+
"filename" : "Favorite-16.pdf",
5+
"idiom" : "universal"
156
}
167
],
178
"info" : {
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Vector-6.pdf",
4+
"filename" : "Favorite-Solid-16.pdf",
55
"idiom" : "universal"
66
}
77
],
88
"info" : {
99
"author" : "xcode",
1010
"version" : 1
11+
},
12+
"properties" : {
13+
"template-rendering-intent" : "template"
1114
}
1215
}
Binary file not shown.
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/FavoritedBookmarkSuggestion.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Vector.pdf",
4+
"filename" : "Bookmark-Fav-16.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Feedback.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Feedback.pdf",
4+
"filename" : "Feedback-16.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.
Binary file not shown.
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Forward.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Vector-2.pdf",
4+
"filename" : "Arrow-Next-16.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Refresh.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Union-3.pdf",
4+
"filename" : "Reload-16.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.
Binary file not shown.

DuckDuckGo/Assets.xcassets/Images/Settings.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Union-2.pdf",
4+
"filename" : "Menu-16.pdf",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.
Binary file not shown.
Binary file not shown.

DuckDuckGo/Common/Extensions/NSColorExtension.swift

+2
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ extension NSColor {
102102
NSColor(named: "EditingPanelColor")!
103103
}
104104

105+
static let bookmarkFilledTint = NSColor(named: "BookmarkFilledTint")!
106+
105107
static let bookmarkRepresentingColor1 = NSColor(named: "BookmarkRepresentingColor1")!
106108
static let bookmarkRepresentingColor2 = NSColor(named: "BookmarkRepresentingColor2")!
107109
static let bookmarkRepresentingColor3 = NSColor(named: "BookmarkRepresentingColor3")!

DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift

+2
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,10 @@ final class AddressBarButtonsViewController: NSViewController {
199199
if let url = tabCollectionViewModel.selectedTabViewModel?.tab.url,
200200
isUrlBookmarked || bookmarkManager.isUrlBookmarked(url: url) {
201201
bookmarkButton.image = Self.bookmarkFilledImage
202+
bookmarkButton.contentTintColor = NSColor.bookmarkFilledTint
202203
} else {
203204
bookmarkButton.image = Self.bookmarkImage
205+
bookmarkButton.contentTintColor = nil
204206
}
205207
}
206208

0 commit comments

Comments
 (0)