From abd936242aa1e6d826b2be06b4b65861725a94cd Mon Sep 17 00:00:00 2001 From: Jeremy Lynch Date: Wed, 11 Jan 2017 07:23:12 +1000 Subject: [PATCH 1/5] Update overrides --- .../bootstrap4_and_overrides.css.scss | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss b/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss index f36e8b8..d61414e 100644 --- a/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss +++ b/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss @@ -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; @@ -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; +} From 72f0221207837f4559023aa19fbb7d3cbc164b71 Mon Sep 17 00:00:00 2001 From: Jeremy Lynch Date: Wed, 11 Jan 2017 07:25:43 +1000 Subject: [PATCH 2/5] Remove bootstrap4-forms.css.scss --- .../templates/bootstrap4-forms.css.scss | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 lib/generators/layout/install/templates/bootstrap4-forms.css.scss diff --git a/lib/generators/layout/install/templates/bootstrap4-forms.css.scss b/lib/generators/layout/install/templates/bootstrap4-forms.css.scss deleted file mode 100644 index 88b3918..0000000 --- a/lib/generators/layout/install/templates/bootstrap4-forms.css.scss +++ /dev/null @@ -1,38 +0,0 @@ - -// Styles for form views -// using Bootstrap 4 -// generated by the rails_layout gem -.authform { - padding-top: 30px; - max-width: 320px; - margin: 0 auto; -} -.authform form { - @extend .card; - @extend .col-md-9; - padding-bottom: 40px; - @extend .bg-faded; - @extend .small; -} -.authform .right { - float: right !important; -} -.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; -} From 685840de7f0f869f9be718f1b0094f44cd4b923a Mon Sep 17 00:00:00 2001 From: Jeremy Lynch Date: Wed, 11 Jan 2017 07:27:11 +1000 Subject: [PATCH 3/5] Updated navigation to v4 --- .../templates/bootstrap4-navigation.html.haml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml b/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml index 9620579..c1196bf 100644 --- a/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml +++ b/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml @@ -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"} - \ ☰ - #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' From a79fa43dab7f088b13e66a82f84499e8e012663a Mon Sep 17 00:00:00 2001 From: Jeremy Lynch Date: Wed, 11 Jan 2017 07:29:55 +1000 Subject: [PATCH 4/5] Updated Bootstrap-4 navigation slim --- .../templates/bootstrap4-navigation.html.slim | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim b/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim index 24caf15..eaac16a 100644 --- a/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim +++ b/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim @@ -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" - | ☰ - #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' + .collapse.navbar-collapse.justify-content-end + ul.navbar-nav = render 'layouts/navigation_links' From 8de947fb3d0d7c29155d69fcc354d664c78936aa Mon Sep 17 00:00:00 2001 From: Jeremy Lynch Date: Wed, 11 Jan 2017 07:31:51 +1000 Subject: [PATCH 5/5] Update navigation.erb --- .../templates/bootstrap4-navigation.html.erb | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb b/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb index e3a2035..f188f95 100644 --- a/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb +++ b/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb @@ -1,18 +1,14 @@ <%# navigation styled for Bootstrap 4.0 %> -
-
+