Skip to content

Commit ba4a40d

Browse files
committed
Sync
1 parent 49cc28e commit ba4a40d

3 files changed

Lines changed: 3 additions & 80 deletions

File tree

src/app/_common/header/search/search.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
}
4343

4444
input {
45-
background-color: inherit;
45+
background-color: transparent;
4646
border: none;
4747
padding-left: 25px;
4848
height: 40px;

src/app/forms/forms-page.hbs

Lines changed: 1 addition & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,7 @@ page: forms
100100
<section class="section">
101101
<div class="row sameheight-container">
102102
<div class="col-md-6">
103-
<div class="card card-block">
104-
<div class="panel-title-block">
105-
<h3 class="title">
106-
Custom Bootstrap Checkboxes/Radios
107-
</h3>
108-
</div>
109-
110-
</div>
103+
{{> app/forms/input-groups/input-groups}}
111104
</div>
112105
<div class="col-md-6">
113106
<div class="card card-block">
@@ -165,75 +158,5 @@ page: forms
165158
</div>
166159
</div>
167160
</section>
168-
169-
{{!-- <section class="section">
170-
<div class="row sameheight-container">
171-
172-
<div class="col-md-6">
173-
{{> app/forms/basic-form/basic-form}}
174-
</div>
175-
176-
<div class="col-md-6">
177-
{{> app/forms/horizontal-form/horizontal-form}}
178-
</div>
179-
180-
</div>
181-
</section>
182-
183-
<section class="section">
184-
<div class="row sameheight-container">
185-
186-
<div class="col-md-6">
187-
{{> app/forms/input-types/input-types}}
188-
</div>
189-
190-
<div class="col-md-6">
191-
{{> app/forms/validation-form/validation-form}}
192-
</div>
193-
194-
</div>
195-
</section>
196-
197-
<section class="section">
198-
<div class="row sameheight-container">
199-
200-
<div class="col-md-6">
201-
{{> app/forms/boxed/boxed}}
202-
</div>
203-
204-
<div class="col-md-6">
205-
{{> app/forms/rounded/rounded}}
206-
</div>
207-
208-
</div>
209-
</section>
210-
211-
<section class="section">
212-
<div class="row sameheight-container">
213-
214-
<div class="col-md-6">
215-
{{> app/forms/radios/radios}}
216-
</div>
217-
218-
<div class="col-md-6">
219-
{{> app/forms/checboxes/checboxes}}
220-
</div>
221-
222-
</div>
223-
</section>
224-
225-
<section class="section">
226-
<div class="row sameheight-container">
227-
228-
<div class="col-md-6">
229-
{{> app/forms/selects/selects}}
230-
</div>
231-
232-
<div class="col-md-6">
233-
{{> app/forms/input-groups/input-groups}}
234-
</div>
235-
236-
</div>
237-
</section> --}}
238161
{{/content}}
239162
{{/extend}}

src/app/items/editor/item-editor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $(function(){
44
$('.images-container').sortable({
55
animation: 150, // ms, animation speed moving items when sorting, `0` — without animation
66
handle: ".control-btn.move", // Drag handle selector within list items
7-
filter: ".new", // Selectors that do not lead to dragging (String or Function)
7+
filter: ".image-container.new", // Selectors that do not lead to dragging (String or Function)
88
draggable: ".image-container" // Specifies which items inside the element should be sortable
99
});
1010

0 commit comments

Comments
 (0)