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

Pushing redesign live #59

Merged
merged 59 commits into from
Jun 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
774226f
milestone before possibly blowing it all up
saracook May 20, 2024
7a2150e
Redesign/accessibility
saracook May 31, 2024
e9ba8a2
Redesign/accessibility
saracook May 31, 2024
d94a921
more updates and accessibility
saracook May 31, 2024
9493281
Trying to strip back gemfile
saracook May 31, 2024
59d51b0
dependencies
saracook Jun 1, 2024
073b000
gemfile.lock
saracook Jun 1, 2024
034777d
gemfile.lock
saracook Jun 1, 2024
76f7311
gemfile.lock
saracook Jun 1, 2024
b8e37d7
more dependency fun
saracook Jun 1, 2024
3d48325
making good choices
saracook Jun 1, 2024
9d8c17b
helps if you give it the right name
saracook Jun 1, 2024
a7580ce
ruby-version
saracook Jun 1, 2024
e4bfdf7
incremental build fixes
saracook Jun 1, 2024
201d9f0
more tweaking
saracook Jun 1, 2024
b49d9ad
getting rid of Gemfile.lock
saracook Jun 1, 2024
41ccf57
experimental
saracook Jun 1, 2024
a1b85f4
Create jekyll.yml
saracook Jun 1, 2024
0bd123b
again.
saracook Jun 1, 2024
680d57b
fine, no theme then
saracook Jun 1, 2024
fcd76e7
fine, no theme then
saracook Jun 1, 2024
680b570
versions
saracook Jun 1, 2024
4c45d4e
footer file
saracook Jun 1, 2024
13eeba5
rollback versions
saracook Jun 1, 2024
f43735b
Actions: Switch ruby/setup-ruby to v1
akkornel Jun 3, 2024
1491d4a
Actions: Specify Ruby 3.1.3
akkornel Jun 3, 2024
7e3d530
Actions: Switch Jekyll build to the one from GH Actions
akkornel Jun 3, 2024
7c1c82c
Give some CSS links the relative_url treatment
akkornel Jun 3, 2024
8596174
Revert "Give some CSS links the relative_url treatment"
akkornel Jun 3, 2024
e6de41d
css update and fixing lockup link
saracook Jun 7, 2024
df5026d
accessibility tweaks
saracook Jun 12, 2024
7623c58
fixing footer problems and responsiveness
saracook Jun 13, 2024
241b12f
cleanup on news articles and other details
saracook Jun 13, 2024
397a67a
fixing link problems
saracook Jun 14, 2024
f1cea71
fixing broken home page
saracook Jun 14, 2024
dd613d3
fixing broken home page
saracook Jun 14, 2024
0038dfc
fixing nav
saracook Jun 14, 2024
b69d1b6
fixing links
saracook Jun 14, 2024
494325a
making server 5 the landing page
saracook Jun 14, 2024
43384be
swapping old and new server docs
saracook Jun 14, 2024
f7c45ee
you know what that was a bad idea let's not do that
saracook Jun 14, 2024
0e9c567
changing link
saracook Jun 14, 2024
79250d9
changing link
saracook Jun 14, 2024
dc2068b
permalink
saracook Jun 14, 2024
2dcb23a
permalink
saracook Jun 14, 2024
d2aec96
permalink
saracook Jun 14, 2024
78666e4
small tweaks
saracook Jun 14, 2024
0128b4a
small tweaks
saracook Jun 14, 2024
4d99b19
fixing help link (libraries)
saracook Jun 14, 2024
0ce334e
fixing help link (libraries)
saracook Jun 14, 2024
ceb4e62
small tweaks
saracook Jun 14, 2024
1f86bb7
Fixing collapse behavior on accordions
saracook Jun 14, 2024
82e0ad7
Merge branch 'main' into redesign
saracook Jun 15, 2024
5227246
bundle
saracook Jun 15, 2024
b572334
Merge pull request #1 from saracook/redesign
saracook Jun 15, 2024
3eed6fe
Update jekyll.yml
saracook Jun 15, 2024
ee4fbd2
twitter title
saracook Jun 15, 2024
ff6467b
workflow
saracook Jun 15, 2024
0e5c6e5
Update jekyll.yml branch name to build
saracook Jun 15, 2024
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
61 changes: 61 additions & 0 deletions .github/workflows/jekyll.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# Sample workflow for building and deploying a Jekyll site to GitHub Pages
name: Deploy Jekyll site to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]

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

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1.3' # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
- name: Setup Pages
id: pages
uses: actions/configure-pages@v5
- name: Build with Jekyll
uses: actions/[email protected]
- name: Upload artifact
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v3

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ vendor

