diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 4df0324e3..e237d8a83 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -11,14 +11,14 @@ jobs: name: Build and Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, # change this to (see https://github.com/ruby/setup-ruby#versioning): uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: vendor/bundle key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} @@ -42,7 +42,7 @@ jobs: outputs: skip: ${{ steps.ci-skip-step.outputs.ci-skip }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - id: ci-skip-step @@ -56,7 +56,7 @@ jobs: needs: [ build-test, ci-skip ] if: github.ref == 'refs/heads/master' && github.repository_owner == 'sproogen' && needs.ci-skip.outputs.skip == 'false' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.ADMIN_TOKEN }} @@ -66,7 +66,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: vendor/bundle key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} @@ -109,25 +109,13 @@ jobs: RELEASE_VERSION=$(gem bump --pretend --no-commit | awk '{ print $3 }') echo ::set-output name=RELEASE_VERSION::${RELEASE_VERSION} - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: softprops/action-gh-release@v1 with: tag_name: v${{ steps.release_version.outputs.RELEASE_VERSION }} - release_name: v${{ steps.release_version.outputs.RELEASE_VERSION }} + name: v${{ steps.release_version.outputs.RELEASE_VERSION }} draft: false prerelease: false - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./modern-resume-theme-${{ steps.release_version.outputs.RELEASE_VERSION }}.gem - asset_name: modern-resume-theme-${{ steps.release_version.outputs.RELEASE_VERSION }}.gem - asset_content_type: application/octet-stream + files: ./modern-resume-theme-${{ steps.release_version.outputs.RELEASE_VERSION }}.gem - name: Create gem credentials env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 64ec5ada9..1a9eb2dd0 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ content: link_text: Text for link (optional: without this link will show URL as link text) additional_links: (optional) - title: Link name - icon: Font Awesome brand icon name (eg. fab fa-twitter) (https://fontawesome.com/icons?d=gallery&s=brands&m=free) + icon: Font Awesome brand icon name (eg. fab fa-github) (https://fontawesome.com/icons?d=gallery&s=brands&m=free) url: Link url (eg. https://google.com) quote: > Short overview or quote for the item diff --git a/_includes/header.html b/_includes/header.html index cb0524837..99aa327cf 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -69,10 +69,11 @@

{{ site.title | escape }}

