-
Notifications
You must be signed in to change notification settings - Fork 205
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update bootstrap to version 4 (#746)
* Update bootstrap 3 to 4 * Update bootstrap 3 to 4 for ecr * Update for bootstrap 4, add row class div * Add col-sm for bootstrap 4 row * #746 fix indentations * #746 Remove col-md-6 from index.slang.ecr * #746 change jquery-slim to jquery * #746 migrate pull-right to ml-auto for auth links * #746 btn-xs to btn-sm. btn-xs is removed * #746 btn-default has removed. change to btn-light * #746 update checkbox for bootstrap 4 * #746 vertical-align: middle; for bootstrap 4 tables * #746 update alert classs for bootstrap 4 * #746 remove ml-auto, need to fix auth links are on the right side of navbar * #746 using only class and id for div * #746 fix checkbox template * #746 remove checkbox class for testing * #746 FOR TEST update checkbox class * #746 Using only class name with div * #746 pulling auth navigation item on the right side of navigation bar * #746 replace indentation tab to spaces
- Loading branch information
1 parent
76facd5
commit a557c82
Showing
23 changed files
with
123 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
form action="/posts" method="post" | ||
== csrf_tag | ||
div.form-group | ||
.form-group | ||
input.form-control type="text" name="title" placeholder="Title" value="hey you" | ||
div.form-group | ||
textarea.form-control rows="10" name="content" placeholder="Content" = "out there in the cold" | ||
button.btn.btn-primary.btn-xs type="submit" Submit | ||
a.btn.btn-default.btn-xs href="/posts" back | ||
.form-group | ||
textarea.form-control rows="10" name="content" placeholder="Content" = "out there in the cold" | ||
button.btn.btn-primary.btn-sm type="submit" Submit | ||
a.btn.btn-light.btn-sm href="/posts" back |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"></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> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
.row | ||
#logo | ||
.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. | ||
.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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
<%="<"%>%- if (current_<%= @name %> = context.current_<%= @name %>) %> | ||
<a class="nav-item pull-right" href="/signout">| Sign Out</a> | ||
<a class="nav-item nav-item-auth nav-item-auth-signout" href="/signout">| Sign Out</a> | ||
<%="<"%>%- active = context.request.path == "/profile" ? "active" : "" %> | ||
<a class="nav-item <%="<"%>%= active %> pull-right" href="/profile"><%="<"%>%= current_<%= @name %>.email %></a> | ||
<a class="nav-item nav-item-auth nav-item-auth-profile <%="<"%>%= active %>" href="/profile"><%="<"%>%= current_<%= @name %>.email %></a> | ||
<%="<"%>%- else %> | ||
<%="<"%>%- active = context.request.path == "/signup" ? "active" : "" %> | ||
<a class="nav-item <%="<"%>%= active %> pull-right" href="/signup">| Sign Up</a> | ||
<a class="nav-item nav-item-auth nav-item-auth-signup <%="<"%>%= active %>" href="/signup">| Sign Up</a> | ||
<%="<"%>%- active = context.request.path == "/signin" ? "active" : "" %> | ||
<a class="nav-item <%="<"%>%= active %> pull-right" href="/signin">| Sign In</a> | ||
<a class="nav-item nav-item-auth nav-item-auth-signin <%="<"%>%= active %>" href="/signin">| Sign In</a> | ||
<%="<"%>%- end %> |
8 changes: 4 additions & 4 deletions
8
src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
- if (current_<%= @name %> = context.current_<%= @name %>) | ||
a.nav-item.pull-right href="/signout" | ||
a.nav-item.nav-item-auth.nav-item-auth-signout href="/signout" | ||
| Sign Out | ||
- active = context.request.path == "/profile" ? "active" : "" | ||
a class="nav-item #{active} pull-right" href="/profile" | ||
a class="nav-item nav-item-auth nav-item-auth-profile #{active}" href="/profile" | ||
== current_<%= @name %>.email | ||
- else | ||
- active = context.request.path == "/signup" ? "active" : "" | ||
a class="nav-item #{active} pull-right" href="/signup" | ||
a class="nav-item nav-item-auth nav-item-auth-signup #{active}" href="/signup" | ||
| Sign Up | ||
- active = context.request.path == "/signin" ? "active" : "" | ||
a class="nav-item #{active} pull-right" href="/signin" | ||
a class="nav-item nav-item-auth nav-item-auth-signin #{active}" href="/signin" | ||
| Sign In |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<h1>Profile</h1> | ||
<p> | ||
<%="<"%>%= <%= @name %>.email %> | ||
<%="<"%>%= link_to("edit", "/profile/edit", class: "btn btn-success btn-xs") %> | ||
<%="<"%>%= link_to("edit", "/profile/edit", class: "btn btn-success btn-sm") %> | ||
</p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
h1 Profile | ||
p | ||
== <%= @name %>.email | ||
== link_to("edit", "/profile/edit", class: "btn btn-success btn-xs") | ||
== link_to("edit", "/profile/edit", class: "btn btn-success btn-sm") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters