diff options
| -rw-r--r-- | pkg/gui/arrangement.go | 16 | ||||
| -rw-r--r-- | pkg/gui/command_log_panel.go | 2 | ||||
| -rw-r--r-- | pkg/gui/file_watching.go | 2 | ||||
| -rw-r--r-- | pkg/gui/style/style_test.go | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/pkg/gui/arrangement.go b/pkg/gui/arrangement.go index b865850d3..db1c3c172 100644 --- a/pkg/gui/arrangement.go +++ b/pkg/gui/arrangement.go @@ -210,7 +210,7 @@ func (gui *Gui) getWindowDimensions(informationStr string, appStatus string) map // The stash window by default only contains one line so that it's not hogging // too much space, but if you access it it should take up some space. This is -// the default behaviour when accordian mode is NOT in effect. If it is in effect +// the default behaviour when accordion mode is NOT in effect. If it is in effect // then when it's accessed it will have weight 2, not 1. func (gui *Gui) getDefaultStashWindowBox() *boxlayout.Box { gui.State.ContextManager.RLock() @@ -259,9 +259,9 @@ func (gui *Gui) sidePanelChildren(width int, height int) []*boxlayout.Box { fullHeightBox("stash"), } } else if height >= 28 { - accordianMode := gui.Config.GetUserConfig().Gui.ExpandFocusedSidePanel - accordianBox := func(defaultBox *boxlayout.Box) *boxlayout.Box { - if accordianMode && defaultBox.Window == currentWindow { + accordionMode := gui.Config.GetUserConfig().Gui.ExpandFocusedSidePanel + accordionBox := func(defaultBox *boxlayout.Box) *boxlayout.Box { + if accordionMode && defaultBox.Window == currentWindow { return &boxlayout.Box{ Window: defaultBox.Window, Weight: 2, @@ -276,10 +276,10 @@ func (gui *Gui) sidePanelChildren(width int, height int) []*boxlayout.Box { Window: "status", Size: 3, }, - accordianBox(&boxlayout.Box{Window: "files", Weight: 1}), - accordianBox(&boxlayout.Box{Window: "branches", Weight: 1}), - accordianBox(&boxlayout.Box{Window: "commits", Weight: 1}), - accordianBox(gui.getDefaultStashWindowBox()), + accordionBox(&boxlayout.Box{Window: "files", Weight: 1}), + accordionBox(&boxlayout.Box{Window: "branches", Weight: 1}), + accordionBox(&boxlayout.Box{Window: "commits", Weight: 1}), + accordionBox(gui.getDefaultStashWindowBox()), } } else { squashedHeight := 1 diff --git a/pkg/gui/command_log_panel.go b/pkg/gui/command_log_panel.go index df3410da6..261ceda90 100644 --- a/pkg/gui/command_log_panel.go +++ b/pkg/gui/command_log_panel.go @@ -173,7 +173,7 @@ func (gui *Gui) getRandomTip() string { constants.Links.Docs.CustomCommands, ), fmt.Sprintf( - "If you ever find a bug, do not hesistate to raise an issue on the repo:\n%s", + "If you ever find a bug, do not hesitate to raise an issue on the repo:\n%s", constants.Links.Issues, ), } diff --git a/pkg/gui/file_watching.go b/pkg/gui/file_watching.go index 607aa6eec..f5749a97d 100644 --- a/pkg/gui/file_watching.go +++ b/pkg/gui/file_watching.go @@ -11,7 +11,7 @@ import ( ) // macs for some bizarre reason cap the number of watchable files to 256. -// there's no obvious platform agonstic way to check the situation of the user's +// there's no obvious platform agnostic way to check the situation of the user's // computer so we're just arbitrarily capping at 200. This isn't so bad because // file watching is only really an added bonus for faster refreshing. const MAX_WATCHED_FILES = 50 diff --git a/pkg/gui/style/style_test.go b/pkg/gui/style/style_test.go index 8298076a5..cadd3c397 100644 --- a/pkg/gui/style/style_test.go +++ b/pkg/gui/style/style_test.go @@ -189,7 +189,7 @@ func TestTemplateFuncMapAddColors(t *testing.T) { "\x1b[31m\x1b[1mbar\x1b[0m\x1b[0m", }, { - "multiple string with diffrent colors", + "multiple string with different colors", "{{ .Foo | red }} - {{ .Foo | blue }}", "\x1b[31mbar\x1b[0m - \x1b[34mbar\x1b[0m", }, |