Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(app): UI issues #556

Merged
merged 2 commits into from
Aug 23, 2022
Merged

fix(app): UI issues #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c8bba9
fix(app): UI issues
mkinitcpio Aug 23, 2022
51cedba
fix(app): revert deleted code for Fira font
mkinitcpio Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions CodeApp/UI/setting/authentication.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "")) {
Expand Down
6 changes: 2 additions & 4 deletions CodeApp/UI/setting/customShortcut.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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]]
Expand Down
1 change: 1 addition & 0 deletions CodeApp/UI/setting/name_email.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ struct name_email: View {
.autocapitalization(.none)
}
}.navigationBarTitle("Author Identity", displayMode: .inline)
.background(Color(.systemGroupedBackground))
.navigationBarItems(
trailing:
Button(NSLocalizedString("Done", comment: "")) {
Expand Down
8 changes: 5 additions & 3 deletions CodeApp/monaco-textmate.bundle/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
</head>
<style>
@font-face {
mkinitcpio marked this conversation as resolved.
Show resolved Hide resolved
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;
Expand Down