diff --git a/.gitignore b/.gitignore index 4aaf102..7e5db71 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,8 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +/app/assets/builds/* +!/app/assets/builds/.keep + +vendor/bundle diff --git a/Gemfile b/Gemfile index a7f333a..d216871 100644 --- a/Gemfile +++ b/Gemfile @@ -55,3 +55,5 @@ group :test do gem "capybara" gem "selenium-webdriver" end + +gem "tailwindcss-rails", "~> 3.0" diff --git a/Gemfile.lock b/Gemfile.lock index 1efd5fc..99a560f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -247,6 +247,10 @@ GEM stimulus-rails (1.3.4) railties (>= 6.0.0) stringio (3.1.1) + tailwindcss-rails (3.0.0) + railties (>= 7.0.0) + tailwindcss-ruby + tailwindcss-ruby (3.4.14-x86_64-linux) thor (1.3.2) timeout (0.4.1) turbo-rails (2.0.11) @@ -286,6 +290,7 @@ DEPENDENCIES sprockets-rails sqlite3 (>= 1.4) stimulus-rails + tailwindcss-rails (~> 3.0) turbo-rails tzinfo-data web-console diff --git a/Procfile.dev b/Procfile.dev new file mode 100644 index 0000000..da151fe --- /dev/null +++ b/Procfile.dev @@ -0,0 +1,2 @@ +web: bin/rails server +css: bin/rails tailwindcss:watch diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 5918193..338a0e8 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,2 +1,3 @@ //= link_tree ../images //= link_directory ../stylesheets .css +//= link_tree ../builds diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 8855c3f..b2dd0b1 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,44 +13,51 @@ *= require_tree . *= require_self */ +@import url('https://fonts.googleapis.com/css2?family=Fleur+De+Leah&display=swap'); +/* html, body { */ +/* margin: 0; */ +/* padding: 0; */ +/* height: 100%; */ +/* } */ -html, body { - margin: 0; - padding: 0; - height: 100%; -} +/* #container { */ +/* background-color: darkseagreen; */ +/* height: 100%; */ +/* } */ -#container { - background-color: darkseagreen; - height: 100%; -} +/* #navbar > ul { */ +/* list-style-type: none; */ +/* } */ +/* #navbar > ul > li { */ +/* float: left; */ +/* font-size: 1.25em; */ +/* margin-top: 16px; */ +/* margin-left: 30px; */ +/* color: cornsilk; */ +/* } */ -#navbar > ul { - list-style-type: none; -} -#navbar > ul > li { - float: left; - font-size: 1.25em; - margin-top: 16px; - margin-left: 30px; - color: cornsilk; -} +/* #logo { */ +/* font-size: 1.5em; */ +/* padding: 12px 20px; */ +/* float: left; */ +/* color: cornsilk; */ +/* } */ -#logo { - font-size: 1.5em; - padding: 12px 20px; - float: left; - color: cornsilk; -} +/* .nav-column-member { */ +/* float: left; */ +/* font-size: 1.25em; */ +/* padding: 16px 30px; */ +/* } */ -.nav-column-member { - float: left; - font-size: 1.25em; - padding: 16px 30px; -} +/* #main-content { */ +/* clear: left; */ +/* background-color: cornsilk; */ +/* height: 100%; */ +/* } */ -#main-content { - clear: left; - background-color: cornsilk; - height: 100%; + +.fleur-de-leah-regular { + font-family: "Fleur De Leah", cursive; + font-weight: 400; + font-style: normal; } diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css new file mode 100644 index 0000000..8666d2f --- /dev/null +++ b/app/assets/stylesheets/application.tailwind.css @@ -0,0 +1,13 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +/* + +@layer components { + .btn-primary { + @apply py-2 px-4 bg-blue-200; + } +} + +*/ diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 94ec8e1..ee6d531 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1 +1 @@ -

Hello, Rails!

+

Hello, Rails!

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3956cdd..534c0d0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - <%= content_for(:title) || "Weddingplan" %> + <%= content_for(:title) || "Jillian and Adam's Wedding" %> <%= csrf_meta_tags %> @@ -13,26 +13,40 @@ + <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %> <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> -
-