git_ui: Design Polish (#26361)
Polish PR - [ ] Horizontal scrollbar for git panel - [ ] Allow shift clicking a checkbox in any section to stage the whole section - [ ] Clean up design of no changes/pending push state in panel - [x] Ensure checkbox placeholder dot is centered in the checkbox - [x] Improve spacing between elements in git panel entries - [x] Update git branch icon to match branch selector text when disabled - [x] Truncate last commit message less aggressively in panel - [x] Clean up new panel header design - [x] Remove `_background` version control keys (backgrounds are derived from the foreground colors) ### Previous message truncation: Before:  After:  ### Make branch icon match when menu is disabled Before:  After:  Release Notes: - N/A *or* Added/Fixed/Improved ... --------- Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Cole Miller <m@cole-miller.net> Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
Nate Butler
GitHub
parent
63091459d8
commit
976fc3ee97
9 changed files with 180 additions and 156 deletions
|
|
@ -136,14 +136,10 @@ impl ThemeColors {
|
|||
terminal_ansi_dim_white: neutral().light().step_11(),
|
||||
link_text_hover: orange().light().step_10(),
|
||||
version_control_added: ADDED_COLOR,
|
||||
version_control_added_background: ADDED_COLOR.opacity(0.1),
|
||||
version_control_deleted: REMOVED_COLOR,
|
||||
version_control_deleted_background: REMOVED_COLOR.opacity(0.1),
|
||||
version_control_modified: MODIFIED_COLOR,
|
||||
version_control_modified_background: MODIFIED_COLOR.opacity(0.1),
|
||||
version_control_renamed: MODIFIED_COLOR,
|
||||
version_control_conflict: orange().light().step_12(),
|
||||
version_control_conflict_background: orange().light().step_12().opacity(0.1),
|
||||
version_control_ignored: gray().light().step_12(),
|
||||
}
|
||||
}
|
||||
|
|
@ -253,14 +249,10 @@ impl ThemeColors {
|
|||
terminal_ansi_dim_white: neutral().dark().step_10(),
|
||||
link_text_hover: orange().dark().step_10(),
|
||||
version_control_added: ADDED_COLOR,
|
||||
version_control_added_background: ADDED_COLOR.opacity(0.1),
|
||||
version_control_deleted: REMOVED_COLOR,
|
||||
version_control_deleted_background: REMOVED_COLOR.opacity(0.1),
|
||||
version_control_modified: MODIFIED_COLOR,
|
||||
version_control_modified_background: MODIFIED_COLOR.opacity(0.1),
|
||||
version_control_renamed: MODIFIED_COLOR,
|
||||
version_control_conflict: orange().dark().step_12(),
|
||||
version_control_conflict_background: orange().dark().step_12().opacity(0.1),
|
||||
version_control_ignored: gray().dark().step_12(),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -190,14 +190,10 @@ pub(crate) fn zed_default_dark() -> Theme {
|
|||
editor_foreground: hsla(218. / 360., 14. / 100., 71. / 100., 1.),
|
||||
link_text_hover: blue,
|
||||
version_control_added: ADDED_COLOR,
|
||||
version_control_added_background: ADDED_COLOR.opacity(0.1),
|
||||
version_control_deleted: REMOVED_COLOR,
|
||||
version_control_deleted_background: REMOVED_COLOR.opacity(0.1),
|
||||
version_control_modified: MODIFIED_COLOR,
|
||||
version_control_modified_background: MODIFIED_COLOR.opacity(0.1),
|
||||
version_control_renamed: MODIFIED_COLOR,
|
||||
version_control_conflict: crate::orange().light().step_12(),
|
||||
version_control_conflict_background: crate::orange().light().step_12().opacity(0.1),
|
||||
version_control_ignored: crate::gray().light().step_12(),
|
||||
},
|
||||
status: StatusColors {
|
||||
|
|
|
|||
|
|
@ -557,26 +557,14 @@ pub struct ThemeColorsContent {
|
|||
#[serde(rename = "version_control.added")]
|
||||
pub version_control_added: Option<String>,
|
||||
|
||||
/// Added version control background color.
|
||||
#[serde(rename = "version_control.added_background")]
|
||||
pub version_control_added_background: Option<String>,
|
||||
|
||||
/// Deleted version control color.
|
||||
#[serde(rename = "version_control.deleted")]
|
||||
pub version_control_deleted: Option<String>,
|
||||
|
||||
/// Deleted version control background color.
|
||||
#[serde(rename = "version_control.deleted_background")]
|
||||
pub version_control_deleted_background: Option<String>,
|
||||
|
||||
/// Modified version control color.
|
||||
#[serde(rename = "version_control.modified")]
|
||||
pub version_control_modified: Option<String>,
|
||||
|
||||
/// Modified version control background color.
|
||||
#[serde(rename = "version_control.modified_background")]
|
||||
pub version_control_modified_background: Option<String>,
|
||||
|
||||
/// Renamed version control color.
|
||||
#[serde(rename = "version_control.renamed")]
|
||||
pub version_control_renamed: Option<String>,
|
||||
|
|
@ -585,10 +573,6 @@ pub struct ThemeColorsContent {
|
|||
#[serde(rename = "version_control.conflict")]
|
||||
pub version_control_conflict: Option<String>,
|
||||
|
||||
/// Conflict version control background color.
|
||||
#[serde(rename = "version_control.conflict_background")]
|
||||
pub version_control_conflict_background: Option<String>,
|
||||
|
||||
/// Ignored version control color.
|
||||
#[serde(rename = "version_control.ignored")]
|
||||
pub version_control_ignored: Option<String>,
|
||||
|
|
@ -1000,26 +984,14 @@ impl ThemeColorsContent {
|
|||
.version_control_added
|
||||
.as_ref()
|
||||
.and_then(|color| try_parse_color(color).ok()),
|
||||
version_control_added_background: self
|
||||
.version_control_added_background
|
||||
.as_ref()
|
||||
.and_then(|color| try_parse_color(color).ok()),
|
||||
version_control_deleted: self
|
||||
.version_control_deleted
|
||||
.as_ref()
|
||||
.and_then(|color| try_parse_color(color).ok()),
|
||||
version_control_deleted_background: self
|
||||
.version_control_deleted_background
|
||||
.as_ref()
|
||||
.and_then(|color| try_parse_color(color).ok()),
|
||||
version_control_modified: self
|
||||
.version_control_modified
|
||||
.as_ref()
|
||||
.and_then(|color| try_parse_color(color).ok()),
|
||||
version_control_modified_background: self
|
||||
.version_control_modified_background
|
||||
.as_ref()
|
||||
.and_then(|color| try_parse_color(color).ok()),
|
||||
version_control_renamed: self
|
||||
.version_control_renamed
|
||||
.as_ref()
|
||||
|
|
@ -1028,10 +1000,6 @@ impl ThemeColorsContent {
|
|||
.version_control_conflict
|
||||
.as_ref()
|
||||
.and_then(|color| try_parse_color(color).ok()),
|
||||
version_control_conflict_background: self
|
||||
.version_control_conflict_background
|
||||
.as_ref()
|
||||
.and_then(|color| try_parse_color(color).ok()),
|
||||
version_control_ignored: self
|
||||
.version_control_ignored
|
||||
.as_ref()
|
||||
|
|
|
|||
|
|
@ -246,22 +246,14 @@ pub struct ThemeColors {
|
|||
|
||||
/// Represents an added entry or hunk in vcs, like git.
|
||||
pub version_control_added: Hsla,
|
||||
/// Represents the line background of an added entry or hunk in vcs, like git.
|
||||
pub version_control_added_background: Hsla,
|
||||
/// Represents a deleted entry in version control systems.
|
||||
pub version_control_deleted: Hsla,
|
||||
/// Represents the background color for deleted entries in version control systems.
|
||||
pub version_control_deleted_background: Hsla,
|
||||
/// Represents a modified entry in version control systems.
|
||||
pub version_control_modified: Hsla,
|
||||
/// Represents the background color for modified entries in version control systems.
|
||||
pub version_control_modified_background: Hsla,
|
||||
/// Represents a renamed entry in version control systems.
|
||||
pub version_control_renamed: Hsla,
|
||||
/// Represents a conflicting entry in version control systems.
|
||||
pub version_control_conflict: Hsla,
|
||||
/// Represents the background color for conflicting entries in version control systems.
|
||||
pub version_control_conflict_background: Hsla,
|
||||
/// Represents an ignored entry in version control systems.
|
||||
pub version_control_ignored: Hsla,
|
||||
}
|
||||
|
|
@ -366,14 +358,10 @@ pub enum ThemeColorField {
|
|||
TerminalAnsiDimWhite,
|
||||
LinkTextHover,
|
||||
VersionControlAdded,
|
||||
VersionControlAddedBackground,
|
||||
VersionControlDeleted,
|
||||
VersionControlDeletedBackground,
|
||||
VersionControlModified,
|
||||
VersionControlModifiedBackground,
|
||||
VersionControlRenamed,
|
||||
VersionControlConflict,
|
||||
VersionControlConflictBackground,
|
||||
VersionControlIgnored,
|
||||
}
|
||||
|
||||
|
|
@ -485,20 +473,10 @@ impl ThemeColors {
|
|||
ThemeColorField::TerminalAnsiDimWhite => self.terminal_ansi_dim_white,
|
||||
ThemeColorField::LinkTextHover => self.link_text_hover,
|
||||
ThemeColorField::VersionControlAdded => self.version_control_added,
|
||||
ThemeColorField::VersionControlAddedBackground => self.version_control_added_background,
|
||||
ThemeColorField::VersionControlDeleted => self.version_control_deleted,
|
||||
ThemeColorField::VersionControlDeletedBackground => {
|
||||
self.version_control_deleted_background
|
||||
}
|
||||
ThemeColorField::VersionControlModified => self.version_control_modified,
|
||||
ThemeColorField::VersionControlModifiedBackground => {
|
||||
self.version_control_modified_background
|
||||
}
|
||||
ThemeColorField::VersionControlRenamed => self.version_control_renamed,
|
||||
ThemeColorField::VersionControlConflict => self.version_control_conflict,
|
||||
ThemeColorField::VersionControlConflictBackground => {
|
||||
self.version_control_conflict_background
|
||||
}
|
||||
ThemeColorField::VersionControlIgnored => self.version_control_ignored,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue