Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions internal/glance/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,7 @@ func parseCliOptions() (*cliOptions, error) {
} else if len(args) == 2 {
if args[0] == "password:hash" {
intent = cliIntentPasswordHash
} else {
return nil, unknownCommandErr
}
} else if len(args) == 2 {
if args[0] == "mountpoint:info" {
} else if args[0] == "mountpoint:info" {
intent = cliIntentMountpointInfo
} else {
return nil, unknownCommandErr
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/glance.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func newApplication(c *config) (*application, error) {
themeProps := make([]*themeProperties, 0, 2)

defaultDarkTheme, ok := config.Theme.Presets.Get("default-dark")
if ok && !config.Theme.SameAs(defaultDarkTheme) || !config.Theme.SameAs(&themeProperties{}) {
if ok && (!config.Theme.SameAs(defaultDarkTheme) || !config.Theme.SameAs(&themeProperties{})) {
themeKeys = append(themeKeys, "default-dark")
themeProps = append(themeProps, &themeProperties{})
}
Expand Down Expand Up @@ -168,7 +168,7 @@ func newApplication(c *config) (*application, error) {
page.Width = ""
}

if page.DesktopNavigationWidth == "" && page.DesktopNavigationWidth != "default" {
if page.DesktopNavigationWidth == "" || page.DesktopNavigationWidth == "default" {
page.DesktopNavigationWidth = page.Width
}

Expand Down