Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install bootstrap #8

Merged
merged 8 commits into from
Apr 26, 2022
Merged

Install bootstrap #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0b1382
feat: yarn add bootstrap and popperjs/core
Michelle-Lohwt Apr 15, 2022
470d394
feat: import stylesheets from app/javascript/packs/*.js
Michelle-Lohwt Apr 15, 2022
f2aeb21
feat: import bootstrap to application.scss
Michelle-Lohwt Apr 15, 2022
9ae17ce
feat: import bootstrap to application.js
Michelle-Lohwt Apr 15, 2022
cee1a64
feat: add navbar styling
Michelle-Lohwt Apr 15, 2022
df56f57
fix: change extract_css to true
Michelle-Lohwt Apr 25, 2022
a7b9964
fix: remove stylesheet_link_tag
Michelle-Lohwt Apr 25, 2022
263747a
feat: remove Sprocket stylesheet application.css
Michelle-Lohwt Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions app/assets/stylesheets/application.css
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions app/javascript/packs/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ import "channels"
Rails.start()
Turbolinks.start()
ActiveStorage.start()

import "bootstrap"
import "../stylesheets/application"
1 change: 1 addition & 0 deletions app/javascript/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "bootstrap"
Michelle-Lohwt marked this conversation as resolved.
Show resolved Hide resolved
38 changes: 37 additions & 1 deletion app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,47 @@
<%= csrf_meta_tags %>
<%= csp_meta_tag %>

<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
Michelle-Lohwt marked this conversation as resolved.
Show resolved Hide resolved
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>

<body>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
<a class="navbar-brand" href="#">Navbar</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Dropdown
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
<li><a class="dropdown-item" href="#">Action</a></li>
<li><a class="dropdown-item" href="#">Another action</a></li>
<li><hr class="dropdown-divider"></li>
<li><a class="dropdown-item" href="#">Something else here</a></li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link disabled">Disabled</a>
</li>
</ul>
<form class="d-flex">
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success" type="submit">Search</button>
</form>
</div>
</div>
</nav>
<%= render 'layouts/messages' %>
<%= yield %>
</body>
Expand Down
2 changes: 1 addition & 1 deletion config/webpacker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ default: &default
cache_manifest: false

# Extract and emit a css file
extract_css: false
extract_css: true

static_assets_extensions:
- .jpg
Expand Down
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
"name": "alpha-blog",
"private": true,
"dependencies": {
"@popperjs/core": "^2.11.5",
"@rails/actioncable": "^6.1.5",
"@rails/activestorage": "^6.1.5",
"@rails/ujs": "^6.1.5",
"@rails/webpacker": "5.4.3",
"bootstrap": "^5.1.3",
"turbolinks": "^5.2.0",
"webpack": "^4.46.0",
"webpack-cli": "^3.3.12"
Michelle-Lohwt marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
10 changes: 10 additions & 0 deletions yarn.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.