Skip to content

Commit

Permalink
Updated Ruby Depencies (#483)
Browse files Browse the repository at this point in the history
* made changes to the about page

* updated dependencies

* updated test

* tests

* added 3.0.0 to test
  • Loading branch information
naomivgong authored May 21, 2024
1 parent 558b9ea commit 697e5c7
Show file tree
Hide file tree
Showing 9 changed files with 210 additions and 132 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.7.2, 3.0.0]
ruby: [3.0.0, 3.3.1] #removed 3.0.0
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.0.0
ruby-3.3.1
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "jekyll", "~> 4.2.2"
gem "jekyll", "~> 4.3.3"
gem 'jekyll-seo-tag' # check out this https://jekyll.github.io/jekyll-seo-tag/usage/

# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
Expand Down
177 changes: 124 additions & 53 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,111 +1,182 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
Ascii85 (1.1.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
afm (0.2.2)
async (2.11.0)
console (~> 1.25, >= 1.25.2)
fiber-annotation
io-event (~> 1.5, >= 1.5.1)
timers (~> 4.1)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.1.9)
concurrent-ruby (1.2.3)
console (1.25.2)
fiber-annotation
fiber-local (~> 1.1)
json
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
ffi (1.15.5)
ffi (1.15.5-x64-mingw32)
ffi (1.16.3)
fiber-annotation (0.2.0)
fiber-local (1.1.0)
fiber-storage
fiber-storage (0.1.1)
forwardable-extended (2.6.0)
html-proofer (4.4.0)
google-protobuf (4.26.1)
rake (>= 13)
google-protobuf (4.26.1-aarch64-linux)
rake (>= 13)
google-protobuf (4.26.1-arm64-darwin)
rake (>= 13)
google-protobuf (4.26.1-x86-linux)
rake (>= 13)
google-protobuf (4.26.1-x86_64-darwin)
rake (>= 13)
google-protobuf (4.26.1-x86_64-linux)
rake (>= 13)
hashery (2.1.2)
html-proofer (5.0.9)
addressable (~> 2.3)
mercenary (~> 0.3)
async (~> 2.1)
nokogiri (~> 1.13)
parallel (~> 1.10)
pdf-reader (~> 2.11)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
zeitwerk (~> 2.5)
http_parser.rb (0.8.0)
i18n (1.10.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jekyll (4.2.2)
io-event (1.5.1)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-category-pages (1.1.2)
jekyll (~> 4.0)
jekyll-paginate (~> 1.1, >= 1.0.0)
jekyll-feed (0.16.0)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.3.1)
json (2.7.2)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.0)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
nokogiri (1.16.5-aarch64-linux)
racc (~> 1.4)
nokogiri (1.13.8-x64-mingw32)
nokogiri (1.16.5-arm-linux)
racc (~> 1.4)
nokogiri (1.16.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86-linux)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
parallel (1.22.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
racc (1.6.0)
pdf-reader (2.12.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
public_suffix (5.0.5)
racc (1.8.0)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.28.0)
rexml (3.2.8)
strscan (>= 3.0.9)
rouge (4.2.1)
ruby-rc4 (0.1.5)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sassc (2.4.0-x64-mingw32)
ffi (~> 1.9)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.0)
sass-embedded (1.77.2-aarch64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-aarch64-linux-musl)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-arm-linux-gnueabihf)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-arm-linux-musleabihf)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-arm64-darwin)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-x86-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-x86-linux-musl)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-x86_64-darwin)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-x86_64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.2-x86_64-linux-musl)
google-protobuf (>= 3.25, < 5.0)
strscan (3.1.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
timers (4.3.5)
ttfunk (1.8.0)
bigdecimal (~> 3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.2)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2020.2)
tzinfo (>= 1.0.0)
unicode-display_width (1.8.0)
webrick (1.7.0)
unicode-display_width (2.5.0)
webrick (1.8.1)
yell (2.2.2)
zeitwerk (2.6.0)
zeitwerk (2.6.14)

PLATFORMS
ruby
x64-mingw32
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux
arm-linux-gnueabihf
arm-linux-musleabihf
arm64-darwin
x86-linux
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
html-proofer
jekyll (~> 4.2.2)
jekyll (~> 4.3.3)
jekyll-category-pages
jekyll-feed
jekyll-paginate
Expand All @@ -115,4 +186,4 @@ DEPENDENCIES
webrick

BUNDLED WITH
2.2.5
2.5.10
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ Configuration file: /Users/matt/code/tla/static/_config.yml

```


If these steps do not work for you, you may also try doing this:


Visit whatever follows the server address line in your browser, which is usually [http://127.0.0.1:4000/](http://127.0.0.1:4000/).

If you run into any issues, please let us know on our [issues tracker](https://github.com/uclaacm/teach-la-website)!
Expand Down
29 changes: 29 additions & 0 deletions _sass/_basic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,14 @@ ul > li {
font-weight: 600;
}

.subtitle{
font-family: $font-display;
color: $teachla-green;
margin-bottom: 0;
font-size: 32px;
font-weight: 600;
}

.text-1x {
font-size: 1rem !important;
}
Expand Down Expand Up @@ -342,6 +350,8 @@ ul > li {
font-size: $pronouns-font-size;
}



.img-sponsor {
max-width: 80%;
}
Expand Down Expand Up @@ -400,3 +410,22 @@ ul > li {
padding: 20vh 0;
// background-size: 100vw 100%;
}

.why-teach-la-column-left{
float: left;
width: 30%;
}
.why-teach-la-column-right{
float: right;
width: 70%;
}

.why-teach-la-row{
content: "";
display: table;
clear: both;
}

.about-table{
color: $teachla-green;
}
Loading

0 comments on commit 697e5c7

Please sign in to comment.