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.

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

Add font weights, upgrade dependencies #54

Merged
merged 6 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
18 changes: 3 additions & 15 deletions .github/workflows/semantic-release.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,21 @@
name: CI
name: semantic-release

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
pull_request:
branches: [ master ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Semantic Release
uses: cycjimmy/semantic-release-action@v2
uses: cycjimmy/semantic-release-action@v3
with:
extra_plugins: |
@semantic-release/git
Expand Down
2 changes: 1 addition & 1 deletion public/bundle.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/components/application/_theme_header.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if theme[:font_family].present? %>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=<%= theme[:font_family].gsub(' ', '+') %>">
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=<%= theme[:font_family].gsub(' ', '+') %>:wght@100;200;300;400;500;600;700;800;900&display=swap">
<% end %>

<style>
Expand Down
3 changes: 2 additions & 1 deletion views/theme/assets/scss/v-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ $mdc-overline-font-size: .75rem; // 12sp
color: palette(neutral9);
}

.mdc-typography--subtitle1 {
.mdc-typography--subtitle1,
.mdc-typography--subtitle2 {
color: palette(neutral5);
}

Expand Down
2 changes: 1 addition & 1 deletion views/theme/dist/public/style-bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading