Skip to content

Commit 62dfac5

Browse files
committed
WIP
1 parent 58f0b05 commit 62dfac5

24 files changed

+148
-112
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ gem 'slim' # view templating
3131
gem 'uglifier'
3232
gem 'webrick' # web server for capybara and local dev
3333
gem 'jsbundling-rails'
34+
gem 'cssbundling-rails'
3435

3536
group :development do
3637
gem 'better_errors' # improved error pages

Gemfile.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ GEM
141141
bigdecimal
142142
rexml
143143
crass (1.0.6)
144+
cssbundling-rails (1.4.0)
145+
railties (>= 6.0.0)
144146
date (3.3.4)
145147
debug_inspector (1.2.0)
146148
devise (4.9.3)
@@ -516,6 +518,7 @@ DEPENDENCIES
516518
capybara
517519
client_side_validations
518520
concurrent-ruby
521+
cssbundling-rails
519522
devise (>= 4.4.0)
520523
dotenv-rails
521524
factory_bot_rails

Procfile.dev

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
web: env RUBY_DEBUG_OPEN=true bin/rails server
22
js: yarn build --watch
3+
css: yarn build:css --watch

app/assets/builds/.keep

Whitespace-only changes.

app/assets/builds/application.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

app/assets/config/manifest.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Entry point for your Sass build

app/javascript/packs/application.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import 'regenerator-runtime/runtime';
2424
import "./application.css";
2525
import "./_pygment_monokai.sass";
2626
import * as Turbo from "@hotwired/turbo";
27+
import $ from 'jquery';
2728

2829
// temporarily disable turbo until we can resolve page scrolling bug on iPadOS
2930
Turbo.session.drive = false;
@@ -41,3 +42,5 @@ require('@client-side-validations/client-side-validations');
4142

4243
// custom javascripts used throughout the frontend of the site
4344
import './custom';
45+
import './photography';
46+
import './contact-me';

app/javascript/packs/photography.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ const createInfiniteScroll = (elem, masonry) => {
3939

4040
// build the Photoswipe gallery from the provided CSS selector
4141
const initPhotoSwipeFromDOM = function(gallerySelector) {
42-
4342
// parse slide data (url, title, size ...) from DOM elements
4443
// (children of gallerySelector)
4544
var parseThumbnailElements = function(el) {

app/views/home/_contact.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
</div>
1414
</div>
1515
<div class="bg-center bg-cover bg-no-repeat h-72 sm:h-64 md:h-72 lg:h-96"
16-
style="background-image: url(<%= asset_path("images/home/map.jpg") %>);"></div>
16+
style="background-image: url(<%= asset_path("packs/images/home/map.jpg") %>);"></div>

0 commit comments

Comments
 (0)