diff --git a/ui/pages/selection/selection.go b/ui/pages/selection/selection.go index 4fe2fdd100f743b09f23a334f8b75c1f1fdc9f14..19b8d16c47e5aaf4f83ccd9e1c851813abc45cbf 100644 --- a/ui/pages/selection/selection.go +++ b/ui/pages/selection/selection.go @@ -88,12 +88,8 @@ func (s *Selection) getMargins() (wm, hm int) { 2 // tabs margin see View() switch s.activeBox { case selectorBox: - hm += s.common.Styles.SelectorBox.GetVerticalFrameSize() + - s.common.Styles.SelectorBox.GetHeight() case readmeBox: - hm += s.common.Styles.ReadmeBox.GetVerticalFrameSize() + - s.common.Styles.ReadmeBox.GetHeight() + - 1 // readme statusbar + hm += 1 // readme statusbar } return } @@ -294,12 +290,12 @@ func (s *Selection) View() string { hm++ // tabs margin switch s.activeBox { case selectorBox: - ss := s.common.Styles.SelectorBox.Copy(). + ss := lipgloss.NewStyle(). Width(s.common.Width - wm). Height(s.common.Height - hm) view = ss.Render(s.selector.View()) case readmeBox: - rs := s.common.Styles.ReadmeBox.Copy(). + rs := lipgloss.NewStyle(). Height(s.common.Height - hm) status := fmt.Sprintf("☰ %.f%%", s.readme.ScrollPercent()*100) readmeStatus := lipgloss.NewStyle(). diff --git a/ui/styles/styles.go b/ui/styles/styles.go index 46c63f290181c15c4a7a21948cd7db0c7e613eaf..6e69fcb2564580fd320d443e9734093ba976aab6 100644 --- a/ui/styles/styles.go +++ b/ui/styles/styles.go @@ -20,10 +20,6 @@ type Styles struct { MenuItem lipgloss.Style MenuLastUpdate lipgloss.Style - // Selection page styles - SelectorBox lipgloss.Style - ReadmeBox lipgloss.Style - Repo struct { Base lipgloss.Style Title lipgloss.Style @@ -168,10 +164,6 @@ func DefaultStyles() *Styles { Foreground(lipgloss.Color("241")). Align(lipgloss.Right) - s.SelectorBox = lipgloss.NewStyle() - - s.ReadmeBox = lipgloss.NewStyle() - s.Repo.Base = lipgloss.NewStyle() s.Repo.Title = lipgloss.NewStyle().