# Ignore editor files
*.swp

# Local Netlify folder
.netlify
Gemfile.lock
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.1.3
10 changes: 8 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
source "https://rubygems.org"

gem "github-pages", group: :jekyll_plugins
ruby "3.1.3"
gem "jekyll"
gem "webrick"
gem "jekyll-paginate"
gem "tzinfo", ">= 1", "< 3"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
gem "wdm", '>= 0.1.0' if Gem.win_platform?
group :jekyll_plugins do
gem "jekyll-gist"
gem 'github-pages', '~> 231'
end
92 changes: 48 additions & 44 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.3)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -14,19 +14,18 @@ GEM
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bigdecimal (3.1.6)
bigdecimal (3.1.8)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
coffee-script-source (1.12.2)
colorator (1.1.0)
commonmarker (0.23.10)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
dnsruby (1.70.0)
dnsruby (1.72.1)
simpleidn (~> 0.2.1)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
Expand All @@ -40,17 +39,17 @@ GEM
net-http
ffi (1.16.3)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (228)
github-pages-health-check (= 1.17.9)
jekyll (= 3.9.3)
jekyll-avatar (= 0.7.0)
jekyll-coffeescript (= 1.1.1)
gemoji (4.1.0)
github-pages (231)
github-pages-health-check (= 1.18.2)
jekyll (= 3.9.5)
jekyll-avatar (= 0.8.0)
jekyll-coffeescript (= 1.2.2)
jekyll-commonmark-ghpages (= 0.4.0)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.15.1)
jekyll-default-layout (= 0.1.5)
jekyll-feed (= 0.17.0)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.13.0)
jekyll-github-metadata (= 2.16.1)
jekyll-include-cache (= 0.2.1)
jekyll-mentions (= 1.6.0)
jekyll-optional-front-matter (= 0.3.2)
Expand All @@ -77,28 +76,28 @@ GEM
jekyll-theme-tactile (= 0.2.0)
jekyll-theme-time-machine (= 0.2.0)
jekyll-titles-from-headings (= 0.5.3)
jemoji (= 0.12.0)
kramdown (= 2.3.2)
jemoji (= 0.13.0)
kramdown (= 2.4.0)
kramdown-parser-gfm (= 1.1.0)
liquid (= 4.0.4)
mercenary (~> 0.3)
minima (= 2.5.1)
nokogiri (>= 1.13.6, < 2.0)
rouge (= 3.26.0)
rouge (= 3.30.0)
terminal-table (~> 1.4)
github-pages-health-check (1.17.9)
github-pages-health-check (1.18.2)
addressable (~> 2.3)
dnsruby (~> 1.60)
octokit (~> 4.0)
public_suffix (>= 3.0, < 5.0)
octokit (>= 4, < 8)
public_suffix (>= 3.0, < 6.0)
typhoeus (~> 1.3)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (3.9.3)
jekyll (3.9.5)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand All @@ -111,27 +110,27 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-avatar (0.7.0)
jekyll-avatar (0.8.0)
jekyll (>= 3.0, < 5.0)
jekyll-coffeescript (1.1.1)
jekyll-coffeescript (1.2.2)
coffee-script (~> 2.2)
coffee-script-source (~> 1.11.1)
coffee-script-source (~> 1.12)
jekyll-commonmark (1.4.0)
commonmarker (~> 0.22)
jekyll-commonmark-ghpages (0.4.0)
commonmarker (~> 0.23.7)
jekyll (~> 3.9.0)
jekyll-commonmark (~> 1.4.0)
rouge (>= 2.0, < 5.0)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.15.1)
jekyll-default-layout (0.1.5)
jekyll (>= 3.0, < 5.0)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.13.0)
jekyll-github-metadata (2.16.1)
jekyll (>= 3.4, < 5.0)
octokit (~> 4.0, != 4.4.0)
octokit (>= 4, < 7, != 4.4.0)
jekyll-include-cache (0.2.1)
jekyll (>= 3.7, < 5.0)
jekyll-mentions (1.6.0)
Expand Down Expand Up @@ -202,11 +201,11 @@ GEM
jekyll (>= 3.3, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jemoji (0.12.0)
gemoji (~> 3.0)
jemoji (0.13.0)
gemoji (>= 3, < 5)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
kramdown (2.3.2)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
Expand All @@ -219,13 +218,15 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.21.2)
minitest (5.23.1)
mutex_m (0.2.0)
net-http (0.4.1)
uri
nokogiri (1.16.5-x86_64-darwin)
nokogiri (1.16.6-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-linux)
nokogiri (1.16.6-x86_64-linux)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
Expand All @@ -239,8 +240,7 @@ GEM
ffi (~> 1.0)
rexml (3.2.8)
strscan (>= 3.0.9)
rouge (3.26.0)
ruby2_keywords (0.0.5)
rouge (3.30.0)
rubyzip (2.3.2)
safe_yaml (1.0.5)
sass (3.7.4)
Expand All @@ -251,33 +251,37 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
simpleidn (0.2.1)
unf (~> 0.1.4)
simpleidn (0.2.3)
strscan (3.1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.9.1)
unicode-display_width (1.8.0)
uri (0.13.0)
webrick (1.8.1)

