verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev 

* 'dev' of https://git.verdnatura.es/salix:
  dropdown: new style in -no more results-
This commit is contained in:
Carlos 2017-10-03 11:33:54 +02:00
parent 57b03790a3 5ef97c209d
commit d121517569
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/core/src/drop-down/drop-down.html
View File

@ -20,7 +20,7 @@
ng-if="$ctrl.loadMore" ng-if="$ctrl.loadMore"
class="dropdown__loadMore" class="dropdown__loadMore"
tabIndex="-1" tabIndex="-1"
ng-class="{'active': $ctrl.itemsFiltered.length === $ctrl.activeOption}" ng-class="{'active': $ctrl.itemsFiltered.length === $ctrl.activeOption, 'noMore' : !$ctrl.showLoadMore}"
ng-click="$ctrl.loadItems()" ng-click="$ctrl.loadItems()"
translate="{{$ctrl.showLoadMore ? 'Show More' : 'No more results'}}" translate="{{$ctrl.showLoadMore ? 'Show More' : 'No more results'}}"
></li> ></li>

5
client/core/src/drop-down/style.scss
View File

@ -39,6 +39,11 @@ vn-drop-down {
color: rgb(255,171,64); color: rgb(255,171,64);
font-weight: 700; font-weight: 700;
} }
&.dropdown__loadMore.noMore{
color:#424242;
font-weight: 700;
opacity: 0.7;
}
input[type=checkbox]{ input[type=checkbox]{
float: left; float: left;
margin: 5px 5px 0 0; margin: 5px 5px 0 0;