Skip to content

Commit

Permalink
fix: change size of button inside Panel Control
Browse files Browse the repository at this point in the history
  • Loading branch information
@mauroreisvieira
mauroreisvieira committed Mar 24, 2022
1 parent e0e40e0 commit 7a8766a
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 28 deletions.
51 changes: 46 additions & 5 deletions Meetio Theme High Contrast.sublime-theme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@
0.5
],
"buttonBackgroundHover": "color(var(accent) a(0.2))",
"buttonMinSize": [
"buttonSmall": [
80,
16
],
"buttonMedium": [
80,
22
],
"buttonLarge": [
80,
28
],
Expand Down Expand Up @@ -215,11 +223,9 @@
"class": "button_control",
"content_margin": [
6,
10,
6,
10
6
],
"min_size": "var(buttonMinSize)",
"min_size": "var(buttonSmall)",
"layer0.tint": "var(buttonBackground)",
"layer0.opacity": {
"target": 0.6,
Expand Down Expand Up @@ -250,6 +256,32 @@
"interpolation": "smoothstep"
}
},
{
"class": "button_control",
"min_size": "var(buttonMedium)",
"content_margin": [
6,
8
],
"parents": [
{
"class": "dialog"
}
]
},
{
"class": "button_control",
"min_size": "var(buttonLarge)",
"content_margin": [
8,
10
],
"parents": [
{
"class": "panel_grid_control"
}
]
},
{
"class": "dialog",
"layer0.tint": [
Expand Down Expand Up @@ -1401,6 +1433,15 @@
}
]
},
{
"class": "switch_project_panel_cancel_container",
"layer0.tint": "var(panelControlBackground)",
"layer0.opacity": 1,
"content_margin": [
10,
4
]
},
{
"class": "panel_grid_control",
"inside_spacing": 4,
Expand Down
51 changes: 46 additions & 5 deletions Meetio Theme.sublime-theme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@
0.5
],
"buttonBackgroundHover": "color(var(accent) a(0.2))",
"buttonMinSize": [
"buttonSmall": [
80,
16
],
"buttonMedium": [
80,
22
],
"buttonLarge": [
80,
28
],
Expand Down Expand Up @@ -213,11 +221,9 @@
"class": "button_control",
"content_margin": [
6,
10,
6,
10
6
],
"min_size": "var(buttonMinSize)",
"min_size": "var(buttonSmall)",
"layer0.tint": "var(buttonBackground)",
"layer0.opacity": {
"target": 0.6,
Expand Down Expand Up @@ -248,6 +254,32 @@
"interpolation": "smoothstep"
}
},
{
"class": "button_control",
"min_size": "var(buttonMedium)",
"content_margin": [
6,
8
],
"parents": [
{
"class": "dialog"
}
]
},
{
"class": "button_control",
"min_size": "var(buttonLarge)",
"content_margin": [
8,
10
],
"parents": [
{
"class": "panel_grid_control"
}
]
},
{
"class": "dialog",
"layer0.tint": [
Expand Down Expand Up @@ -1399,6 +1431,15 @@
}
]
},
{
"class": "switch_project_panel_cancel_container",
"layer0.tint": "var(panelControlBackground)",
"layer0.opacity": 1,
"content_margin": [
10,
4
]
},
{
"class": "panel_grid_control",
"inside_spacing": 4,
Expand Down
20 changes: 10 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@
}
},
"dependencies": {
"@types/node": "^17.0.10"
"@types/node": "^17.0.23"
},
"devDependencies": {
"@babel/core": "7.16.10",
"@babel/core": "7.17.8",
"@babel/preset-env": "7.16.11",
"@commitlint/cli": "^16.1.0",
"@commitlint/config-conventional": "^16.0.0",
"@commitlint/cli": "^16.2.3",
"@commitlint/config-conventional": "^16.2.1",
"conventional-changelog-cli": "^2.2.2",
"@meetio/meetio-colors": "^4.1.1",
"@meetio/meetio-icons": "^1.10.0",
"@meetio/scheme-generator": "^3.1.0",
"babel-eslint": "^10.1.0",
"@typescript-eslint/eslint-plugin": "5.9.0",
"@typescript-eslint/parser": "5.9.0",
"eslint": "8.6.0",
"@typescript-eslint/eslint-plugin": "5.16.0",
"@typescript-eslint/parser": "5.16.0",
"eslint": "8.11.0",
"glob": "^7.2.0",
"husky": "^7.0.4",
"prettier": "^2.5.1",
"prettier": "^2.6.0",
"svg2img": "^0.9.4",
"ts-node": "^10.4.0",
"typescript": "^4.5.5",
"ts-node": "^10.7.0",
"typescript": "^4.6.2",
"picocolors": "^1.0.0"
}
}
26 changes: 23 additions & 3 deletions src/theme.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ export const variables: ThemeVariables = {
dialogLabelColor: 'color(var(background) blend(var(foreground) 30%))',
buttonBackground: ['background', 0.5],
buttonBackgroundHover: 'color(var(accent) a(0.2))',
buttonMinSize: [80, 28],
buttonSmall: [80, 16],
buttonMedium: [80, 22],
buttonLarge: [80, 28],
buttonIconFileColor: 'color(var(accent) a(0.70))',
buttonIconFileSelectedColor: 'var(accent)',
buttonIconFileBackground: 'var(background)',
Expand Down Expand Up @@ -150,8 +152,8 @@ export const rules = [
},
{
class: 'button_control',
content_margin: [6, 10, 6, 10],
min_size: 'var(buttonMinSize)',
content_margin: [6, 6],
min_size: 'var(buttonSmall)',
'layer0.tint': 'var(buttonBackground)',
'layer0.opacity': {
target: 0.6,
Expand All @@ -175,6 +177,18 @@ export const rules = [
interpolation: 'smoothstep',
},
},
{
class: 'button_control',
min_size: 'var(buttonMedium)',
content_margin: [6, 8],
parents: [{ class: 'dialog' }],
},
{
class: 'button_control',
min_size: 'var(buttonLarge)',
content_margin: [8, 10],
parents: [{ class: 'panel_grid_control' }],
},
{
class: 'dialog',
'layer0.tint': ['background', 0.94],
Expand Down Expand Up @@ -1084,6 +1098,12 @@ export const rules = [
},
],
},
{
class: 'switch_project_panel_cancel_container',
'layer0.tint': 'var(panelControlBackground)',
'layer0.opacity': 1.0,
content_margin: [10, 4],
},
{
class: 'panel_grid_control',
inside_spacing: 4,
Expand Down
51 changes: 46 additions & 5 deletions themes/Meetio Theme.hidden-theme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@
0.5
],
"buttonBackgroundHover": "color(var(accent) a(0.2))",
"buttonMinSize": [
"buttonSmall": [
80,
16
],
"buttonMedium": [
80,
22
],
"buttonLarge": [
80,
28
],
Expand Down Expand Up @@ -212,11 +220,9 @@
"class": "button_control",
"content_margin": [
6,
10,
6,
10
6
],
"min_size": "var(buttonMinSize)",
"min_size": "var(buttonSmall)",
"layer0.tint": "var(buttonBackground)",
"layer0.opacity": {
"target": 0.6,
Expand Down Expand Up @@ -247,6 +253,32 @@
"interpolation": "smoothstep"
}
},
{
"class": "button_control",
"min_size": "var(buttonMedium)",
"content_margin": [
6,
8
],
"parents": [
{
"class": "dialog"
}
]
},
{
"class": "button_control",
"min_size": "var(buttonLarge)",
"content_margin": [
8,
10
],
"parents": [
{
"class": "panel_grid_control"
}
]
},
{
"class": "dialog",
"layer0.tint": [
Expand Down Expand Up @@ -1398,6 +1430,15 @@
}
]
},
{
"class": "switch_project_panel_cancel_container",
"layer0.tint": "var(panelControlBackground)",
"layer0.opacity": 1,
"content_margin": [
10,
4
]
},
{
"class": "panel_grid_control",
"inside_spacing": 4,
Expand Down

0 comments on commit 7a8766a

Please sign in to comment.