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

fix #91 input-groups class names #92

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix #91 input-groups class names #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
407445f
fix #91 input-groups class names
Mar 15, 2018
9ddc327
fix #93 - delete button margin at all
Mar 16, 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
2 changes: 1 addition & 1 deletion src/_common/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.btn {
background-image: none;
border-radius: 0;
margin-bottom: 5px;
/* margin-bottom: 5px; */
Copy link

Choose a reason for hiding this comment

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

rather delete than comment?

line-height: 1.2;

&,
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>
<div class="input-group-prepend">
<span class="input-group-text ">@</span>
</div>
<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>
<div class="input-group-append">
<span class="input-group-text">.00</span>
</div>
</div>

<div class="input-group">
<span class="input-group-addon">$</span>
<div class="input-group-prepend">
<span class="input-group-text">$</span>
</div>
<input type="text" class="form-control" placeholder="Some text here">
<span class="input-group-addon">.00</span>
<div class="input-group-append">
<span class="input-group-text">.00</span>
</div>
</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>
<div class="input-group-prepend">
<span class="input-group-text">@</span>
</div>
<input type="text" class="form-control" placeholder="Username">
</div>

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

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