From 4be22187183fc707631661a3a139151cea49a268 Mon Sep 17 00:00:00 2001 From: Jose Luis Salas Date: Sat, 15 Jun 2024 20:22:50 +0200 Subject: [PATCH] Update sass and add some icons --- .dockerignore | 1 + Dockerfile | 4 +- Gemfile | 3 +- Gemfile.lock | 87 ++++++++++++++++++++++---------- Rules | 4 +- content/humans.txt | 4 +- content/past.haml | 2 +- content/stylesheets/all.css.scss | 33 ++++++++++++ data/default.yml | 2 +- data/static.yml | 2 +- layouts/partials/_footer.haml | 6 ++- 11 files changed, 112 insertions(+), 36 deletions(-) diff --git a/.dockerignore b/.dockerignore index 331d387..1474782 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ .git Dockerfile +output diff --git a/Dockerfile b/Dockerfile index 856a9a4..3a98e11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,11 @@ FROM ruby:3.3 WORKDIR /app +RUN apt-get update && apt-get install -y nodejs + COPY Gemfile Gemfile.lock /app RUN bundle install -RUN apt-get update && apt-get install -y nodejs COPY . /app RUN bundle exec nanoc +CMD bundle exec nanoc view --host 0.0.0.0 diff --git a/Gemfile b/Gemfile index 33f7835..42ab7d7 100644 --- a/Gemfile +++ b/Gemfile @@ -3,10 +3,11 @@ source "https://rubygems.org" gem "adsf", "~> 1.4" +gem "adsf-live" gem "haml", "~> 6.3" gem "nanoc", "~> 4.12" gem "rainpress", "~> 1.0" -gem "sass", "~> 3.7" +gem "nanoc-dart-sass" group :development do gem "webrick", "~> 1.8" diff --git a/Gemfile.lock b/Gemfile.lock index 99da5c8..07aa30d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,41 +6,67 @@ GEM adsf (1.5.0) rack (>= 1.0.0, < 4.0.0) rackup (~> 2.1) + adsf-live (1.5.0) + adsf (~> 1.3) + em-websocket (~> 0.5) + eventmachine (~> 1.2) + listen (~> 3.0) + rack-livereload (~> 0.3) + base64 (0.2.0) + bigdecimal (3.1.8) + coderay (1.1.3) colored (1.2) - concurrent-ruby (1.2.3) - cri (2.15.11) + concurrent-ruby (1.3.3) + cri (2.15.12) ddmetrics (1.1.0) ddplugin (1.0.3) diff-lcs (1.5.1) - ffi (1.16.3) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + eventmachine (1.2.7) + ffi (1.17.0-x86_64-linux-gnu) + google-protobuf (4.27.1-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.27.1-x86_64-linux) + bigdecimal + rake (>= 13) haml (6.3.0) temple (>= 0.8.2) thor tilt - immutable-ruby (0.1.0) + http_parser.rb (0.8.0) + immutable-ruby (0.2.0) concurrent-ruby (~> 1.1) sorted_set (~> 1.0) json_schema (0.21.0) - memo_wise (1.8.0) - nanoc (4.12.19) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + memo_wise (1.9.0) + method_source (1.1.0) + nanoc (4.12.21) addressable (~> 2.5) colored (~> 1.2) nanoc-checking (~> 1.0, >= 1.0.2) - nanoc-cli (= 4.12.19) - nanoc-core (= 4.12.19) + nanoc-cli (= 4.12.21) + nanoc-core (= 4.12.21) nanoc-deploying (~> 1.0) parallel (~> 1.12) tty-command (~> 0.8) tty-which (~> 0.4) - nanoc-checking (1.0.2) - nanoc-cli (~> 4.12, >= 4.12.4) - nanoc-core (~> 4.12, >= 4.12.4) - nanoc-cli (4.12.19) + nanoc-checking (1.0.5) + nanoc-cli (~> 4.12, >= 4.12.5) + nanoc-core (~> 4.12, >= 4.12.5) + nanoc-cli (4.12.21) cri (~> 2.15) diff-lcs (~> 1.3) - nanoc-core (= 4.12.19) + nanoc-core (= 4.12.21) + pry zeitwerk (~> 2.1) - nanoc-core (4.12.19) + nanoc-core (4.12.21) + base64 (~> 0.2) concurrent-ruby (~> 1.1) ddmetrics (~> 1.0) ddplugin (~> 1.0) @@ -51,36 +77,44 @@ GEM slow_enumerator_tools (~> 1.0) tty-platform (~> 0.2) zeitwerk (~> 2.1) + nanoc-dart-sass (1.0.3) + nanoc-core (~> 4.12) + sass-embedded (~> 1.56) nanoc-deploying (1.0.2) nanoc-checking (~> 1.0) nanoc-cli (~> 4.11, >= 4.11.15) nanoc-core (~> 4.11, >= 4.11.15) - parallel (1.24.0) + parallel (1.25.1) pastel (0.8.0) tty-color (~> 0.5) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) psych (5.1.2) stringio - public_suffix (5.0.4) + public_suffix (5.1.0) rack (3.0.9.1) + rack-livereload (0.6.0) + rack (~> 3.0.8) rackup (2.1.0) rack (>= 3) webrick (~> 1.8) rainpress (1.0.1) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rbtree (0.4.6) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sass-embedded (1.77.5-arm64-darwin) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.5-x86_64-linux-gnu) + google-protobuf (>= 3.25, < 5.0) set (1.1.0) slow_enumerator_tools (1.1.0) sorted_set (1.0.3) rbtree set (~> 1.0) - stringio (3.1.0) + stringio (3.1.1) temple (0.10.3) thor (1.3.1) tilt (2.3.0) @@ -90,7 +124,7 @@ GEM tty-platform (0.3.0) tty-which (0.5.0) webrick (1.8.1) - zeitwerk (2.6.13) + zeitwerk (2.6.16) PLATFORMS arm64-darwin-23 @@ -98,11 +132,12 @@ PLATFORMS DEPENDENCIES adsf (~> 1.4) + adsf-live haml (~> 6.3) nanoc (~> 4.12) + nanoc-dart-sass rainpress (~> 1.0) - sass (~> 3.7) webrick (~> 1.8) BUNDLED WITH - 2.5.6 + 2.5.13 diff --git a/Rules b/Rules index ff6d847..e9fa425 100644 --- a/Rules +++ b/Rules @@ -31,10 +31,12 @@ compile "/**/*.haml" do write item.identifier.without_ext + ".html" end +require 'nanoc/dart_sass' + compile "/**/stylesheets/*.scss" do next if /^_/.match?(item.identifier.to_s.split("/").last) # pass partials nested in folders - filter :sass, syntax: :scss + filter :dart_sass, syntax: :scss filter :rainpress write item.identifier.without_ext end diff --git a/content/humans.txt b/content/humans.txt index 3b15f58..6d8cd41 100755 --- a/content/humans.txt +++ b/content/humans.txt @@ -1,6 +1,6 @@ /* TEAM - change this with your data */ - Jose Luis Salas - https://twitter.com/josacar - Omar Lopez - https://twitter.com/olopez + Jose Luis Salas - https://x.com/josacar + Omar Lopez - https://x.com/olopez Location: Valencia (Spain) /* THANKS */ diff --git a/content/past.haml b/content/past.haml index b8619b4..b0d4049 100755 --- a/content/past.haml +++ b/content/past.haml @@ -24,7 +24,7 @@ title: Los eventos anteriores %p = t[:name] - twitter_handle = t[:twitter] ? "@#{t[:twitter]}" : "" - %a{href: "https://twitter.com/#{t[:twitter]}", target: "_blank"} #{twitter_handle} + %a{href: "https://x.com/#{t[:twitter]}", target: "_blank"} #{twitter_handle} - f[:text].each do |t| %p= t diff --git a/content/stylesheets/all.css.scss b/content/stylesheets/all.css.scss index 187042c..f5dc601 100644 --- a/content/stylesheets/all.css.scss +++ b/content/stylesheets/all.css.scss @@ -207,6 +207,39 @@ a.partner { vertical-align: text-top; } +.twitter { + background: url(/images/ico_twitter.svg) no-repeat center left; + background-size: 16px; + display: inline-block; + padding-left: 20px; +} + +.youtube { + background: url(/images/ico_youtube.png) no-repeat top left; + width: 30px; + height: 30px; + display: inline-block; + margin-left: 5px; + vertical-align: text-top; +} + +.meetup { + background: url(/images/ico_meetup.png) no-repeat top left; + width: 30px; + height: 30px; + display: inline-block; + margin-left: 5px; + vertical-align: text-top; +} + +.github { + background: url(/images/ico_github.svg) no-repeat center left; + background-size: 16px; + display: inline-block; + margin-left: 5px; + padding-left: 20px; +} + .ico, .ir { border: 0; font: 0/0 a; diff --git a/data/default.yml b/data/default.yml index 79c470d..5ffd87d 100644 --- a/data/default.yml +++ b/data/default.yml @@ -4,4 +4,4 @@ meetup: - title: Espacio libre text: - ¿Tienes algo interesante que contar sobre temas de operaciones, desarrollo, infraestrucutura y administración de sistemas y te gustaría compartirlo con nosotros?

