Skip to content

Commit

Permalink
fix: color of label in dialog window
Browse files Browse the repository at this point in the history
  • Loading branch information
mauroreisvieira committed May 26, 2021
1 parent 98471b2 commit 9865c28
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 112 deletions.
48 changes: 19 additions & 29 deletions Meetio Theme Hight Contrast.sublime-theme
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"fontFace": "system",
"kindFontFace": "system",
"kindFontSize": "var(fontSizeLg)",
"dialogLabelColor": "color(var(background) blend(var(foreground) 30%))",
"buttonBackground": [
"background",
0.5
Expand Down Expand Up @@ -254,6 +255,17 @@
],
"layer0.opacity": 1
},
{
"class": "label_control",
"parents": [
{
"class": "dialog"
}
],
"fg": "var(dialogLabelColor)",
"font.face": "var(fontFace)",
"font.size": "var(fontSizeMd)"
},
{
"class": "popup_control",
"layer0.tint": [
Expand Down Expand Up @@ -1334,17 +1346,12 @@
"attributes": [
"dirty"
],
"layer0.texture": "Meetio Theme/textures/dirty_icon.png",
"layer0.tint": "var(accent)"
},
{
"class": "close_button",
"attributes": [
"hover",
"dirty"
],
"layer0.texture": "Meetio Theme/textures/dirty_icon.png",
"layer0.tint": "var(accent)"
"layer0.texture": "Meetio Theme/textures/tab/dirty_pencil.png",
"layer0.tint": "var(tabDiffIconColor)",
"layer0.inner_margin": [
4,
4
]
},
{
"class": "panel_control",
Expand Down Expand Up @@ -1579,9 +1586,7 @@
]
}
],
"layer0.opacity": 0.4,
"layer1.tint": "var(overlay_bg-light)",
"layer2.tint": "var(overlay_bc-light)"
"layer0.opacity": 0.4
},
{
"class": "progress_bar_control",
Expand Down Expand Up @@ -1629,21 +1634,6 @@
],
"layer1.opacity": 1
},
{
"class": "panel_button_control",
"layer0.texture": "Meetio Theme/textures/actions/menu.png",
"layer0.tint": "var(statusbarIconColor)",
"layer0.opacity": 1,
"layer0.inner_margin": 4,
"content_margin": 9
},
{
"class": "panel_button_control",
"attributes": [
"hover"
],
"layer0.tint": "var(statusbarIconColorHover)"
},
{
"class": "vcs_branch_icon",
"settings": [
Expand Down
48 changes: 19 additions & 29 deletions Meetio Theme.sublime-theme
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"fontFace": "system",
"kindFontFace": "system",
"kindFontSize": "var(fontSizeLg)",
"dialogLabelColor": "color(var(background) blend(var(foreground) 30%))",
"buttonBackground": [
"background",
0.5
Expand Down Expand Up @@ -252,6 +253,17 @@
],
"layer0.opacity": 1
},
{
"class": "label_control",
"parents": [
{
"class": "dialog"
}
],
"fg": "var(dialogLabelColor)",
"font.face": "var(fontFace)",
"font.size": "var(fontSizeMd)"
},
{
"class": "popup_control",
"layer0.tint": [
Expand Down Expand Up @@ -1332,17 +1344,12 @@
"attributes": [
"dirty"
],
"layer0.texture": "Meetio Theme/textures/dirty_icon.png",
"layer0.tint": "var(accent)"
},
{
"class": "close_button",
"attributes": [
"hover",
"dirty"
],
"layer0.texture": "Meetio Theme/textures/dirty_icon.png",
"layer0.tint": "var(accent)"
"layer0.texture": "Meetio Theme/textures/tab/dirty_pencil.png",
"layer0.tint": "var(tabDiffIconColor)",
"layer0.inner_margin": [
4,
4
]
},
{
"class": "panel_control",
Expand Down Expand Up @@ -1577,9 +1584,7 @@
]
}
],
"layer0.opacity": 0.4,
"layer1.tint": "var(overlay_bg-light)",
"layer2.tint": "var(overlay_bc-light)"
"layer0.opacity": 0.4
},
{
"class": "progress_bar_control",
Expand Down Expand Up @@ -1627,21 +1632,6 @@
],
"layer1.opacity": 1
},
{
"class": "panel_button_control",
"layer0.texture": "Meetio Theme/textures/actions/menu.png",
"layer0.tint": "var(statusbarIconColor)",
"layer0.opacity": 1,
"layer0.inner_margin": 4,
"content_margin": 9
},
{
"class": "panel_button_control",
"attributes": [
"hover"
],
"layer0.tint": "var(statusbarIconColorHover)"
},
{
"class": "vcs_branch_icon",
"settings": [
Expand Down
37 changes: 12 additions & 25 deletions src/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const variables: ThemeVariables = {
fontFace: 'system',
kindFontFace: 'system',
kindFontSize: 'var(fontSizeLg)',
dialogLabelColor: 'color(var(background) blend(var(foreground) 30%))',
buttonBackground: ['background', 0.5],
buttonBackgroundHover: 'color(var(accent) a(0.2))',
buttonMinSize: [80, 28],
Expand Down Expand Up @@ -176,6 +177,13 @@ export const rules = [
'layer0.tint': ['background', 0.94],
'layer0.opacity': 1,
},
{
class: "label_control",
parents: [{ "class": "dialog" }],
"fg": "var(dialogLabelColor)",
"font.face": "var(fontFace)",
"font.size": "var(fontSizeMd)"
},
{
class: 'popup_control',
'layer0.tint': ['background', 1],
Expand Down Expand Up @@ -1062,14 +1070,9 @@ export const rules = [
{
class: 'close_button',
attributes: ['dirty'],
'layer0.texture': 'Meetio Theme/textures/dirty_icon.png',
'layer0.tint': 'var(accent)',
},
{
class: 'close_button',
attributes: ['hover', 'dirty'],
'layer0.texture': 'Meetio Theme/textures/dirty_icon.png',
'layer0.tint': 'var(accent)',
'layer0.texture': 'Meetio Theme/textures/tab/dirty_pencil.png',
'layer0.tint': 'var(tabDiffIconColor)',
'layer0.inner_margin': [4, 4],
},
{
class: 'panel_control',
Expand Down Expand Up @@ -1231,8 +1234,6 @@ export const rules = [
class: 'overlay_control',
parents: [{ class: 'window', attributes: ['file_light'] }],
'layer0.opacity': 0.4,
'layer1.tint': 'var(overlay_bg-light)',
'layer2.tint': 'var(overlay_bc-light)',
},
{
class: 'progress_bar_control',
Expand Down Expand Up @@ -1265,19 +1266,6 @@ export const rules = [
attributes: ['!panel_visible'],
'layer1.opacity': 1,
},
{
class: 'panel_button_control',
'layer0.texture': 'Meetio Theme/textures/actions/menu.png',
'layer0.tint': 'var(statusbarIconColor)',
'layer0.opacity': 1,
'layer0.inner_margin': 4,
content_margin: 9,
},
{
class: 'panel_button_control',
attributes: ['hover'],
'layer0.tint': 'var(statusbarIconColorHover)',
},
{
class: 'vcs_branch_icon',
settings: ['!show_git_status_in_status_bar'],
Expand Down Expand Up @@ -2323,8 +2311,7 @@ export function generateTheme(options: GenerateTheme) {
fs.mkdir(dist, () => {
try {
fs.writeFileSync(
`${dist}/${output.filename}${
output.extension || '.sublime-theme'
`${dist}/${output.filename}${output.extension || '.sublime-theme'
}`,
JSON.stringify(
{
Expand Down
48 changes: 19 additions & 29 deletions themes/Meetio Theme.hidden-theme
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"fontFace": "system",
"kindFontFace": "system",
"kindFontSize": "var(fontSizeLg)",
"dialogLabelColor": "color(var(background) blend(var(foreground) 30%))",
"buttonBackground": [
"background",
0.5
Expand Down Expand Up @@ -251,6 +252,17 @@
],
"layer0.opacity": 1
},
{
"class": "label_control",
"parents": [
{
"class": "dialog"
}
],
"fg": "var(dialogLabelColor)",
"font.face": "var(fontFace)",
"font.size": "var(fontSizeMd)"
},
{
"class": "popup_control",
"layer0.tint": [
Expand Down Expand Up @@ -1331,17 +1343,12 @@
"attributes": [
"dirty"
],
"layer0.texture": "Meetio Theme/textures/dirty_icon.png",
"layer0.tint": "var(accent)"
},
{
"class": "close_button",
"attributes": [
"hover",
"dirty"
],
"layer0.texture": "Meetio Theme/textures/dirty_icon.png",
"layer0.tint": "var(accent)"
"layer0.texture": "Meetio Theme/textures/tab/dirty_pencil.png",
"layer0.tint": "var(tabDiffIconColor)",
"layer0.inner_margin": [
4,
4
]
},
{
"class": "panel_control",
Expand Down Expand Up @@ -1576,9 +1583,7 @@
]
}
],
"layer0.opacity": 0.4,
"layer1.tint": "var(overlay_bg-light)",
"layer2.tint": "var(overlay_bc-light)"
"layer0.opacity": 0.4
},
{
"class": "progress_bar_control",
Expand Down Expand Up @@ -1626,21 +1631,6 @@
],
"layer1.opacity": 1
},
{
"class": "panel_button_control",
"layer0.texture": "Meetio Theme/textures/actions/menu.png",
"layer0.tint": "var(statusbarIconColor)",
"layer0.opacity": 1,
"layer0.inner_margin": 4,
"content_margin": 9
},
{
"class": "panel_button_control",
"attributes": [
"hover"
],
"layer0.tint": "var(statusbarIconColorHover)"
},
{
"class": "vcs_branch_icon",
"settings": [
Expand Down

0 comments on commit 9865c28

Please sign in to comment.