Merge pull request #556 from mkinitcpio/fix/settings-ui

thebaselab · Aug 23, 2022 · 90b85eb · 90b85eb
2 parents d341f78 + 51cedba
commit 90b85eb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/CodeApp/UI/setting/authentication.swift b/CodeApp/UI/setting/authentication.swift
@@ -30,23 +30,22 @@ struct remoteAuthentication: View {
 
     var body: some View {
         VStack {
-            DescriptionText(
-                "credentials.note"
-            )
-
             Form {
-                Section(header: Text("Remote Credentials")) {
-                    TextField("User Name", text: $username)
-                        .textContentType(.name)
-                        .disableAutocorrection(true)
-                        .autocapitalization(.none)
-                    SecureField("Password / Personal Access Token", text: $password)
-                        .textContentType(.password)
-                        .disableAutocorrection(true)
-                        .autocapitalization(.none)
+                Section(
+                    header: Text("Remote Credentials"),
+                    footer: Text("credentials.note")) {
+                TextField("User Name", text: $username)
+                    .textContentType(.name)
+                    .disableAutocorrection(true)
+                    .autocapitalization(.none)
+                SecureField("Password / Personal Access Token", text: $password)
+                    .textContentType(.password)
+                    .disableAutocorrection(true)
+                    .autocapitalization(.none)
                 }
             }
         }.navigationBarTitle("Authentication", displayMode: .inline)
+            .background(Color(.systemGroupedBackground))
             .navigationBarItems(
                 trailing:
                     Button(NSLocalizedString("Done", comment: "")) {

diff --git a/CodeApp/UI/setting/customShortcut.swift b/CodeApp/UI/setting/customShortcut.swift
@@ -28,9 +28,7 @@ struct customShortcuts: View {
         VStack {
             SearchBar(text: $filter, searchAction: nil, placeholder: "Search", cornerRadius: 6)
                 .padding(.horizontal)
-            Text("Note: Keyboard shortcuts that clash with existing shortcuts will not apply.")
-                .font(.caption)
-                .foregroundColor(.gray)
+            DescriptionText("Note: Keyboard shortcuts that clash with existing shortcuts will not apply.")
             Form {
                 Section("Actions") {
                     List(
@@ -79,8 +77,8 @@ struct customShortcuts: View {
                             })
                     }
                 }
-
             }
+            .background(Color(.systemGroupedBackground))
         }.onAppear {
             if let result = UserDefaults.standard.value(
                 forKey: "thebaselab.custom.keyboard.shortcuts") as? [String: [GCKeyCode]]

diff --git a/CodeApp/UI/setting/name_email.swift b/CodeApp/UI/setting/name_email.swift
@@ -29,6 +29,7 @@ struct name_email: View {
                     .autocapitalization(.none)
             }
         }.navigationBarTitle("Author Identity", displayMode: .inline)
+            .background(Color(.systemGroupedBackground))
             .navigationBarItems(
                 trailing:
                     Button(NSLocalizedString("Done", comment: "")) {

diff --git a/CodeApp/monaco-textmate.bundle/index.html b/CodeApp/monaco-textmate.bundle/index.html
@@ -10,11 +10,13 @@
   </head>
   <style>
     @font-face {
-      font-family: "Fira Code";
-      src: local("FiraCode-Regular"),
-        url("fonts/FiraCode-Regular.ttf") format("truetype");
+        font-family: "Fira Code";
+        src: local("FiraCode-Regular"),
+            url("fonts/FiraCode-Regular.ttf")
+            format("truetype");
     }
     body {
+      font-family: system-ui, -apple-system;
       height: 100%;
       width: 100%;
       margin: 0;