Skip to content

Commit

Permalink
Merge pull request #609 from massiveart/hotfix/auto-complete-loader-s…
Browse files Browse the repository at this point in the history
…tyle

Fixed back class overlapping
  • Loading branch information
danrot committed Mar 2, 2016
2 parents 1630a9d + 68e6fff commit 3ea5a24
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 24 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CHANGELOG for husky

* dev-master
* HOTFIX #609 Fixed input back class overlapping
* HOTFIX #607 Fixed data-attribute id for auto-complete
* ENHANCEMENT #606 Added data to retrieve event
* ENHANCEMENT #605 Added loader to indicate loading suggestions
Expand Down
32 changes: 14 additions & 18 deletions dist/husky.css
Original file line number Diff line number Diff line change
Expand Up @@ -8524,7 +8524,7 @@ a.btn-black, a.btn-highlight {
top: 0px;
right: 0px;
line-height: 20px;
padding: 5px 10px 0 5px;
margin: 5px 10px 0 5px;
background: #fff;
color: #999;
font-size: 16px;
Expand Down Expand Up @@ -8644,7 +8644,7 @@ a.btn-black, a.btn-highlight {
top: 0px;
right: 0px;
line-height: 20px;
padding: 5px 10px 0 5px;
margin: 5px 10px 0 5px;
background: #fff;
color: #999;
font-size: 16px;
Expand Down Expand Up @@ -9893,19 +9893,15 @@ a.btn-black, a.btn-highlight {
.auto-complete-list-container .tt-suggestions {
width: 100%;
}
/* line 36, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-container .back {
background: transparent;
}

/* line 41, ../scss/modules/auto-complete-list.scss */
/* line 37, ../scss/modules/auto-complete-list.scss */
.auto-complete-list {
border-radius: 3px;
background-color: #fff;
margin: 0;
border: 1px solid #ddd;
}
/* line 47, ../scss/modules/auto-complete-list.scss */
/* line 43, ../scss/modules/auto-complete-list.scss */
.auto-complete-list .husky-auto-complete {
background: none;
border-radius: 0;
Expand All @@ -9915,7 +9911,7 @@ a.btn-black, a.btn-highlight {
margin-bottom: -5px;
border: 0;
}
/* line 56, ../scss/modules/auto-complete-list.scss */
/* line 52, ../scss/modules/auto-complete-list.scss */
.auto-complete-list .husky-auto-complete input[type="text"] {
margin: 7px 10px 7px 0 !important;
padding: 0;
Expand All @@ -9928,7 +9924,7 @@ a.btn-black, a.btn-highlight {
float: left;
}

/* line 70, ../scss/modules/auto-complete-list.scss */
/* line 66, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-selection {
display: inline-block;
margin: 4px 5px 4px 0;
Expand All @@ -9940,20 +9936,20 @@ a.btn-black, a.btn-highlight {
line-height: 20px;
float: left;
}
/* line 81, ../scss/modules/auto-complete-list.scss */
/* line 77, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-selection .tm-tag-remove {
padding-left: 8px;
cursor: pointer;
text-decoration: none;
color: #262626;
font-size: 14px;
}
/* line 83, ../scss/modules/auto-complete-list.scss */
/* line 79, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-selection .tm-tag-remove::before {
content: "";
}

/* line 94, ../scss/modules/auto-complete-list.scss */
/* line 90, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-suggestions {
bottom: 0;
left: 0;
Expand All @@ -9963,20 +9959,20 @@ a.btn-black, a.btn-highlight {
-webkit-box-shadow: rgba(0, 0, 0, 0.06) 2px 2px 0px 0px;
box-shadow: rgba(0, 0, 0, 0.06) 2px 2px 0px 0px;
}
/* line 101, ../scss/modules/auto-complete-list.scss */
/* line 97, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-suggestions h5 {
margin: 0;
padding: 5px 8px;
border-bottom: 1px solid #e9e9e9;
color: #999999;
font-size: 12px;
}
/* line 109, ../scss/modules/auto-complete-list.scss */
/* line 105, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-suggestions ul {
padding: 8px 8px 15px;
margin: 0;
}
/* line 114, ../scss/modules/auto-complete-list.scss */
/* line 110, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-suggestions li {
display: inline-block;
margin-right: 5px;
Expand All @@ -9987,7 +9983,7 @@ a.btn-black, a.btn-highlight {
font-size: 12px;
cursor: pointer;
}
/* line 125, ../scss/modules/auto-complete-list.scss */
/* line 121, ../scss/modules/auto-complete-list.scss */
.auto-complete-list-suggestions .deactivated {
cursor: auto;
color: #999;
Expand Down Expand Up @@ -11576,7 +11572,7 @@ a.btn-black, a.btn-highlight {
top: 0px;
right: 0px;
line-height: 20px;
padding: 5px 10px 0 5px;
margin: 5px 10px 0 5px;
background: #fff;
color: #999;
font-size: 16px;
Expand Down
2 changes: 1 addition & 1 deletion dist/husky.min.css

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions scss/modules/auto-complete-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
.tt-suggestions {
width: 100%;
}

.back {
background: transparent;
}
}

.auto-complete-list {
Expand Down
2 changes: 1 addition & 1 deletion scss/modules/input.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
top: 0px;
right: 0px;
line-height: $inputHeight - 10px;
padding: 5px 10px 0 5px;
margin: 5px 10px 0 5px;
background: $white;
color: $grayLight;
font-size: 16px;
Expand Down

0 comments on commit 3ea5a24

Please sign in to comment.