Skip to content

Update bootstrap version #115

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

Merged
merged 1 commit into from
Feb 27, 2019
Merged

Update bootstrap version #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"homepage": "https://github.com/modularcode/modular-admin-html",
"dependencies": {
"animate.css": "^3.5.2",
"bootstrap": "^4.0.0",
"bootstrap": "^4.3.1",
"dropzone": "^5.3.0",
"font-awesome": "^4.7.0",
"jquery": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/charts/charts-flot/charts-flot-page.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pagename: charts-flot
<div class="card-block">
<div class="card-title-block">
<h3 class="title">
Line Cahrt Example
Line Chart Example
</h3>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/app/dashboard/stats/stats.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h4>
<p class="title-description">
Website metrics for
<a href="http://modularteam.github.io/modularity-free-admin-dashboard-theme-html/">
<a href="https://modularcode.io/modular-admin-html/">
your awesome project
</a>
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/app/forms/checboxes/checboxes.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="card card-block">
<div class="title-block">
<h3 class="title">
Checkboxe Types
Checkbox Types
</h3>
</div>
<form role="form">
Expand Down
28 changes: 21 additions & 7 deletions src/app/forms/input-groups/input-groups.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,48 @@
<div class="form-group">
<label class="control-label">Input Text</label>
<div class="input-group">
<span class="input-group-addon">@</span>
<span class="input-group-prepend">
<span class="input-group-text">@</span>
</span>
<input type="text" class="form-control" placeholder="Some text here">
</div>
<div class="input-group">
<input type="text" class="form-control" placeholder="Some text here">
<span class="input-group-addon">.00</span>
<span class="input-group-append">
<span class="input-group-text">.00</span>
</span>
</div>

<div class="input-group">
<span class="input-group-addon">$</span>
<span class="input-group-prepend">
<span class="input-group-text">$</span>
</span>
<input type="text" class="form-control" placeholder="Some text here">
<span class="input-group-addon">.00</span>
<span class="input-group-append">
<span class="input-group-text">.00</span>
</span>
</div>
</div>
<div class="form-group">
<label class="control-label">Input Sizing</label>
<div class="input-group input-group-lg">
<span class="input-group-addon">@</span>
<span class="input-group-prepend">
<span class="input-group-text">@</span>
</span>
<input type="text" class="form-control" placeholder="Username">
</div>

<div class="input-group">
<span class="input-group-addon">@</span>
<span class="input-group-prepend">
<span class="input-group-text">@</span>
</span>
<input type="text" class="form-control" placeholder="Username">
</div>

<div class="input-group input-group-sm">
<span class="input-group-addon">@</span>
<span class="input-group-prepend">
<span class="input-group-text">@</span>
</span>
<input type="text" class="form-control" placeholder="Username">
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/app/forms/using-grid-form/using-grid-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
</div>
<form>
<div class="form-group row">
<label for="inputEmail3" class="col-sm-2 form-control-label">Email</label>
<div class="col-sm-10">
<label for="inputEmail3" class="col-sm-3 form-control-label">Email</label>
<div class="col-sm-9">
<input type="email" class="form-control" id="inputEmail3" placeholder="Email">
</div>
</div>
<div class="form-group row">
<label for="inputPassword3" class="col-sm-2 form-control-label">Password</label>
<div class="col-sm-10">
<label for="inputPassword3" class="col-sm-3 form-control-label">Password</label>
<div class="col-sm-9">
<input type="password" class="form-control" id="inputPassword3" placeholder="Password">
</div>
</div>
<div class="form-group row">
<div class="col-sm-offset-2 col-sm-10">
<div class="col-sm-offset-3 col-sm-9">
<button type="submit" class="btn btn-success">Sign in</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/auth/login/login-page.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ themeTitle: ModularAdmin
<button type="submit" class="btn btn-block btn-primary">Login</button>
</div>
<div class="form-group">
<p class="text-muted text-center">Do not have an account? <a href="signup.html">Sign Up!</a></p>
<p class="text-muted text-center">Do not have an account? <a href="signup.html">Sign Up</a></p>
</div>
</form>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/auth/reset/reset-page.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ themeTitle: ModularAdmin
<button type="submit" class="btn btn-block btn-primary">Reset</button>
</div>
<div class="form-group clearfix">
<a class="pull-left" href="login.html">return to Login</a>
<a class="pull-right" href="signup.html">Sign Up!</a>
<a class="pull-left" href="login.html">Return to Login</a>
<a class="pull-right" href="signup.html">Sign Up</a>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/auth/signup/signup-page.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ themeTitle: ModularAdmin
<button type="submit" class="btn btn-block btn-primary">Sign Up</button>
</div>
<div class="form-group">
<p class="text-muted text-center">Already have an account? <a href="login.html">Login!</a></p>
<p class="text-muted text-center">Already have an account? <a href="login.html">Login</a></p>
</div>
</form>
</div>
Expand Down