PLATFORMS
arm64-darwin-22
x86_64-darwin-20
x86_64-darwin-21
x86_64-darwin-22
x86_64-darwin-23
x86_64-linux

DEPENDENCIES
github-pages
github-pages (~> 231)
jekyll
jekyll-gist
jekyll-paginate
tzinfo (>= 1, < 3)
tzinfo-data
webrick

RUBY VERSION
ruby 3.1.3p185

BUNDLED WITH
2.5.5
23 changes: 17 additions & 6 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
# "null" (_without_ the quotes).
title: "Globus @ Stanford"
slogan: "Research data management simplified. For you. For free."
image: "assets/globus_square.png"

image: "/assets/globus_square.png"
site-title: "Globus @ Stanford"
# markdown: GFM
# This section has site owner information. It is used in a few places:
# * Page metadata, used by search engines and social tools.
# * The "Connect With Us" block at the bottom of each page.
owner:
# The owner name must be provided.
name: "Stanford Research Computing Center"
name: "Stanford Research Computing"

# Next up is social media handles. If you don't have one, use the word
# "null", but without the quotes.
Expand Down Expand Up @@ -89,6 +90,7 @@ github-edit-text: "Improve This Page"
# pagination entirely (and so have all posts appear on the main page), comment
# out the line below.
paginate: 3
paginate_path: "/announcements/page:num/"

# These defaults apply when a matching page variable is not set.
# NOTE: You should set most of these in page-specific YAML.
Expand All @@ -99,13 +101,15 @@ defaults:
values:
title: "Page Title"
description: null
layout: null
layout: default
sitemap: true
toc: true
sidebar-box: null
social:
# The title to use when Twitter et al show a link to your site.
# When set to null, Jekyll will generate the string
# "PAGE_TITLE — SITE_TITLE".
title: null
title: Globus at Stanford

# The image to show when someone expands a Twitter post with your page
# linked. This should be a path relative to your site root. If not
Expand All @@ -118,17 +122,24 @@ defaults:
plugins:
- jekyll-paginate
- jekyll-sitemap
- jekyll-titles-from-headings

# This is a list of files that should be excluded from the _site directory.
exclude:
- Gemfile
- Gemfile.lock
- LICENSE.txt
- README.md
- jekyll-theme-stanford-lagunita.gemspec
# - jekyll-theme-stanford-lagunita.gemspec
- vendor

# These are some Jekyll defaults, which should be left alone.
timezone: America/Los_Angeles
encoding: utf-8
safe: true
# theme: src

lockup_line2: Globus
lockup_link: /index.html
lockup_line1: Research Computing
lockup_modifier_class: su-lockup--option-b
Loading