{%- endif -%} - {%- if site.twitter_username -%} + {%- assign x_user = site.x_username | default: site.twitter_username -%} + {%- if x_user -%}
  • - - + +
    • {%- endif -%} diff --git a/_sass/_variables.scss b/_sass/_variables.scss new file mode 100644 index 000000000..de9e0b601 --- /dev/null +++ b/_sass/_variables.scss @@ -0,0 +1,31 @@ +// Typography variables +// Users can override these by setting variables before importing the theme + +// Font family - default to Roboto if not specified +$font-family: 'Roboto', sans-serif !default; +$font-url: 'https://fonts.googleapis.com/css?family=Roboto:100,300,400,700,500,500italic,400italic,300italic,100italic,700italic' !default; + +// Alternative font examples (commented out): +// For Manrope: +// $font-family: 'Manrope', sans-serif; +// $font-url: 'https://fonts.googleapis.com/css2?family=Manrope:wght@200;300;400;500;600;700;800&display=swap'; + +// For Inter: +// $font-family: 'Inter', sans-serif; +// $font-url: 'https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap'; + +// For Plus Jakarta Sans: +// $font-family: 'Plus Jakarta Sans', sans-serif; +// $font-url: 'https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@200;300;400;500;600;700;800&display=swap'; + +// Typography sizing and spacing +$body-line-height: 1.5 !default; +$body-font-size: 1rem !default; +$paragraph-font-size: 1.6rem !default; // Default 1.6rem - modern sites use 1rem-1.125rem +$heading-line-height: 1.2 !default; +$heading-letter-spacing: 0 !default; // Add 0.01em-0.02em for modern look + +// Section styling +$section-border-style: dashed !default; // 'dashed', 'solid', or 'none' +$section-border-width: 2px !default; +$section-border-color: #CCCCCC !default; diff --git a/_sass/base.scss b/_sass/base.scss index 03d58054c..f52e9867f 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -1,7 +1,6 @@ -@import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,700,500,500italic,400italic,300italic,100italic,700italic); +@import url($font-url); @import url(https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css); -@import url(https://use.fontawesome.com/releases/v5.11.2/css/all.css); -@import url(https://use.fontawesome.com/releases/v5.11.2/css/v4-shims.css); +@import url(https://use.fontawesome.com/releases/v6.6.0/css/all.css); button, input[type="button"], input[type="reset"], input[type="submit"] { appearance: none; @@ -11,7 +10,7 @@ button, input[type="button"], input[type="reset"], input[type="submit"] { color: #fff; cursor: pointer; display: inline-block; - font-family: "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; + font-family: $font-family; font-size: 1rem; -webkit-font-smoothing: antialiased; font-weight: 600; @@ -45,7 +44,7 @@ input, label, select { display: block; - font-family: "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; + font-family: $font-family; font-size: 1rem; } label { @@ -148,7 +147,7 @@ html { body { background: #ffffff; - font-family: Roboto, sans-serif; + font-family: $font-family; -webkit-font-smoothing: antialiased; } .center-text { @@ -179,7 +178,7 @@ body { } .header-right p { - font-size: 1.6rem; + font-size: $paragraph-font-size; text-align: right; } diff --git a/_sass/modern-resume-theme.scss b/_sass/modern-resume-theme.scss index 25829c2d1..8d32b9209 100644 --- a/_sass/modern-resume-theme.scss +++ b/_sass/modern-resume-theme.scss @@ -1,3 +1,4 @@ +@import "variables"; @import "base"; @import "button"; @import "type"; @@ -67,7 +68,7 @@ p { margin-bottom: 3px; - font-size: 1.6rem; + font-size: $paragraph-font-size; text-align: inherit; font-weight: 300; diff --git a/_sass/type.scss b/_sass/type.scss index 3e2e3787b..ba7bc76f7 100644 --- a/_sass/type.scss +++ b/_sass/type.scss @@ -1,9 +1,9 @@ body { color: #333; - font-family: Roboto, sans-serif; + font-family: $font-family; font-feature-settings: "kern", "liga", "pnum"; - font-size: 1rem; - line-height: 1.5; + font-size: $body-font-size; + line-height: $body-line-height; @media print { font-size: 0.9rem; @@ -16,9 +16,10 @@ h3, h4, h5, h6 { - font-family: Roboto, sans-serif; + font-family: $font-family; font-size: 1rem; - line-height: 1.2; + line-height: $heading-line-height; + letter-spacing: $heading-letter-spacing; margin: 0 0 0.75rem; } @@ -50,7 +51,7 @@ h3 { font-weight: 300; font-size: 3rem; text-align: center; - border-bottom: dashed 2px #CCCCCC; + border-bottom: $section-border-style $section-border-width $section-border-color; padding-bottom: 10px; margin-bottom:40px; @@ -66,7 +67,7 @@ h4 { } p, ul { - font-size: 1.6rem; + font-size: $paragraph-font-size; text-align: justify; } diff --git a/modern-resume-theme.gemspec b/modern-resume-theme.gemspec index 8f2f07c15..73a2ebb6a 100644 --- a/modern-resume-theme.gemspec +++ b/modern-resume-theme.gemspec @@ -14,9 +14,9 @@ Gem::Specification.new do |spec| spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|LICENSE|README)!i) } - spec.required_ruby_version = '~> 2.0' + spec.required_ruby_version = '>= 2.0' - spec.add_runtime_dependency 'github-pages', '~> 209' + spec.add_runtime_dependency 'github-pages', '~> 231' spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.1" spec.add_development_dependency "html-proofer", "~> 3.9"