Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parameterize avatar_margin and assign it a default of 8

Browse source
This commit is contained in:
Antonio Scandurra 2022-05-03 18:04:53 +02:00
parent c268099554
commit 3ee4d90c19
11 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
assets/themes/cave-dark.json
View file

@ -346,6 +346,7 @@
}, },
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"avatar_margin": 8,
"height": 33, "height": 33,
"background": "#26232a", "background": "#26232a",
"padding": { "padding": {

1
assets/themes/cave-light.json
View file

@ -346,6 +346,7 @@
}, },
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"avatar_margin": 8,
"height": 33, "height": 33,
"background": "#e2dfe7", "background": "#e2dfe7",
"padding": { "padding": {

1
assets/themes/dark.json
View file

@ -346,6 +346,7 @@
}, },
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"avatar_margin": 8,
"height": 33, "height": 33,
"background": "#2b2b2b", "background": "#2b2b2b",
"padding": { "padding": {

1
assets/themes/light.json
View file

@ -346,6 +346,7 @@
}, },
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"avatar_margin": 8,
"height": 33, "height": 33,
"background": "#eaeaea", "background": "#eaeaea",
"padding": { "padding": {

1
assets/themes/solarized-dark.json
View file

@ -346,6 +346,7 @@
}, },
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"avatar_margin": 8,
"height": 33, "height": 33,
"background": "#073642", "background": "#073642",
"padding": { "padding": {

1
assets/themes/solarized-light.json
View file

@ -346,6 +346,7 @@
}, },
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"avatar_margin": 8,
"height": 33, "height": 33,
"background": "#eee8d5", "background": "#eee8d5",
"padding": { "padding": {

1
assets/themes/sulphurpool-dark.json
View file

@ -346,6 +346,7 @@
}, },
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"avatar_margin": 8,
"height": 33, "height": 33,
"background": "#293256", "background": "#293256",
"padding": { "padding": {

1
assets/themes/sulphurpool-light.json
View file

@ -346,6 +346,7 @@
}, },
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"avatar_margin": 8,
"height": 33, "height": 33,
"background": "#dfe2f1", "background": "#dfe2f1",
"padding": { "padding": {

1
crates/theme/src/theme.rs
View file

@ -53,6 +53,7 @@ pub struct Titlebar {
pub height: f32, pub height: f32,
pub title: TextStyle, pub title: TextStyle,
pub avatar_width: f32, pub avatar_width: f32,
pub avatar_margin: f32,
pub avatar_ribbon: AvatarRibbon, pub avatar_ribbon: AvatarRibbon,
pub offline_icon: OfflineIcon, pub offline_icon: OfflineIcon,
pub share_icon: Interactive<ShareIcon>, pub share_icon: Interactive<ShareIcon>,

2
crates/workspace/src/workspace.rs
View file

@ -1629,7 +1629,7 @@ impl Workspace {
.constrained() .constrained()
.with_width(theme.workspace.titlebar.avatar_width) .with_width(theme.workspace.titlebar.avatar_width)
.contained() .contained()
.with_margin_left(2.) .with_margin_left(theme.workspace.titlebar.avatar_margin)
.boxed(); .boxed();
if let Some(peer_id) = peer_id { if let Some(peer_id) = peer_id {

1
styles/src/styleTree/workspace.ts
View file

@ -61,6 +61,7 @@ export default function workspace(theme: Theme) {
statusBar: statusBar(theme), statusBar: statusBar(theme),
titlebar: { titlebar: {
avatarWidth: 18, avatarWidth: 18,
avatarMargin: 8,
height: 33, height: 33,
background: backgroundColor(theme, 100), background: backgroundColor(theme, 100),
padding: { padding: {