Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/theme settings marketplace additions #461

Merged
merged 9 commits into from
Feb 8, 2023
Merged

Fix/theme settings marketplace additions #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bd9aa1b
fix: updated eslint version for bend commands
Feb 6, 2023
7ccff4b
update: port spacing styles into theme settings
Feb 6, 2023
b8aa546
update: add form settings for new marketplace requirements
Feb 6, 2023
727bd20
fix: include .node-version -- fixes bend
Feb 6, 2023
9546dab
update: node-version to fix eslint versioning
jazzyclimber Feb 6, 2023
f5ea240
fix: color inherited_value
Feb 7, 2023
f7bcf0d
update: use of color fields
Feb 7, 2023
cc01790
clean: run hs-json-cleaner
Feb 7, 2023
7656637
updated lint.yml file
Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 10.x
node-version: 14.x
- name: Install NPM deps
run: |
npm install
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Temporary Items
.apdisk

### Node ###
.node-version
# .node-version
# Logs
logs
*.log
Expand Down
1 change: 1 addition & 0 deletions .node-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14.17.0
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "Apache-2.0",
"devDependencies": {
"autoprefixer": "^9.0.0",
"eslint": "^7.9.0",
"eslint": "^v8.0.0",
"js-yaml": "^3.14.0",
"postcss-cli": "^7.0.0",
"prettier": "^2.1.2"
Expand Down
5 changes: 5 additions & 0 deletions src/css/elements/_forms.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ form label {
margin-bottom: 0.35rem;
}

/* Form Title */
.form-title {
margin-bottom: 0;
}

/* Help text */

form legend {
Expand Down
65 changes: 55 additions & 10 deletions src/css/theme-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,17 @@
{% set button_spacing = theme.buttons.spacing.spacing.css %}

/* 1e. Forms */
{% set form_bg_color = color(theme.forms.form.background.color) %}

{% set form_title_font = theme.forms.title.text.font %}
{% set form_title_bg_color = color(theme.forms.title.background.color) %}
{% set form_title_spacing = theme.forms.title.spacing.spacing.css %}
{% set form_title_border = theme.forms.title.border.border.css %}
{% set form_title_top_left_corner_radius = theme.forms.title.corner.top_left_radius ~ "px" %}
{% set form_title_top_right_corner_radius = theme.forms.title.corner.top_right_radius ~ "px" %}
{% set form_title_bottom_left_corner_radius = theme.forms.title.corner.bottom_left_radius ~ "px" %}
{% set form_title_bottom_right_corner_radius = theme.forms.title.corner.bottom_right_radius ~ "px" %}

{% set form_title_font_color = theme.forms.title.text.color.color %}

{% set form_label_font_color = theme.forms.labels.text.color.color %}

Expand All @@ -88,6 +97,24 @@
{% set form_field_border = theme.forms.fields.border.border.css %}
{% set form_field_corner_radius = theme.forms.fields.corner.radius ~ 'px' %}

{% set form_bg_color = color(theme.forms.form.background.color) %}
{% set form_padding = theme.forms.form.spacing.spacing.css %}
{% set form_border = theme.forms.form.border.border.css %}
{% set form_top_left_corner_radius = theme.forms.form.corner.top_left_radius ~ "px" %}
{% set form_top_right_corner_radius = theme.forms.form.corner.top_right_radius ~ "px" %}
{% set form_bottom_left_corner_radius = theme.forms.form.corner.bottom_left_radius ~ "px" %}
{% set form_bottom_right_corner_radius = theme.forms.form.corner.bottom_right_radius ~ "px" %}


{% set form_submit_button_font = theme.forms.button.text.font %}
{% set form_submit_button_bg_color = color(theme.forms.button.background.color) %}
{% set form_submit_button_border = theme.forms.button.border.border.css %}

{% set form_submit_button_bg_color_hover = color(theme.forms.button.hover.background.color) %}
{% set form_submit_button_border_hover = theme.forms.button.hover.border.border.css %}
{% set form_submit_button_color_hover = theme.forms.button.hover.text.color.color %}


/* 1f. Tables */

{% set table_head_bg_color = color(theme.tables.header.background.color) %}
Expand Down Expand Up @@ -270,14 +297,31 @@ button:active,
form,
.submitted-message {
{{ body_font.style }};
{{ form_border }};
border-top-left-radius: {{ form_top_left_corner_radius }};
border-top-right-radius: {{ form_top_right_corner_radius }};
border-bottom-left-radius: {{ form_bottom_left_corner_radius }};
border-bottom-right-radius: {{ form_bottom_right_corner_radius }};
background-color: {{ form_bg_color }};
{{ form_padding }};
}

/* Form title */

.form-title {
color: {{ form_title_font_color }};
{{ form_title_border}};
{{ form_title_spacing }};
{{ form_title_font.style }};
border-top-left-radius: {{ form_title_top_left_corner_radius }};
border-top-right-radius: {{ form_title_top_right_corner_radius }};
border-bottom-left-radius: {{ form_title_bottom_left_corner_radius }};
border-bottom-right-radius: {{ form_title_bottom_right_corner_radius }};
font-size: {{ form_title_font.size ~ form_title_font.size_unit }};
color: {{ form_title_font.color }};
background-color: {{ form_title_bg_color }};
}


/* Labels */

form label {
Expand Down Expand Up @@ -347,22 +391,23 @@ form textarea {

form input[type=submit],
form .hs-button {
{{ button_border }}
{{ button_spacing }}
{{ button_font.style }};
background-color: {{ button_bg_color }};
{{ form_submit_button_border }};
{{ button_spacing }};
{{ form_submit_button_font.style }};
color: {{form_submit_button_font.color}};
font-size: {{form_submit_button_font.size ~ form_submit_button_font.size_unit}};
background-color: {{ form_submit_button_bg_color }};
border-radius: {{ button_corner_radius }};
color: {{ button_font.color }};
font-size: {{ button_font.size ~ button_font.size_unit }};
text-transform: {{ button_text_transform }};
}

form input[type=submit]:hover,
form input[type=submit]:focus,
form .hs-button:hover,
form .hs-button:focus {
background-color: rgba({{ color_variant(theme.buttons.background.color.color, -40)|convert_rgb }}, {{ theme.buttons.background.color.opacity / 100 }});
border-color: {{ color_variant(theme.buttons.border.border.top.color, -40) }};
background-color: {{ form_submit_button_bg_color_hover }};
color: {{form_submit_button_color_hover}};
{{ form_submit_button_border_hover }};
}

form input[type=submit]:active,
Expand Down
Loading