Cargo.lock 🔗
@@ -5851,7 +5851,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
[[package]]
name = "zed"
-version = "0.30.0"
+version = "0.31.0"
dependencies = [
"anyhow",
"assets",
Merge pull request #958 from zed-industries/titlebar-padding
Antonio Scandurra created
Add right padding to titlebar instead of margins on elementsChange summary
Cargo.lock | 2
assets/themes/cave-dark.json | 14
assets/themes/cave-light.json | 14
assets/themes/dark.json | 14
assets/themes/light.json | 14
assets/themes/solarized-dark.json | 14
assets/themes/solarized-light.json | 14
assets/themes/sulphurpool-dark.json | 14
assets/themes/sulphurpool-light.json | 14
crates/workspace/src/workspace.rs | 3
styles/dist/dark.json | 68 +++---
styles/dist/light.json | 92 ++++----
styles/dist/solarized-dark.json | 90 ++++----
styles/dist/solarized-light.json | 80 +++---
styles/dist/tokens.json | 330 +++++++++++++++---------------
styles/src/styleTree/workspace.ts | 5
16 files changed, 381 insertions(+), 401 deletions(-)
Detailed changes
assets/themes/cave-dark.json 🔗
@@ -349,7 +349,8 @@
"height": 33,
"background": "#26232a",
"padding": {
- "left": 80
+ "left": 80,
+ "right": 6
},
"title": {
"family": "Zed Sans",
@@ -380,8 +381,7 @@
},
"corner_radius": 6,
"margin": {
- "top": 1,
- "right": 6
+ "top": 1
},
"padding": {
"left": 6,
@@ -407,7 +407,8 @@
"corner_radius": 6,
"margin": {
"top": 3,
- "bottom": 2
+ "bottom": 2,
+ "left": 6
},
"color": "#8b8792",
"hover": {
@@ -436,10 +437,7 @@
"left": 6,
"right": 6
},
- "corner_radius": 6,
- "margin": {
- "right": 6
- }
+ "corner_radius": 6
}
},
"toolbar": {
assets/themes/cave-light.json 🔗
@@ -349,7 +349,8 @@
"height": 33,
"background": "#e2dfe7",
"padding": {
- "left": 80
+ "left": 80,
+ "right": 6
},
"title": {
"family": "Zed Sans",
@@ -380,8 +381,7 @@
},
"corner_radius": 6,
"margin": {
- "top": 1,
- "right": 6
+ "top": 1
},
"padding": {
"left": 6,
@@ -407,7 +407,8 @@
"corner_radius": 6,
"margin": {
"top": 3,
- "bottom": 2
+ "bottom": 2,
+ "left": 6
},
"color": "#585260",
"hover": {
@@ -436,10 +437,7 @@
"left": 6,
"right": 6
},
- "corner_radius": 6,
- "margin": {
- "right": 6
- }
+ "corner_radius": 6
}
},
"toolbar": {
assets/themes/dark.json 🔗
@@ -349,7 +349,8 @@
"height": 33,
"background": "#2b2b2b",
"padding": {
- "left": 80
+ "left": 80,
+ "right": 6
},
"title": {
"family": "Zed Sans",
@@ -380,8 +381,7 @@
},
"corner_radius": 6,
"margin": {
- "top": 1,
- "right": 6
+ "top": 1
},
"padding": {
"left": 6,
@@ -407,7 +407,8 @@
"corner_radius": 6,
"margin": {
"top": 3,
- "bottom": 2
+ "bottom": 2,
+ "left": 6
},
"color": "#9c9c9c",
"hover": {
@@ -436,10 +437,7 @@
"left": 6,
"right": 6
},
- "corner_radius": 6,
- "margin": {
- "right": 6
- }
+ "corner_radius": 6
}
},
"toolbar": {
assets/themes/light.json 🔗
@@ -349,7 +349,8 @@
"height": 33,
"background": "#eaeaea",
"padding": {
- "left": 80
+ "left": 80,
+ "right": 6
},
"title": {
"family": "Zed Sans",
@@ -380,8 +381,7 @@
},
"corner_radius": 6,
"margin": {
- "top": 1,
- "right": 6
+ "top": 1
},
"padding": {
"left": 6,
@@ -407,7 +407,8 @@
"corner_radius": 6,
"margin": {
"top": 3,
- "bottom": 2
+ "bottom": 2,
+ "left": 6
},
"color": "#717171",
"hover": {
@@ -436,10 +437,7 @@
"left": 6,
"right": 6
},
- "corner_radius": 6,
- "margin": {
- "right": 6
- }
+ "corner_radius": 6
}
},
"toolbar": {
assets/themes/solarized-dark.json 🔗
@@ -349,7 +349,8 @@
"height": 33,
"background": "#073642",
"padding": {
- "left": 80
+ "left": 80,
+ "right": 6
},
"title": {
"family": "Zed Sans",
@@ -380,8 +381,7 @@
},
"corner_radius": 6,
"margin": {
- "top": 1,
- "right": 6
+ "top": 1
},
"padding": {
"left": 6,
@@ -407,7 +407,8 @@
"corner_radius": 6,
"margin": {
"top": 3,
- "bottom": 2
+ "bottom": 2,
+ "left": 6
},
"color": "#93a1a1",
"hover": {
@@ -436,10 +437,7 @@
"left": 6,
"right": 6
},
- "corner_radius": 6,
- "margin": {
- "right": 6
- }
+ "corner_radius": 6
}
},
"toolbar": {
assets/themes/solarized-light.json 🔗
@@ -349,7 +349,8 @@
"height": 33,
"background": "#eee8d5",
"padding": {
- "left": 80
+ "left": 80,
+ "right": 6
},
"title": {
"family": "Zed Sans",
@@ -380,8 +381,7 @@
},
"corner_radius": 6,
"margin": {
- "top": 1,
- "right": 6
+ "top": 1
},
"padding": {
"left": 6,
@@ -407,7 +407,8 @@
"corner_radius": 6,
"margin": {
"top": 3,
- "bottom": 2
+ "bottom": 2,
+ "left": 6
},
"color": "#586e75",
"hover": {
@@ -436,10 +437,7 @@
"left": 6,
"right": 6
},
- "corner_radius": 6,
- "margin": {
- "right": 6
- }
+ "corner_radius": 6
}
},
"toolbar": {
assets/themes/sulphurpool-dark.json 🔗
@@ -349,7 +349,8 @@
"height": 33,
"background": "#293256",
"padding": {
- "left": 80
+ "left": 80,
+ "right": 6
},
"title": {
"family": "Zed Sans",
@@ -380,8 +381,7 @@
},
"corner_radius": 6,
"margin": {
- "top": 1,
- "right": 6
+ "top": 1
},
"padding": {
"left": 6,
@@ -407,7 +407,8 @@
"corner_radius": 6,
"margin": {
"top": 3,
- "bottom": 2
+ "bottom": 2,
+ "left": 6
},
"color": "#979db4",
"hover": {
@@ -436,10 +437,7 @@
"left": 6,
"right": 6
},
- "corner_radius": 6,
- "margin": {
- "right": 6
- }
+ "corner_radius": 6
}
},
"toolbar": {
assets/themes/sulphurpool-light.json 🔗
@@ -349,7 +349,8 @@
"height": 33,
"background": "#dfe2f1",
"padding": {
- "left": 80
+ "left": 80,
+ "right": 6
},
"title": {
"family": "Zed Sans",
@@ -380,8 +381,7 @@
},
"corner_radius": 6,
"margin": {
- "top": 1,
- "right": 6
+ "top": 1
},
"padding": {
"left": 6,
@@ -407,7 +407,8 @@
"corner_radius": 6,
"margin": {
"top": 3,
- "bottom": 2
+ "bottom": 2,
+ "left": 6
},
"color": "#5e6687",
"hover": {
@@ -436,10 +437,7 @@
"left": 6,
"right": 6
},
- "corner_radius": 6,
- "margin": {
- "right": 6
- }
+ "corner_radius": 6
}
},
"toolbar": {
crates/workspace/src/workspace.rs 🔗
@@ -1664,9 +1664,6 @@ impl Workspace {
.constrained()
.with_width(24.)
.aligned()
- .constrained()
- .with_width(24.)
- .aligned()
.boxed()
})
.with_cursor_style(CursorStyle::PointingHand)
styles/dist/dark.json 🔗
@@ -219,88 +219,88 @@
},
"ok": {
"base": {
- "value": "#1b9447",
+ "value": "#1b944726",
"description": "Step: 600",
"type": "color"
},
"hovered": {
- "value": "#1b9447",
+ "value": "#1b944733",
"description": "Step: 600",
"type": "color"
},
"active": {
- "value": "#1b9447",
+ "value": "#1b944740",
"description": "Step: 600",
"type": "color"
},
"focused": {
- "value": "#1b9447",
+ "value": "#1b944733",
"description": "Step: 600",
"type": "color"
}
},
"error": {
"base": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181826",
+ "description": "Step: 600",
"type": "color"
},
"hovered": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181833",
+ "description": "Step: 600",
"type": "color"
},
"active": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181840",
+ "description": "Step: 600",
"type": "color"
},
"focused": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181833",
+ "description": "Step: 600",
"type": "color"
}
},
"warning": {
"base": {
- "value": "#f7bb57",
- "description": "Step: 300",
+ "value": "#f6a72426",
+ "description": "Step: 400",
"type": "color"
},
"hovered": {
- "value": "#f7bb57",
- "description": "Step: 300",
+ "value": "#f6a72433",
+ "description": "Step: 400",
"type": "color"
},
"active": {
- "value": "#f7bb57",
- "description": "Step: 300",
+ "value": "#f6a72440",
+ "description": "Step: 400",
"type": "color"
},
"focused": {
- "value": "#f7bb57",
- "description": "Step: 300",
+ "value": "#f6a72433",
+ "description": "Step: 400",
"type": "color"
}
},
"info": {
"base": {
- "value": "#2472f2",
+ "value": "#2472f226",
"description": "Step: 500",
"type": "color"
},
"hovered": {
- "value": "#2472f2",
+ "value": "#2472f233",
"description": "Step: 500",
"type": "color"
},
"active": {
- "value": "#2472f2",
+ "value": "#2472f240",
"description": "Step: 500",
"type": "color"
},
"focused": {
- "value": "#2472f2",
+ "value": "#2472f233",
"description": "Step: 500",
"type": "color"
}
@@ -333,22 +333,22 @@
"type": "color"
},
"ok": {
- "value": "#20b456",
- "description": "Step: 500",
+ "value": "#1b944726",
+ "description": "Step: 600",
"type": "color"
},
"error": {
- "value": "#eb2d2d",
+ "value": "#eb2d2d26",
"description": "Step: 500",
"type": "color"
},
"warning": {
- "value": "#de900c",
- "description": "Step: 500",
+ "value": "#f6a72426",
+ "description": "Step: 400",
"type": "color"
},
"info": {
- "value": "#2472f2",
+ "value": "#2472f226",
"description": "Step: 500",
"type": "color"
}
@@ -381,17 +381,17 @@
"type": "color"
},
"inserted": {
- "value": "#1b9447",
+ "value": "#1b944740",
"description": "Step: 600",
"type": "color"
},
"deleted": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181840",
+ "description": "Step: 600",
"type": "color"
},
"modified": {
- "value": "#2472f2",
+ "value": "#2472f240",
"description": "Step: 500",
"type": "color"
}
styles/dist/light.json 🔗
@@ -219,89 +219,89 @@
},
"ok": {
"base": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944726",
+ "description": "Step: 600",
"type": "color"
},
"hovered": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944733",
+ "description": "Step: 600",
"type": "color"
},
"active": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944740",
+ "description": "Step: 600",
"type": "color"
},
"focused": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944733",
+ "description": "Step: 600",
"type": "color"
}
},
"error": {
"base": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181826",
+ "description": "Step: 600",
"type": "color"
},
"hovered": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181833",
+ "description": "Step: 600",
"type": "color"
},
"active": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181840",
+ "description": "Step: 600",
"type": "color"
},
"focused": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181833",
+ "description": "Step: 600",
"type": "color"
}
},
"warning": {
"base": {
- "value": "#fce9b7",
- "description": "Step: 100",
+ "value": "#f6a72426",
+ "description": "Step: 400",
"type": "color"
},
"hovered": {
- "value": "#fce9b7",
- "description": "Step: 100",
+ "value": "#f6a72433",
+ "description": "Step: 400",
"type": "color"
},
"active": {
- "value": "#fce9b7",
- "description": "Step: 100",
+ "value": "#f6a72440",
+ "description": "Step: 400",
"type": "color"
},
"focused": {
- "value": "#fce9b7",
- "description": "Step: 100",
+ "value": "#f6a72433",
+ "description": "Step: 400",
"type": "color"
}
},
"info": {
"base": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f226",
+ "description": "Step: 500",
"type": "color"
},
"hovered": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f233",
+ "description": "Step: 500",
"type": "color"
},
"active": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f240",
+ "description": "Step: 500",
"type": "color"
},
"focused": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f233",
+ "description": "Step: 500",
"type": "color"
}
}
@@ -333,23 +333,23 @@
"type": "color"
},
"ok": {
- "value": "#84f2ab",
- "description": "Step: 200",
+ "value": "#1b944726",
+ "description": "Step: 600",
"type": "color"
},
"error": {
- "value": "#f9a0a0",
- "description": "Step: 200",
+ "value": "#eb2d2d26",
+ "description": "Step: 500",
"type": "color"
},
"warning": {
- "value": "#f9da82",
- "description": "Step: 200",
+ "value": "#f6a72426",
+ "description": "Step: 400",
"type": "color"
},
"info": {
- "value": "#9ec1fa",
- "description": "Step: 200",
+ "value": "#2472f226",
+ "description": "Step: 500",
"type": "color"
}
},
@@ -381,18 +381,18 @@
"type": "color"
},
"inserted": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944740",
+ "description": "Step: 600",
"type": "color"
},
"deleted": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181840",
+ "description": "Step: 600",
"type": "color"
},
"modified": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f240",
+ "description": "Step: 500",
"type": "color"
}
},
styles/dist/solarized-dark.json 🔗
@@ -93,15 +93,15 @@
"type": "color"
},
"hovered": {
- "value": "#586e7552",
+ "value": "#586e753d",
"type": "color"
},
"active": {
- "value": "#586e757a",
+ "value": "#586e755c",
"type": "color"
},
"focused": {
- "value": "#586e75",
+ "value": "#586e753d",
"type": "color"
}
},
@@ -111,15 +111,15 @@
"type": "color"
},
"hovered": {
- "value": "#586e7552",
+ "value": "#586e753d",
"type": "color"
},
"active": {
- "value": "#586e757a",
+ "value": "#586e755c",
"type": "color"
},
"focused": {
- "value": "#586e75",
+ "value": "#586e753d",
"type": "color"
}
},
@@ -129,15 +129,15 @@
"type": "color"
},
"hovered": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
},
"active": {
- "value": "#073642",
+ "value": "#0736425c",
"type": "color"
},
"focused": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
}
},
@@ -147,15 +147,15 @@
"type": "color"
},
"hovered": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
},
"active": {
- "value": "#073642",
+ "value": "#0736427a",
"type": "color"
},
"focused": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
}
},
@@ -165,87 +165,87 @@
"type": "color"
},
"hovered": {
- "value": "#657b83",
+ "value": "#586e753d",
"type": "color"
},
"active": {
- "value": "#657b83",
+ "value": "#586e757a",
"type": "color"
},
"focused": {
- "value": "#657b83",
+ "value": "#586e753d",
"type": "color"
}
},
"ok": {
"base": {
- "value": "#859900",
+ "value": "#85990026",
"type": "color"
},
"hovered": {
- "value": "#859900",
+ "value": "#85990033",
"type": "color"
},
"active": {
- "value": "#859900",
+ "value": "#85990040",
"type": "color"
},
"focused": {
- "value": "#859900",
+ "value": "#85990033",
"type": "color"
}
},
"error": {
"base": {
- "value": "#dc322f",
+ "value": "#dc322f26",
"type": "color"
},
"hovered": {
- "value": "#dc322f",
+ "value": "#dc322f33",
"type": "color"
},
"active": {
- "value": "#dc322f",
+ "value": "#dc322f40",
"type": "color"
},
"focused": {
- "value": "#dc322f",
+ "value": "#dc322f33",
"type": "color"
}
},
"warning": {
"base": {
- "value": "#b58900",
+ "value": "#b5890026",
"type": "color"
},
"hovered": {
- "value": "#b58900",
+ "value": "#b5890033",
"type": "color"
},
"active": {
- "value": "#b58900",
+ "value": "#b5890040",
"type": "color"
},
"focused": {
- "value": "#b58900",
+ "value": "#b5890033",
"type": "color"
}
},
"info": {
"base": {
- "value": "#268bd2",
+ "value": "#268bd226",
"type": "color"
},
"hovered": {
- "value": "#268bd2",
+ "value": "#268bd233",
"type": "color"
},
"active": {
- "value": "#268bd2",
+ "value": "#268bd240",
"type": "color"
},
"focused": {
- "value": "#268bd2",
+ "value": "#268bd233",
"type": "color"
}
}
@@ -272,19 +272,19 @@
"type": "color"
},
"ok": {
- "value": "#859900",
+ "value": "#85990026",
"type": "color"
},
"error": {
- "value": "#dc322f",
+ "value": "#dc322f26",
"type": "color"
},
"warning": {
- "value": "#b58900",
+ "value": "#b5890026",
"type": "color"
},
"info": {
- "value": "#268bd2",
+ "value": "#268bd226",
"type": "color"
}
},
@@ -311,15 +311,15 @@
"type": "color"
},
"inserted": {
- "value": "#859900",
+ "value": "#85990040",
"type": "color"
},
"deleted": {
- "value": "#dc322f",
+ "value": "#dc322f40",
"type": "color"
},
"modified": {
- "value": "#268bd2",
+ "value": "#268bd240",
"type": "color"
}
},
@@ -329,27 +329,27 @@
"type": "color"
},
"occurrence": {
- "value": "#002b361f",
+ "value": "#fdf6e31f",
"type": "color"
},
"activeOccurrence": {
- "value": "#002b3629",
+ "value": "#fdf6e33d",
"type": "color"
},
"matchingBracket": {
- "value": "#073642",
+ "value": "#0736425c",
"type": "color"
},
"match": {
- "value": "#6c71c480",
+ "value": "#6c71c47a",
"type": "color"
},
"activeMatch": {
- "value": "#6c71c4b3",
+ "value": "#6c71c4b8",
"type": "color"
},
"related": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
}
},
@@ -561,7 +561,7 @@
}
},
"shadowAlpha": {
- "value": 0.32,
+ "value": 0.24,
"type": "number"
}
}
styles/dist/solarized-light.json 🔗
@@ -101,7 +101,7 @@
"type": "color"
},
"focused": {
- "value": "#93a1a1",
+ "value": "#93a1a11f",
"type": "color"
}
},
@@ -119,7 +119,7 @@
"type": "color"
},
"focused": {
- "value": "#93a1a1",
+ "value": "#93a1a11f",
"type": "color"
}
},
@@ -129,15 +129,15 @@
"type": "color"
},
"hovered": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
},
"active": {
- "value": "#eee8d5",
+ "value": "#eee8d52e",
"type": "color"
},
"focused": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
}
},
@@ -147,15 +147,15 @@
"type": "color"
},
"hovered": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
},
"active": {
- "value": "#eee8d5",
+ "value": "#eee8d53d",
"type": "color"
},
"focused": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
}
},
@@ -165,87 +165,87 @@
"type": "color"
},
"hovered": {
- "value": "#839496",
+ "value": "#93a1a11f",
"type": "color"
},
"active": {
- "value": "#839496",
+ "value": "#93a1a13d",
"type": "color"
},
"focused": {
- "value": "#839496",
+ "value": "#93a1a11f",
"type": "color"
}
},
"ok": {
"base": {
- "value": "#859900",
+ "value": "#85990026",
"type": "color"
},
"hovered": {
- "value": "#859900",
+ "value": "#85990033",
"type": "color"
},
"active": {
- "value": "#859900",
+ "value": "#85990040",
"type": "color"
},
"focused": {
- "value": "#859900",
+ "value": "#85990033",
"type": "color"
}
},
"error": {
"base": {
- "value": "#dc322f",
+ "value": "#dc322f26",
"type": "color"
},
"hovered": {
- "value": "#dc322f",
+ "value": "#dc322f33",
"type": "color"
},
"active": {
- "value": "#dc322f",
+ "value": "#dc322f40",
"type": "color"
},
"focused": {
- "value": "#dc322f",
+ "value": "#dc322f33",
"type": "color"
}
},
"warning": {
"base": {
- "value": "#b58900",
+ "value": "#b5890026",
"type": "color"
},
"hovered": {
- "value": "#b58900",
+ "value": "#b5890033",
"type": "color"
},
"active": {
- "value": "#b58900",
+ "value": "#b5890040",
"type": "color"
},
"focused": {
- "value": "#b58900",
+ "value": "#b5890033",
"type": "color"
}
},
"info": {
"base": {
- "value": "#268bd2",
+ "value": "#268bd226",
"type": "color"
},
"hovered": {
- "value": "#268bd2",
+ "value": "#268bd233",
"type": "color"
},
"active": {
- "value": "#268bd2",
+ "value": "#268bd240",
"type": "color"
},
"focused": {
- "value": "#268bd2",
+ "value": "#268bd233",
"type": "color"
}
}
@@ -272,19 +272,19 @@
"type": "color"
},
"ok": {
- "value": "#859900",
+ "value": "#85990026",
"type": "color"
},
"error": {
- "value": "#dc322f",
+ "value": "#dc322f26",
"type": "color"
},
"warning": {
- "value": "#b58900",
+ "value": "#b5890026",
"type": "color"
},
"info": {
- "value": "#268bd2",
+ "value": "#268bd226",
"type": "color"
}
},
@@ -311,15 +311,15 @@
"type": "color"
},
"inserted": {
- "value": "#859900",
+ "value": "#85990040",
"type": "color"
},
"deleted": {
- "value": "#dc322f",
+ "value": "#dc322f40",
"type": "color"
},
"modified": {
- "value": "#268bd2",
+ "value": "#268bd240",
"type": "color"
}
},
@@ -329,27 +329,27 @@
"type": "color"
},
"occurrence": {
- "value": "#fdf6e31f",
+ "value": "#002b360f",
"type": "color"
},
"activeOccurrence": {
- "value": "#fdf6e329",
+ "value": "#002b361f",
"type": "color"
},
"matchingBracket": {
- "value": "#eee8d5",
+ "value": "#eee8d52e",
"type": "color"
},
"match": {
- "value": "#6c71c480",
+ "value": "#6c71c43d",
"type": "color"
},
"activeMatch": {
- "value": "#6c71c4b3",
+ "value": "#6c71c45c",
"type": "color"
},
"related": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
}
},
styles/dist/tokens.json 🔗
@@ -1401,88 +1401,88 @@
},
"ok": {
"base": {
- "value": "#1b9447",
+ "value": "#1b944726",
"description": "Step: 600",
"type": "color"
},
"hovered": {
- "value": "#1b9447",
+ "value": "#1b944733",
"description": "Step: 600",
"type": "color"
},
"active": {
- "value": "#1b9447",
+ "value": "#1b944740",
"description": "Step: 600",
"type": "color"
},
"focused": {
- "value": "#1b9447",
+ "value": "#1b944733",
"description": "Step: 600",
"type": "color"
}
},
"error": {
"base": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181826",
+ "description": "Step: 600",
"type": "color"
},
"hovered": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181833",
+ "description": "Step: 600",
"type": "color"
},
"active": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181840",
+ "description": "Step: 600",
"type": "color"
},
"focused": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181833",
+ "description": "Step: 600",
"type": "color"
}
},
"warning": {
"base": {
- "value": "#f7bb57",
- "description": "Step: 300",
+ "value": "#f6a72426",
+ "description": "Step: 400",
"type": "color"
},
"hovered": {
- "value": "#f7bb57",
- "description": "Step: 300",
+ "value": "#f6a72433",
+ "description": "Step: 400",
"type": "color"
},
"active": {
- "value": "#f7bb57",
- "description": "Step: 300",
+ "value": "#f6a72440",
+ "description": "Step: 400",
"type": "color"
},
"focused": {
- "value": "#f7bb57",
- "description": "Step: 300",
+ "value": "#f6a72433",
+ "description": "Step: 400",
"type": "color"
}
},
"info": {
"base": {
- "value": "#2472f2",
+ "value": "#2472f226",
"description": "Step: 500",
"type": "color"
},
"hovered": {
- "value": "#2472f2",
+ "value": "#2472f233",
"description": "Step: 500",
"type": "color"
},
"active": {
- "value": "#2472f2",
+ "value": "#2472f240",
"description": "Step: 500",
"type": "color"
},
"focused": {
- "value": "#2472f2",
+ "value": "#2472f233",
"description": "Step: 500",
"type": "color"
}
@@ -1515,22 +1515,22 @@
"type": "color"
},
"ok": {
- "value": "#20b456",
- "description": "Step: 500",
+ "value": "#1b944726",
+ "description": "Step: 600",
"type": "color"
},
"error": {
- "value": "#eb2d2d",
+ "value": "#eb2d2d26",
"description": "Step: 500",
"type": "color"
},
"warning": {
- "value": "#de900c",
- "description": "Step: 500",
+ "value": "#f6a72426",
+ "description": "Step: 400",
"type": "color"
},
"info": {
- "value": "#2472f2",
+ "value": "#2472f226",
"description": "Step: 500",
"type": "color"
}
@@ -1563,17 +1563,17 @@
"type": "color"
},
"inserted": {
- "value": "#1b9447",
+ "value": "#1b944740",
"description": "Step: 600",
"type": "color"
},
"deleted": {
- "value": "#f15656",
- "description": "Step: 400",
+ "value": "#c9181840",
+ "description": "Step: 600",
"type": "color"
},
"modified": {
- "value": "#2472f2",
+ "value": "#2472f240",
"description": "Step: 500",
"type": "color"
}
@@ -2094,89 +2094,89 @@
},
"ok": {
"base": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944726",
+ "description": "Step: 600",
"type": "color"
},
"hovered": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944733",
+ "description": "Step: 600",
"type": "color"
},
"active": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944740",
+ "description": "Step: 600",
"type": "color"
},
"focused": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944733",
+ "description": "Step: 600",
"type": "color"
}
},
"error": {
"base": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181826",
+ "description": "Step: 600",
"type": "color"
},
"hovered": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181833",
+ "description": "Step: 600",
"type": "color"
},
"active": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181840",
+ "description": "Step: 600",
"type": "color"
},
"focused": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181833",
+ "description": "Step: 600",
"type": "color"
}
},
"warning": {
"base": {
- "value": "#fce9b7",
- "description": "Step: 100",
+ "value": "#f6a72426",
+ "description": "Step: 400",
"type": "color"
},
"hovered": {
- "value": "#fce9b7",
- "description": "Step: 100",
+ "value": "#f6a72433",
+ "description": "Step: 400",
"type": "color"
},
"active": {
- "value": "#fce9b7",
- "description": "Step: 100",
+ "value": "#f6a72440",
+ "description": "Step: 400",
"type": "color"
},
"focused": {
- "value": "#fce9b7",
- "description": "Step: 100",
+ "value": "#f6a72433",
+ "description": "Step: 400",
"type": "color"
}
},
"info": {
"base": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f226",
+ "description": "Step: 500",
"type": "color"
},
"hovered": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f233",
+ "description": "Step: 500",
"type": "color"
},
"active": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f240",
+ "description": "Step: 500",
"type": "color"
},
"focused": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f233",
+ "description": "Step: 500",
"type": "color"
}
}
@@ -2208,23 +2208,23 @@
"type": "color"
},
"ok": {
- "value": "#84f2ab",
- "description": "Step: 200",
+ "value": "#1b944726",
+ "description": "Step: 600",
"type": "color"
},
"error": {
- "value": "#f9a0a0",
- "description": "Step: 200",
+ "value": "#eb2d2d26",
+ "description": "Step: 500",
"type": "color"
},
"warning": {
- "value": "#f9da82",
- "description": "Step: 200",
+ "value": "#f6a72426",
+ "description": "Step: 400",
"type": "color"
},
"info": {
- "value": "#9ec1fa",
- "description": "Step: 200",
+ "value": "#2472f226",
+ "description": "Step: 500",
"type": "color"
}
},
@@ -2256,18 +2256,18 @@
"type": "color"
},
"inserted": {
- "value": "#b7f9ce",
- "description": "Step: 100",
+ "value": "#1b944740",
+ "description": "Step: 600",
"type": "color"
},
"deleted": {
- "value": "#fcc6c6",
- "description": "Step: 100",
+ "value": "#c9181840",
+ "description": "Step: 600",
"type": "color"
},
"modified": {
- "value": "#c5dafc",
- "description": "Step: 100",
+ "value": "#2472f240",
+ "description": "Step: 500",
"type": "color"
}
},
@@ -2661,15 +2661,15 @@
"type": "color"
},
"hovered": {
- "value": "#586e7552",
+ "value": "#586e753d",
"type": "color"
},
"active": {
- "value": "#586e757a",
+ "value": "#586e755c",
"type": "color"
},
"focused": {
- "value": "#586e75",
+ "value": "#586e753d",
"type": "color"
}
},
@@ -2679,15 +2679,15 @@
"type": "color"
},
"hovered": {
- "value": "#586e7552",
+ "value": "#586e753d",
"type": "color"
},
"active": {
- "value": "#586e757a",
+ "value": "#586e755c",
"type": "color"
},
"focused": {
- "value": "#586e75",
+ "value": "#586e753d",
"type": "color"
}
},
@@ -2697,15 +2697,15 @@
"type": "color"
},
"hovered": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
},
"active": {
- "value": "#073642",
+ "value": "#0736425c",
"type": "color"
},
"focused": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
}
},
@@ -2715,15 +2715,15 @@
"type": "color"
},
"hovered": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
},
"active": {
- "value": "#073642",
+ "value": "#0736427a",
"type": "color"
},
"focused": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
}
},
@@ -2733,87 +2733,87 @@
"type": "color"
},
"hovered": {
- "value": "#657b83",
+ "value": "#586e753d",
"type": "color"
},
"active": {
- "value": "#657b83",
+ "value": "#586e757a",
"type": "color"
},
"focused": {
- "value": "#657b83",
+ "value": "#586e753d",
"type": "color"
}
},
"ok": {
"base": {
- "value": "#859900",
+ "value": "#85990026",
"type": "color"
},
"hovered": {
- "value": "#859900",
+ "value": "#85990033",
"type": "color"
},
"active": {
- "value": "#859900",
+ "value": "#85990040",
"type": "color"
},
"focused": {
- "value": "#859900",
+ "value": "#85990033",
"type": "color"
}
},
"error": {
"base": {
- "value": "#dc322f",
+ "value": "#dc322f26",
"type": "color"
},
"hovered": {
- "value": "#dc322f",
+ "value": "#dc322f33",
"type": "color"
},
"active": {
- "value": "#dc322f",
+ "value": "#dc322f40",
"type": "color"
},
"focused": {
- "value": "#dc322f",
+ "value": "#dc322f33",
"type": "color"
}
},
"warning": {
"base": {
- "value": "#b58900",
+ "value": "#b5890026",
"type": "color"
},
"hovered": {
- "value": "#b58900",
+ "value": "#b5890033",
"type": "color"
},
"active": {
- "value": "#b58900",
+ "value": "#b5890040",
"type": "color"
},
"focused": {
- "value": "#b58900",
+ "value": "#b5890033",
"type": "color"
}
},
"info": {
"base": {
- "value": "#268bd2",
+ "value": "#268bd226",
"type": "color"
},
"hovered": {
- "value": "#268bd2",
+ "value": "#268bd233",
"type": "color"
},
"active": {
- "value": "#268bd2",
+ "value": "#268bd240",
"type": "color"
},
"focused": {
- "value": "#268bd2",
+ "value": "#268bd233",
"type": "color"
}
}
@@ -2840,19 +2840,19 @@
"type": "color"
},
"ok": {
- "value": "#859900",
+ "value": "#85990026",
"type": "color"
},
"error": {
- "value": "#dc322f",
+ "value": "#dc322f26",
"type": "color"
},
"warning": {
- "value": "#b58900",
+ "value": "#b5890026",
"type": "color"
},
"info": {
- "value": "#268bd2",
+ "value": "#268bd226",
"type": "color"
}
},
@@ -2879,15 +2879,15 @@
"type": "color"
},
"inserted": {
- "value": "#859900",
+ "value": "#85990040",
"type": "color"
},
"deleted": {
- "value": "#dc322f",
+ "value": "#dc322f40",
"type": "color"
},
"modified": {
- "value": "#268bd2",
+ "value": "#268bd240",
"type": "color"
}
},
@@ -2897,27 +2897,27 @@
"type": "color"
},
"occurrence": {
- "value": "#002b361f",
+ "value": "#fdf6e31f",
"type": "color"
},
"activeOccurrence": {
- "value": "#002b3629",
+ "value": "#fdf6e33d",
"type": "color"
},
"matchingBracket": {
- "value": "#073642",
+ "value": "#0736425c",
"type": "color"
},
"match": {
- "value": "#6c71c480",
+ "value": "#6c71c47a",
"type": "color"
},
"activeMatch": {
- "value": "#6c71c4b3",
+ "value": "#6c71c4b8",
"type": "color"
},
"related": {
- "value": "#073642",
+ "value": "#0736423d",
"type": "color"
}
},
@@ -3129,7 +3129,7 @@
}
},
"shadowAlpha": {
- "value": 0.32,
+ "value": 0.24,
"type": "number"
}
},
@@ -3236,7 +3236,7 @@
"type": "color"
},
"focused": {
- "value": "#93a1a1",
+ "value": "#93a1a11f",
"type": "color"
}
},
@@ -3254,7 +3254,7 @@
"type": "color"
},
"focused": {
- "value": "#93a1a1",
+ "value": "#93a1a11f",
"type": "color"
}
},
@@ -3264,15 +3264,15 @@
"type": "color"
},
"hovered": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
},
"active": {
- "value": "#eee8d5",
+ "value": "#eee8d52e",
"type": "color"
},
"focused": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
}
},
@@ -3282,15 +3282,15 @@
"type": "color"
},
"hovered": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
},
"active": {
- "value": "#eee8d5",
+ "value": "#eee8d53d",
"type": "color"
},
"focused": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
}
},
@@ -3300,87 +3300,87 @@
"type": "color"
},
"hovered": {
- "value": "#839496",
+ "value": "#93a1a11f",
"type": "color"
},
"active": {
- "value": "#839496",
+ "value": "#93a1a13d",
"type": "color"
},
"focused": {
- "value": "#839496",
+ "value": "#93a1a11f",
"type": "color"
}
},
"ok": {
"base": {
- "value": "#859900",
+ "value": "#85990026",
"type": "color"
},
"hovered": {
- "value": "#859900",
+ "value": "#85990033",
"type": "color"
},
"active": {
- "value": "#859900",
+ "value": "#85990040",
"type": "color"
},
"focused": {
- "value": "#859900",
+ "value": "#85990033",
"type": "color"
}
},
"error": {
"base": {
- "value": "#dc322f",
+ "value": "#dc322f26",
"type": "color"
},
"hovered": {
- "value": "#dc322f",
+ "value": "#dc322f33",
"type": "color"
},
"active": {
- "value": "#dc322f",
+ "value": "#dc322f40",
"type": "color"
},
"focused": {
- "value": "#dc322f",
+ "value": "#dc322f33",
"type": "color"
}
},
"warning": {
"base": {
- "value": "#b58900",
+ "value": "#b5890026",
"type": "color"
},
"hovered": {
- "value": "#b58900",
+ "value": "#b5890033",
"type": "color"
},
"active": {
- "value": "#b58900",
+ "value": "#b5890040",
"type": "color"
},
"focused": {
- "value": "#b58900",
+ "value": "#b5890033",
"type": "color"
}
},
"info": {
"base": {
- "value": "#268bd2",
+ "value": "#268bd226",
"type": "color"
},
"hovered": {
- "value": "#268bd2",
+ "value": "#268bd233",
"type": "color"
},
"active": {
- "value": "#268bd2",
+ "value": "#268bd240",
"type": "color"
},
"focused": {
- "value": "#268bd2",
+ "value": "#268bd233",
"type": "color"
}
}
@@ -3407,19 +3407,19 @@
"type": "color"
},
"ok": {
- "value": "#859900",
+ "value": "#85990026",
"type": "color"
},
"error": {
- "value": "#dc322f",
+ "value": "#dc322f26",
"type": "color"
},
"warning": {
- "value": "#b58900",
+ "value": "#b5890026",
"type": "color"
},
"info": {
- "value": "#268bd2",
+ "value": "#268bd226",
"type": "color"
}
},
@@ -3446,15 +3446,15 @@
"type": "color"
},
"inserted": {
- "value": "#859900",
+ "value": "#85990040",
"type": "color"
},
"deleted": {
- "value": "#dc322f",
+ "value": "#dc322f40",
"type": "color"
},
"modified": {
- "value": "#268bd2",
+ "value": "#268bd240",
"type": "color"
}
},
@@ -3464,27 +3464,27 @@
"type": "color"
},
"occurrence": {
- "value": "#fdf6e31f",
+ "value": "#002b360f",
"type": "color"
},
"activeOccurrence": {
- "value": "#fdf6e329",
+ "value": "#002b361f",
"type": "color"
},
"matchingBracket": {
- "value": "#eee8d5",
+ "value": "#eee8d52e",
"type": "color"
},
"match": {
- "value": "#6c71c480",
+ "value": "#6c71c43d",
"type": "color"
},
"activeMatch": {
- "value": "#6c71c4b3",
+ "value": "#6c71c45c",
"type": "color"
},
"related": {
- "value": "#eee8d5",
+ "value": "#eee8d51f",
"type": "color"
}
},
styles/src/styleTree/workspace.ts 🔗
@@ -65,6 +65,7 @@ export default function workspace(theme: Theme) {
background: backgroundColor(theme, 100),
padding: {
left: 80,
+ right: 6,
},
title: text(theme, "sans", "primary"),
avatar: {
@@ -86,7 +87,6 @@ export default function workspace(theme: Theme) {
cornerRadius: 6,
margin: {
top: 1,
- right: 6,
},
padding: {
left: 6,
@@ -104,7 +104,7 @@ export default function workspace(theme: Theme) {
},
shareIcon: {
cornerRadius: 6,
- margin: { top: 3, bottom: 2 },
+ margin: { top: 3, bottom: 2, left: 6 },
color: iconColor(theme, "secondary"),
hover: {
background: backgroundColor(theme, 100, "hovered"),
@@ -128,7 +128,6 @@ export default function workspace(theme: Theme) {
right: 6,
},
cornerRadius: 6,
- margin: { right: 6 }
},
},
toolbar: {