Moving to bootstrap 4 (#1021)

* moving to bootstrap 4 * fixed generated show page
gobuffalo · May 12, 2018 · 2ab4654 · 2ab4654
1 parent a2d9a62
commit 2ab4654
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/buffalo/cmd/new.go b/buffalo/cmd/new.go
@@ -30,7 +30,7 @@ var app = newapp.Generator{
 	CIProvider: "none",
 	AsWeb:      true,
 	Docker:     "multi",
-	Bootstrap:  3,
+	Bootstrap:  4,
 }
 
 var newCmd = &cobra.Command{

diff --git a/buffalo/cmd/updater/npm.go b/buffalo/cmd/updater/npm.go
@@ -27,7 +27,7 @@ func PackageJSONCheck(r *Runner) error {
 
 	g := newapp.Generator{
 		App:       r.App,
-		Bootstrap: 3,
+		Bootstrap: 4,
 	}
 
 	box := webpack.TemplateBox

diff --git a/buffalo/cmd/updater/webpack.go b/buffalo/cmd/updater/webpack.go
@@ -26,7 +26,7 @@ func WebpackCheck(r *Runner) error {
 
 	g := newapp.Generator{
 		App:       r.App,
-		Bootstrap: 3,
+		Bootstrap: 4,
 	}
 
 	box := webpack.TemplateBox

diff --git a/generators/assets/webpack/templates/assets/css/application.scss.tmpl b/generators/assets/webpack/templates/assets/css/application.scss.tmpl
@@ -1,7 +1,7 @@
-{{ if eq .opts.Bootstrap 4 -}}
-@import "~bootstrap/scss/bootstrap.scss";
-{{ else -}}
+{{ if eq .opts.Bootstrap 3 -}}
 @import "~bootstrap-sass/assets/stylesheets/_bootstrap-sprockets.scss";
 @import "~bootstrap-sass/assets/stylesheets/_bootstrap.scss";
+{{ else -}}
+@import "~bootstrap/scss/bootstrap.scss";
 {{ end -}}
 @import "~font-awesome/css/font-awesome.css";
diff --git a/generators/assets/webpack/templates/assets/js/application.js.tmpl b/generators/assets/webpack/templates/assets/js/application.js.tmpl
@@ -1,8 +1,8 @@
 require("expose-loader?$!expose-loader?jQuery!jquery");
-{{ if eq .opts.Bootstrap 4 -}}
-require("bootstrap/dist/js/bootstrap.bundle.js");
-{{ else -}}
+{{ if eq .opts.Bootstrap 3 -}}
 require("bootstrap-sass/assets/javascripts/bootstrap.js");
+{{ else -}}
+require("bootstrap/dist/js/bootstrap.bundle.js");
 {{ end -}}
 
 $(() => {

diff --git a/generators/assets/webpack/templates/package.json.tmpl b/generators/assets/webpack/templates/package.json.tmpl
@@ -5,10 +5,10 @@
   "license": "MIT",
   "repository": "github.com/gobuffalo/buffalo",
   "dependencies": {
-    {{ if eq .opts.Bootstrap 4 -}}
-    "bootstrap": "4.0.0",
-    {{ else -}}
+    {{ if eq .opts.Bootstrap 3 -}}
     "bootstrap-sass": "~3.3.7",
+    {{ else -}}
+    "bootstrap": "4.1.0",
     {{ end -}}
     "font-awesome": "~4.7.0",
     "jquery": "~3.2.1",

diff --git a/generators/newapp/templates/templates/application.html.tmpl b/generators/newapp/templates/templates/application.html.tmpl
@@ -5,10 +5,10 @@
     <meta charset="utf-8">
     <title>Buffalo - {{ .opts.Name.Title }}</title>
   {{- if not .opts.WithWebpack }}
-    {{- if eq .opts.Bootstrap 4 }}
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" crossorigin="anonymous">
-    {{- else }}
+    {{- if eq .opts.Bootstrap 3 }}
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    {{- else }}
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
     {{- end }}
   {{- end }}
     <%= stylesheetTag("application.css") %>

diff --git a/generators/resource/templates/templates/model-view-show.html.tmpl b/generators/resource/templates/templates/model-view-show.html.tmpl
@@ -3,9 +3,9 @@
 </div>
 
 <ul class="list-unstyled list-inline">
-  <li><a href="<%= {{.opts.Name.VarCasePlural}}Path() %>" class="btn btn-info">Back to all {{.opts.Model.ModelPlural}}</a></li>
-  <li><a href="<%= edit{{.opts.Name.Model}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingular}}.ID })%>" class="btn btn-warning">Edit</a></li>
-  <li><a href="<%= {{.opts.Name.VarCaseSingular}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingular}}.ID })%>" data-method="DELETE" data-confirm="Are you sure?" class="btn btn-danger">Destroy</a>
+  <li class="list-inline-item"><a href="<%= {{.opts.Name.VarCasePlural}}Path() %>" class="btn btn-info">Back to all {{.opts.Model.ModelPlural}}</a></li>
+  <li class="list-inline-item"><a href="<%= edit{{.opts.Name.Model}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingular}}.ID })%>" class="btn btn-warning">Edit</a></li>
+  <li class="list-inline-item"><a href="<%= {{.opts.Name.VarCaseSingular}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingular}}.ID })%>" data-method="DELETE" data-confirm="Are you sure?" class="btn btn-danger">Destroy</a>
 </ul>
 
 {{ range $p := .opts.Props -}}