diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2021-02-27 01:02:28 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2021-02-27 01:02:28 +0300 |
commit | c43a4cb312942449be30a3d0abfe324dc9ae6980 (patch) | |
tree | 28a2ff4941c91d3429ca411321bfcea61d9f6192 | |
parent | db61cec2086ab576efc3e328b4e8a5fd06094bff (diff) |
Update test rails app view
-rw-r--r-- | bootstrap.gemspec | 2 | ||||
-rw-r--r-- | test/dummy_rails/app/assets/javascripts/application.js | 7 | ||||
-rw-r--r-- | test/dummy_rails/app/views/layouts/application.html.erb | 4 | ||||
-rw-r--r-- | test/dummy_rails/app/views/pages/root.html | 89 | ||||
-rw-r--r-- | test/dummy_rails/app/views/pages/root.html.slim | 58 | ||||
-rw-r--r-- | test/dummy_rails/config/application.rb | 3 |
6 files changed, 96 insertions, 67 deletions
diff --git a/bootstrap.gemspec b/bootstrap.gemspec index fcdcbd9..a2d57f3 100644 --- a/bootstrap.gemspec +++ b/bootstrap.gemspec @@ -31,8 +31,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'activesupport', '>= 4.1.5' s.add_development_dependency 'json', '>= 1.8.1' s.add_development_dependency 'sprockets-rails', '>= 2.3.2' - s.add_development_dependency 'jquery-rails', '>= 3.1.0' - s.add_development_dependency 'slim-rails' s.add_development_dependency 'uglifier' s.files = `git ls-files`.split("\n") diff --git a/test/dummy_rails/app/assets/javascripts/application.js b/test/dummy_rails/app/assets/javascripts/application.js index 0d95c77..8a6aac2 100644 --- a/test/dummy_rails/app/assets/javascripts/application.js +++ b/test/dummy_rails/app/assets/javascripts/application.js @@ -1,7 +1,8 @@ -//= require jquery //= require popper.js //= require bootstrap-sprockets -jQuery(function ($) { - $('[data-toggle="tooltip"]').tooltip() +document.addEventListener('DOMContentLoaded', () => { + for (const tooltipTriggerEl of document.querySelectorAll('[data-bs-toggle="tooltip"]')) { + new bootstrap.Tooltip(tooltipTriggerEl) + } }); diff --git a/test/dummy_rails/app/views/layouts/application.html.erb b/test/dummy_rails/app/views/layouts/application.html.erb index 4252061..4b54a58 100644 --- a/test/dummy_rails/app/views/layouts/application.html.erb +++ b/test/dummy_rails/app/views/layouts/application.html.erb @@ -1,14 +1,16 @@ <!DOCTYPE html> <html> <head> + <meta charset="utf-8"> <title>bootstrap Dummy App</title> + <meta name="viewport" content="width=device-width, initial-scale=1"> <%= stylesheet_link_tag 'application', media: "all", 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> </head> <body> <%= yield %> +<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> </body> </html> diff --git a/test/dummy_rails/app/views/pages/root.html b/test/dummy_rails/app/views/pages/root.html new file mode 100644 index 0000000..299466c --- /dev/null +++ b/test/dummy_rails/app/views/pages/root.html @@ -0,0 +1,89 @@ +<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" href="#" tabindex="-1" aria-disabled="true">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> + +<div class="container"> + <div class="row"> + <div class="card" style="width: 18rem;"> + <div class="card-body"> + <h5 class="card-title">Card title</h5> + <p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's + content.</p> + <a href="#" class="btn btn-primary">Go somewhere</a> + </div> + </div> + </div> + <div class="row"> + <div class="col-sm"> + <div class="card" style="width: 18rem;"> + <ul class="list-group list-group-flush"> + <li class="list-group-item">An item</li> + <li class="list-group-item">A second item</li> + <li class="list-group-item">A third item</li> + </ul> + </div> + </div> + <div class="col-sm"> + <div class="btn-group" role="group" aria-label="Basic mixed styles example"> + <button type="button" class="btn btn-danger">Left</button> + <button type="button" class="btn btn-warning">Middle</button> + <button type="button" class="btn btn-success">Right</button> + </div> + </div> + <div class="col-sm"> + <button type="button" class="btn btn-secondary" data-bs-toggle="tooltip" data-bs-placement="top" + title="Tooltip on top"> + Tooltip on top + </button> + <button type="button" class="btn btn-secondary" data-bs-toggle="tooltip" data-bs-placement="right" + title="Tooltip on right"> + Tooltip on right + </button> + <button type="button" class="btn btn-secondary" data-bs-toggle="tooltip" data-bs-placement="bottom" + title="Tooltip on bottom"> + Tooltip on bottom + </button> + <button type="button" class="btn btn-secondary" data-bs-toggle="tooltip" data-bs-placement="left" + title="Tooltip on left"> + Tooltip on left + </button> + </div> + </div> +</div> diff --git a/test/dummy_rails/app/views/pages/root.html.slim b/test/dummy_rails/app/views/pages/root.html.slim deleted file mode 100644 index 903f0af..0000000 --- a/test/dummy_rails/app/views/pages/root.html.slim +++ /dev/null @@ -1,58 +0,0 @@ -.navbar.navbar-dark.bg-inverse: .container-fluid - button.navbar-toggler.hidden-sm-up type="button" data-toggle="collapse" data-target="#c1" ☰ - .collapse.navbar-toggleable-xs#c1 - a.navbar-brand href="#" Bootstrap Test Rails App - ul.nav.navbar-nav - li.nav-item.active: a.nav-link href="#" - ' Home - span.sr-only (current) - li.nav-item: a.nav-link href="#" Link - li.nav-item.dropdown - a.nav-link.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false" - ' Dropdown - span.caret - .dropdown-menu role="menu" - a.dropdown-item href="#" Action - a.dropdown-item href="#" Another action - a.dropdown-item href="#" Something else here - a.dropdown-divider - a.dropdown-item href="#" Separated ank - a.dropdown-divider - a.dropdown-item href="#" One more separated link - -.container - .card - .card-header: h3 Dummy App - .card-block: .row - .col-sm-3 - h2 3 columns - .list-group - a.list-group-item href='#one' One - a.list-group-item href='#two' Two - a.list-group-item href='#three' Three - .col-sm-3 - h2 3 columns - .btn-group - button.btn.btn-primary type='button' Button - button.btn.btn-primary type='button' Button - table.table - caption Table - tr - td.table-danger Danger! - td.table-success Success! - .col-sm-6 - h2 6 columns - .row - .col-xs-4.col-xs-push-4: .card: .card-block - .card-text data-toggle="tooltip" title="hi" - h6 This is col-xs-4 col-xs-push-4.<br><small>Hover for tooltip.</small> - - .card: .card-block: form.form-inline - .form-group - label.sr-only for="exampleInputEmail2" Email address - input.form-control#exampleInputEmail2 type="email" placeholder="Enter email" - .checkbox - label - input type="checkbox" - | Remember me - button.btn.btn-default type="submit" Sign in diff --git a/test/dummy_rails/config/application.rb b/test/dummy_rails/config/application.rb index 4e1fea2..1a6ae46 100644 --- a/test/dummy_rails/config/application.rb +++ b/test/dummy_rails/config/application.rb @@ -11,11 +11,8 @@ require 'rails' end require 'autoprefixer-rails' -require 'slim-rails' require 'uglifier' - require 'bootstrap' -require 'jquery-rails' module Dummy class Application < Rails::Application |