Skip to content

Commit

Permalink
Merge pull request #54 from evvnt/f/add-font-weights
Browse files Browse the repository at this point in the history
Add font weights, upgrade dependencies
  • Loading branch information
jadefish authored Dec 8, 2023
2 parents d30afcc + 6d594da commit 02f3242
Show file tree
Hide file tree
Showing 7 changed files with 2,349 additions and 8,333 deletions.
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
7 changes: 6 additions & 1 deletion views/theme/assets/scss/v-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ $mdc-caption-font-size: .75rem; // 12sp
$mdc-button-font-size: .875rem; // 14sp
$mdc-overline-font-size: .75rem; // 12sp

a {
font-weight: normal;
}

.mdc-typography--headline6 {
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

0 comments on commit 02f3242

Please sign in to comment.