Skip to content

Updated for Bootstrap alpha 6 #34

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updated for Bootstrap alpha 6 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abd9362
Update overrides
jeremylynch Jan 10, 2017
72f0221
Remove bootstrap4-forms.css.scss
jeremylynch Jan 10, 2017
685840d
Updated navigation to v4
jeremylynch Jan 10, 2017
a79fa43
Updated Bootstrap-4 navigation slim
jeremylynch Jan 10, 2017
8de947f
Update navigation.erb
jeremylynch Jan 10, 2017
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
38 changes: 0 additions & 38 deletions lib/generators/layout/install/templates/bootstrap4-forms.css.scss
View file
Open in desktop

This file was deleted.

24 changes: 10 additions & 14 deletions lib/generators/layout/install/templates/bootstrap4-navigation.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
<%# navigation styled for Bootstrap 4.0 %>
<div class="container">
<nav class="navbar navbar-dark bg-inverse">
<ul class="nav navbar-nav clearfix">
<li class="nav-item">
<button class="navbar-toggler hidden-sm-up nav-link" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label="Toggle navigation">
&#9776;
</button>
</li>
</ul>
<div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
<%= link_to "Rails bootstrap", root_path, class: 'navbar-brand' %>
<ul class="nav navbar-nav">
<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
<div class="container">
<button aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation" class="navbar-toggler navbar-toggler-right" data-target="#navbarSupportedContent" data-toggle="collapse" type="button">
<span class="navbar-toggler-icon"></span>
</button>
<%= link_to 'Rails Bootstrap', root_path, class: 'navbar-brand' %>
<div class="collapse navbar-collapse justify-content-end">
<ul class="navbar-nav">
<%= render 'layouts/navigation_links' %>
</ul>
</div>
</nav>
</div>
</div>
</nav>
18 changes: 8 additions & 10 deletions lib/generators/layout/install/templates/bootstrap4-navigation.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
-# navigation styled for Bootstrap 3.0
.container
%nav.navbar.navbar-dark.bg-inverse
%ul.nav.navbar-nav.clearfix
%li.nav-item
%button.navbar-toggler.hidden-sm-up.nav-link{"aria-controls" => "exCollapsingNavbar2", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#exCollapsingNavbar2", "data-toggle" => "collapse", :type => "button"}
\ &#9776;
#exCollapsingNavbar2.collapse.navbar-toggleable-xs
= link_to "Rails bootstrap", root_path, class: 'navbar-brand'
%ul.nav.navbar-nav= render 'layouts/navigation_links'
-# navigation styled for Bootstrap v4 alpha 6
%nav.navbar.navbar-toggleable-md.navbar-light.bg-faded
.container
%button.navbar-toggler.navbar-toggler-right{"aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarSupportedContent", "data-toggle" => "collapse", :type => "button"}
%span.navbar-toggler-icon
= link_to "Rails Bootstrap", root_path, class: 'navbar-brand'
.collapse.navbar-collapse.justify-content-end
%ul.navbar-nav= render 'layouts/navigation_links'
17 changes: 7 additions & 10 deletions lib/generators/layout/install/templates/bootstrap4-navigation.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
/ navigation styled for Bootstrap 4.0
.container
nav.navbar.navbar-dark.bg-inverse
ul.nav.navbar-nav.clearfix
li.nav-item
button.navbar-toggler.hidden-sm-up.nav-link aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label=("Toggle navigation") data-target="#exCollapsingNavbar2" data-toggle="collapse" type="button"
| &#9776;
#exCollapsingNavbar2.collapse.navbar-toggleable-xs
= link_to "Rails bootstrap", root_path, class: 'navbar-brand'
ul.nav.navbar-nav
nav.navbar.navbar-toggleable-md.navbar-light.bg-faded
.container
button.navbar-toggler.navbar-toggler-right aria-controls="navbarSupportedContent", aria-expanded="false", aria-label=("Toggle navigation"), data-target="#navbarSupportedContent", data-toggle=>"collapse", type="button"
span.navbar-toggler-icon
= link_to Rails.configuration.site_title, root_path, class: 'navbar-brand'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

= link_to 'Rails Bootstrap', root_path, class: 'navbar-brand'

please :)

.collapse.navbar-collapse.justify-content-end
ul.navbar-nav
= render 'layouts/navigation_links'
41 changes: 39 additions & 2 deletions lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ img {
// to make views framework-neutral
.column {
@extend .col-md-6;
@extend .text-xs-center;
@extend .text-center;
}
.form {
@extend .col-md-6;
}
.form-centered {
@extend .col-md-6;
@extend .text-xs-center;
@extend .text-center;
}
.submit {
@extend .btn;
Expand All @@ -43,3 +43,40 @@ section {
@extend .row;
margin-top: 20px;
}

// Styles for form views
// using Bootstrap 4
// generated by the rails_layout gem
.authform {
@extend .mt-5; // margin-top
h3, p {
@extend .text-center
}
}
.authform form {
@extend .card;
@extend .card-block;
@extend .col-md-6;
@extend .offset-md-3;
@extend .mb-3;
@extend .bg-faded;
}
.authform .button {
@extend .btn;
@extend .btn-primary;
}
//.authform fieldset {
// @extend .card;
//}
#error_explanation:not(:empty) {
@extend .alert;
@extend .alert-danger;
}
#error_explanation h2 {
font-size: 16px;
}
.button-xs {
@extend .btn;
@extend .btn-primary;
@extend .btn-sm;
}