Skip to content

Commit 9f2c407

Browse files
leoarnoldleoarnold
committed
Fix release build job
The CSS code for the `flipflop` web interface is generated by the rake tast `assets:compile`, hence it should not be commited to the repository at all, because its content depends on the actual versions of gems activated at build time. We therefore remove it and add it to `.gitignore`. Furthermore, in #40 the stylesheet file was renamed from `_flipflop.css` to `_flipflop.html.erb` which is problematic because - the file is not HTML - the file is not a template - the filename in `rake assets:compile` was not adjusted, so the generated content is now ignored and instead the commited content is used. We revert the renaming of the file and use `render(file: ...` to insert its contents into the view, thereby fixing all issues.
1 parent 1029813 commit 9f2c407

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

‎.gitignore

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
*.gem
22
.bundle
3+
app/views/flipflop/stylesheets/_flipflop.css
34
Gemfile.lock
4-
pkg/*
5-
tmp/*
5+
6+
pkg/
7+
tmp/

‎app/views/flipflop/stylesheets/.gitkeep

Whitespace-only changes.

‎app/views/flipflop/stylesheets/_flipflop.html.erb

-1
This file was deleted.

‎app/views/layouts/flipflop.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title><%= yield :title -%></title>
5-
<style><%= render partial: "flipflop/stylesheets/flipflop" %></style>
5+
<style><%= render(file: File.expand_path("../flipflop/stylesheets/_flipflop.css", __dir__)) %></style>
66
</head>
77
<body><%= yield -%></body>
88
</html>

0 commit comments

Comments
 (0)