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

Update default bootstrap version to 4 (latest cdn) #746

Merged
merged 28 commits into from
May 15, 2018
Merged

Update default bootstrap version to 4 (latest cdn) #746

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c90eeac
Update bootstrap 3 to 4
ChangJoo-Park Apr 11, 2018
c9071e8
Update bootstrap 3 to 4 for ecr
ChangJoo-Park Apr 11, 2018
9cc98cd
Update for bootstrap 4, add row class div
ChangJoo-Park Apr 11, 2018
f13dd97
Add col-sm for bootstrap 4 row
ChangJoo-Park Apr 11, 2018
45aeb1e
#746 fix indentations
ChangJoo-Park Apr 12, 2018
06e7ff1
#746 Remove col-md-6 from index.slang.ecr
ChangJoo-Park Apr 12, 2018
0e78956
#746 change jquery-slim to jquery
ChangJoo-Park Apr 12, 2018
95457c5
#746 migrate pull-right to ml-auto for auth links
ChangJoo-Park Apr 12, 2018
3757408
#746 btn-xs to btn-sm. btn-xs is removed
ChangJoo-Park Apr 12, 2018
e98e61f
#746 btn-default has removed. change to btn-light
ChangJoo-Park Apr 12, 2018
156ea70
#746 update checkbox for bootstrap 4
ChangJoo-Park Apr 12, 2018
4a2a5c3
#746 vertical-align: middle; for bootstrap 4 tables
ChangJoo-Park Apr 12, 2018
600a273
#746 update alert classs for bootstrap 4
ChangJoo-Park Apr 12, 2018
a426e1b
#746 remove ml-auto, need to fix auth links are on the right side of …
ChangJoo-Park Apr 12, 2018
0feda91
#746 using only class and id for div
ChangJoo-Park Apr 12, 2018
06acf93
#746 fix checkbox template
ChangJoo-Park Apr 12, 2018
0d2903c
#746 remove checkbox class for testing
ChangJoo-Park Apr 12, 2018
c8d49a6
#746 FOR TEST update checkbox class
ChangJoo-Park Apr 12, 2018
ca90790
#746 Using only class name with div
ChangJoo-Park Apr 12, 2018
634b3ed
#746 pulling auth navigation item on the right side of navigation bar
ChangJoo-Park Apr 13, 2018
ad5b10b
Merge branch 'master' into bootstrap-4
robacarp Apr 13, 2018
e9dd38e
#746 replace indentation tab to spaces
ChangJoo-Park Apr 14, 2018
748b1b0
Merge branch 'master' into bootstrap-4
faustinoaq Apr 18, 2018
62a489e
Merge branch 'master' into bootstrap-4
ChangJoo-Park Apr 21, 2018
962c176
Merge branch 'master' into bootstrap-4
faustinoaq Apr 30, 2018
67438aa
Merge branch 'master' into bootstrap-4
faustinoaq May 12, 2018
8ca4070
Merge branch 'master' into bootstrap-4
robacarp May 14, 2018
c1bf89f
Merge branch 'master' into bootstrap-4
faustinoaq May 14, 2018
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
18 changes: 10 additions & 8 deletions src/amber/cli/templates/app/src/views/home/index.ecr.ecr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<div id="logo" class="col-sm-6"></div>
<div class="col-sm-6">
<h2><%= "<" %>%= t "welcome_to_amber" %></h2>
<p>Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed.</p>
<div class="list-group">
<a class="list-group-item list-group-item-action" target="_blank" href="https://docs.amberframework.org">Getting Started with Amber Framework</a>
<a class="list-group-item list-group-item-action" target="_blank" href="https://github.com/veelenga/awesome-crystal">List of Awesome Crystal projects and shards</a>
<a class="list-group-item list-group-item-action" target="_blank" href="https://crystalshards.xyz">What's hot in Crystal right now</a>
<div class="row">
<div id="logo" class="col-sm-6"></div>
Copy link
Contributor

Choose a reason for hiding this comment

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

:ditto: about the col-sm-6 class

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll do fix indents

<div class="col-sm-6">
<h2><%= "<" %>%= t "welcome_to_amber" %></h2>
<p>Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed.</p>
<div class="list-group">
<a class="list-group-item list-group-item-action" target="_blank" href="https://docs.amberframework.org">Getting Started with Amber Framework</a>
<a class="list-group-item list-group-item-action" target="_blank" href="https://github.com/veelenga/awesome-crystal">List of Awesome Crystal projects and shards</a>
<a class="list-group-item list-group-item-action" target="_blank" href="https://crystalshards.xyz">What's hot in Crystal right now</a>
</div>
</div>
</div>
17 changes: 9 additions & 8 deletions src/amber/cli/templates/app/src/views/home/index.slang.ecr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
div#logo.col-sm-6
div.col-sm-6
h2 = t "welcome_to_amber"
p Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed.
div.list-group
a.list-group-item.list-group-item-action target="_blank" href="https://docs.amberframework.org" Getting Started with Amber Framework
a.list-group-item.list-group-item-action target="_blank" href="https://github.com/veelenga/awesome-crystal" List of Awesome Crystal projects and shards
a.list-group-item.list-group-item-action target="_blank" href="https://crystalshards.xyz" What's hot in Crystal right now
div.row
div#logo.col-sm-6
div.col-sm-6
h2 = t "welcome_to_amber"
p Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed.
div.list-group
a.list-group-item.list-group-item-action target="_blank" href="https://docs.amberframework.org" Getting Started with Amber Framework
a.list-group-item.list-group-item-action target="_blank" href="https://github.com/veelenga/awesome-crystal" List of Awesome Crystal projects and shards
a.list-group-item.list-group-item-action target="_blank" href="https://crystalshards.xyz" What's hot in Crystal right now
19 changes: 11 additions & 8 deletions src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css">
<link rel="stylesheet" href="/dist/main.bundle.css">
<head>
<body>
Expand All @@ -19,11 +19,13 @@

<div class="container">
<div class="row">
<%="<"%>%- flash.each do |key, value| %>
<div class="alert alert-<%="<"%>%= key %>">
<p><%="<"%>%= flash[key] %></p>
</div>
<%="<"%>%- end %>
<div class="col-sm">
<%="<"%>%- flash.each do |key, value| %>
<div class="alert alert-<%="<"%>%= key %>">
<p><%="<"%>%= flash[key] %></p>
</div>
<%="<"%>%- end %>
</div>
</div>

<div class="row">
Expand All @@ -32,8 +34,9 @@
</div>
</div>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js"></script>
<script src="/dist/main.bundle.js"></script>
</body>
</html>
14 changes: 8 additions & 6 deletions src/amber/cli/templates/app/src/views/layouts/application.slang.ecr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ html
meta charset="utf-8"
meta http-equiv="X-UA-Compatible" content="IE=edge"
meta name="viewport" content="width=device-width, initial-scale=1"
link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css"
link rel="stylesheet" href="/dist/main.bundle.css"

body
Expand All @@ -15,13 +15,15 @@ html
== render(partial: "layouts/_nav.slang")
div.container
div.row
- flash.each do |key, value|
div class="alert alert-#{key}"
p = flash[key]
div.col-sm
- flash.each do |key, value|
div class="alert alert-#{key}"
p = flash[key]
div.row
div.col-sm-12.main
== content

script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"
script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js"
script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js"
script src="/dist/main.bundle.js"