- - Envíanos un correo a valenciadevops@gmail.com o contáctanos por twitter + - Envíanos un correo a valenciadevops@gmail.com o contáctanos por twitter diff --git a/data/static.yml b/data/static.yml index eca520b..8c43abe 100644 --- a/data/static.yml +++ b/data/static.yml @@ -20,7 +20,7 @@ partner_name: "Flywire" partner_url: "https://www.flywire.com" partner_url_title: "Flywire" twitter_account: "valenciadevops" -twitter_url: "https://twitter.com/valenciadevops" +twitter_url: "https://x.com/valenciadevops" twitter_hashtag: "valenciadevops" # Index diff --git a/layouts/partials/_footer.haml b/layouts/partials/_footer.haml index 094d33e..f8dad5e 100644 --- a/layouts/partials/_footer.haml +++ b/layouts/partials/_footer.haml @@ -9,13 +9,15 @@ .middle %h3= data.static[:follow] %p - %a{href: data.static[:twitter_url], title: "#{data.static[:twitter_account]} on Twitter", target: "_blank"} @#{data.static[:twitter_account]} + %a{href: data.static[:twitter_url], title: "#{data.static[:twitter_account]} on Twitter", target: "_blank", class: "twitter" } @#{data.static[:twitter_account]} %p - %a{href: "https://twitter.com/search?q=%23#{data.static[:twitter_hashtag]}", title: "Hashtag ##{data.static[:twitter_hashtag]}", target: "_blank"} ##{data.static[:twitter_hashtag]} + %a{href: "https://x.com/search?q=%23#{data.static[:twitter_hashtag]}", title: "Hashtag ##{data.static[:twitter_hashtag]}", target: "_blank", class: "twitter" } ##{data.static[:twitter_hashtag]} %p %a{href: "https://www.youtube.com/@#{data.static[:twitter_account]}", title: "Youtube channel", target: "_blank"} #{data.static[:twitter_hashtag]} youtube %p %a{href: "https://www.meetup.com/valencia-devops", title: "Meetup group", target: "_blank"} valencia-devops meetup + %p + %a{href: "https://github.com/valenciadevops/valenciadevops.github.io", title: "Github", target: "_blank", class: "github" } Github .last %h3= data.static[:partner]