From 81810c5af4db5d0566db1d446c95c5b58b20fdb9 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 15 Nov 2017 13:53:48 +0100 Subject: [PATCH] fixed loading indicator for both search forms --- .../materiobasemod/materio_search_api.module | 10 +- .../gui/materiobasetheme/css/styles.css | 15 +- .../themes/gui/materiobasetheme/js/script.js | 4 +- .../gui/materiobasetheme/js/script.min.js | 2 +- .../gui/materiobasetheme/scss/styles.scss | 141 ++++++++++-------- 5 files changed, 99 insertions(+), 73 deletions(-) diff --git a/sites/all/modules/gui/materiobasemod/materio_search_api.module b/sites/all/modules/gui/materiobasemod/materio_search_api.module index 266b911c..1a495a7d 100755 --- a/sites/all/modules/gui/materiobasemod/materio_search_api.module +++ b/sites/all/modules/gui/materiobasemod/materio_search_api.module @@ -718,9 +718,11 @@ function materio_search_api_search_form($form, &$form_state){ } $form['create'] = array( - '#type' => 'image_button', - '#src' => drupal_get_path('module', 'materio_search_api') . '/images/search.png', - '#value' => t('Search'), + '#type' => 'image_button', + '#src' => drupal_get_path('module', 'materio_search_api') . '/images/search.png', + '#value' => t('Search'), + '#prefix' => '
', + '#suffix'=> '
' ); // add a back to search/base home bouton if on explore/foo @@ -1110,6 +1112,8 @@ function materio_search_api_advanced_search_form($form, &$form_state){ '#title' => t('Search'), '#name' => "search", '#return_value' => "search", + '#prefix' => '
', + '#suffix'=> '
' ); }else{ diff --git a/sites/all/themes/gui/materiobasetheme/css/styles.css b/sites/all/themes/gui/materiobasetheme/css/styles.css index 7a984eab..40dcf907 100644 --- a/sites/all/themes/gui/materiobasetheme/css/styles.css +++ b/sites/all/themes/gui/materiobasetheme/css/styles.css @@ -3912,11 +3912,12 @@ body.home-v2 #main { background-position: 100% -15px; } .oldie #tool-bar #materio-search-api-search-form #edit-searchfield-autocomplete-aria-live { background-color: #1a1a1a; } - #tool-bar #materio-search-api-search-form input#edit-create { + #tool-bar #materio-search-api-search-form div.search-btn-wrapper { + display: inline-block; padding: 3px; } - #tool-bar #materio-search-api-search-form.loading { - background: transparent url("../img/ajax-loader.gif") no-repeat 98% center; } - #tool-bar #materio-search-api-search-form.loading input#edit-create { + #tool-bar #materio-search-api-search-form.loading div.search-btn-wrapper { + background: transparent url("../img/ajax-loader.gif") no-repeat center center; } + #tool-bar #materio-search-api-search-form.loading div.search-btn-wrapper input { visibility: hidden; } @media only screen and (max-width: 40em) { #tool-bar #materio-search-api-search-form input#edit-searchfield { @@ -3963,6 +3964,12 @@ body.home-v2 #main { margin: 0.4em 0 0.4em 0.4em; } #tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .add-filter { margin: 0.5em 0; } + #tool-bar #materio-search-api-advanced-search-form div.search-btn-wrapper { + display: inline-block; } + #tool-bar #materio-search-api-advanced-search-form.loading div.search-btn-wrapper { + background: transparent url("../img/ajax-loader.gif") no-repeat center center; } + #tool-bar #materio-search-api-advanced-search-form.loading div.search-btn-wrapper input { + visibility: hidden; } #center { border-radius: 10px; diff --git a/sites/all/themes/gui/materiobasetheme/js/script.js b/sites/all/themes/gui/materiobasetheme/js/script.js index 96014965..8b7a3b39 100644 --- a/sites/all/themes/gui/materiobasetheme/js/script.js +++ b/sites/all/themes/gui/materiobasetheme/js/script.js @@ -522,13 +522,13 @@ function onLoadingContent(event){ _$content.addClass('faded'); - $('#materio-search-api-search-form').addClass('loading'); + $('#materio-search-api-search-form, #materio-search-api-advanced-search-form').addClass('loading'); }; function onLoadedContent(event){ // trace('MaterioBaseTheme :: onLoadedContent',event); _$content.removeClass('faded'); - $('#materio-search-api-search-form').removeClass('loading'); + $('#materio-search-api-search-form, #materio-search-api-advanced-search-form').removeClass('loading'); }; function onResultsChanged(event){ diff --git a/sites/all/themes/gui/materiobasetheme/js/script.min.js b/sites/all/themes/gui/materiobasetheme/js/script.min.js index c9df27cd..4393c4ef 100644 --- a/sites/all/themes/gui/materiobasetheme/js/script.min.js +++ b/sites/all/themes/gui/materiobasetheme/js/script.min.js @@ -8,7 +8,7 @@ initDoubleSearchFormTabs();if(_isBreveMateriauNodePage) $.event.trigger({type:'resultschanged',container:'#content>.inner-content'});setTimeout(function(){$.event.trigger({type:'theme-ready'});},100);};function checkIE(){if($('.oldie body').size()&&!readCookie('oldie_checked')){setTimeout(function(){createCookie('oldie_checked',1);alert('Afin de profiter pleinement des fonctionalités de materio.com, nous vous invitons a mettre a jour votre navigateur dans ça denière version. Celui ci n\'étant pas compatible avec les technologie employer par materio.com, vous risquer de rencontrer des difficulter de navigation.');},4000);}};function initHistoryNav(){trace("initHistoryNav _History",_History);var state=_History.getState();_History.Adapter.bind(window,'statechange',onHistoryStateChange);$(document).bind('new-history-page',onNewHistoryPage);};function onNewHistoryPage(event){trace('theme :: onNewHistoryPage',event);var title=event.title.replace(/<(?:.|\n)*?>/gm,'')+' | '+_strings.site_name;_statePushed=true;_History.pushState({content:event.content,pagetitle:event.title},title,event.path);};function onHistoryStateChange(event){trace('theme :: onHistoryStateChange',event);var state=_History.getState();_History.log('statechange:',state.data,state.title,state.url);$.event.trigger({type:'record-stat',path:state.url});$('input[name=location]','#feedback-form').attr('value',state.url);$.event.trigger({type:'materio-page-title-refresh-block',title:state.data.pagetitle});if(!_statePushed){_statePushed=false;$('.inner-content',_$content).html(state.data.content);$.event.trigger('history-state-change');}};function initHome(){$('img.lazy','#block-materio-didactique-materio-didactique-home').each(function(){var $img=$(this);$img.attr('src',$img.attr('data-original'));});if(_max_768()){initHomeDidactiqueMobile();}else{initHomeDidactiqueDesktop();}};function initHomeDidactiqueMobile(){_$homeBlockDidactique=$('#block-materio-didactique-materio-didactique-home');$('.node-didactique',_$homeBlockDidactique).find('.field-name-title-field').bind('click',clickOnHomeDidactiqueTitle);};function clickOnHomeDidactiqueTitle(e){var $node=$(this).parent('.node-didactique');if($node.is('.opened')){$node.removeClass('opened');}else{$('.node-didactique',_$homeBlockDidactique).removeClass('opened');$node.addClass('opened');$('html,body').animate({scrollTop:$node.offset().top-$('#header').h()});}};function initHomeDidactiqueDesktop(){_$homeUtilities=$('#utilities');_$homeBlockDidactique=$('#block-materio-didactique-materio-didactique-home').append('
').append('
').bind('mouseenter',function(event){_hoverHomeDidactique=true;}).bind('mouseleave',function(event){_hoverHomeDidactique=false;});$('.node-didactique',_$homeBlockDidactique).each(function(index){if(index){$(this).addClass('op-hidden');}else{$(this).addClass('op-visible');} $('.field-name-title-field',this).clone().addClass(index?'':'active').click(function(event){$(this).addClass('active').siblings().removeClass('active');_$homeBlockDidactique.find('.node-didactique').removeClass('op-visible').addClass('op-hidden').eq(index).removeClass('op-hidden').addClass('op-visible');}).appendTo($('.tabs',_$homeBlockDidactique));}).appendTo($('.slides',_$homeBlockDidactique));if(!_touch){$(document).bind('scroll',function(event){if($(window).scrollTop()==0){if(_$homeUtilities.is('.closed')){_$homeUtilities.removeClass('closed');launchHomeDidactiqueInterval();initLayout();}}else{if(!_$homeUtilities.is('.closed')){_$homeUtilities.addClass('closed');clearInterval(_homeTimeInterval);initLayout();}}});} $(document).bind('cbox_complete',function(){clearInterval(_homeTimeInterval);}).bind('cbox_closed',function(){launchHomeDidactiqueInterval();});$('.side.oops a').click(function(event){event.preventDefault();window.location.href=$(this).attr('href');return false;});};function launchHomeDidactiqueInterval(){_homeTimeInterval=setInterval(function(){if(!_hoverHomeDidactique){var $next=$('.tabs .active',_$homeBlockDidactique).next();if(!$next.length) -$next=$('.tabs .active',_$homeBlockDidactique).siblings().eq(0);$next.trigger('click');}},15000);};function initHomeV2(){initCards('#home-v2 .panel-pane.news-panel .panel-col-first .views-row');$('.panel-pane.showroom .group-content-wrapper','#home-v2').attr('data-400-center-top','transform:translateX(-43em);opacity:0;').attr('data-100-center-center','transform[quadratic]:translateX(0em);opacity[quadratic]:1;').attr('data-top-bottom','transform[quadratic]:translateX(10em);');$('.panel-pane.showroom .field-name-field-bandeau img','#home-v2').attr('data-400-bottom-top','transform:translateY(-20em);').attr('data-200-top-bottom','transform:translateY(5em);');$('.panel-pane.bdd .group-content-wrapper','#home-v2').attr('data-400-center-top','transform:translateX(40em);opacity:0;').attr('data-200-center-center','transform[quadratic]:translateX(0em);opacity[quadratic]:1;');$('.panel-pane.bdd .field-name-field-bandeau img','#home-v2').attr('data-400-bottom-top','transform:translateX(0em);').attr('data-100-top-bottom','transform[quadratic]:translateX(-40em);');$('.panel-pane.news-panel .center-wrapper .panel-panel','#home-v2').each(function(i,e){$(this).attr('data-anchor-target',"#news-pane").attr('data--'+(i+1)*75+'-bottom-top','transform:translateY(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateY(0em);opacity:1;');});$('.panel-pane.formations .group-content-wrapper','#home-v2').attr('data-50-bottom-top','transform:translateX(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateX(0em);opacity:1;');$('.panel-pane.services .group-content-wrapper','#home-v2').attr('data-50-bottom-top','transform:translateX(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateX(0em);opacity:1;');$('.panel-pane.publication .views-row','#home-v2').each(function(i,e){$(this).attr('data--'+i*100+'-bottom-top','opacity:0;').attr('data-'+i*50+'-center-center','opacity:1;');});_skrollr=skrollr.init({skrollrBody:"root"});};function initLayout(){trace("initLayout");var height=$('#header').h()+$('#tasks').h();height+=$('#utilities').h();if(!$('html').is(".ie8")){$('#container').animate({'padding-top':height},300);}};function initInfinitScroller(){$.event.trigger({type:'init-scroller-pager',pager:$('ul.pager','#content')});$(document).bind('scroll',function(event){checkInfinitScroller();});};function checkInfinitScroller(){if($(window).scrollTop()+$(window).height()>getDocHeight()-200){infinitScrollPager();}};function infinitScrollPager(){if($('ul.pager','#content').length){var $nextpage=$('ul.pager .pager-current','#content').next(),href=$('a',$nextpage).attr('href');if(href){$.event.trigger({type:'record-stat',path:href});$.event.trigger({type:'load-scroller-pager',href:href});}}};function initEvents(){$(document).bind('init-layout',initLayout).bind('loading-content',onLoadingContent).bind('loaded-content',onLoadedContent).bind('resultschanged',onResultsChanged).bind('resultscompleted',onResultsCompleted).bind('mybookmarks-block-updated',onMybookmarksBlockUpdate).bind('mylists-block-builded',onMyListsBlockBuilded).bind('mylists-block-updated',onMyListsBlockUpdate).bind('flagGlobalAfterLinkUpdate',onAfterFlaging).bind('record-stat',onRecordStat).bind('view-mode-changed',onViewModeChanged).bind('ajax-register-block-loaded',onAjaxRegisterBlockLoaded);$(window).bind('resize',onResizeWindow);initFlagsEvent();$('#block-user-login h2, #block-menu-menu-top-menu h2').bind('click',function(event){event.preventDefault();$(this).parent('.block').toggleClass('hovered');$('.hovered').not($(this).parent('.block')).removeClass('hovered');return false;});$('#block-materio-search-api-materio-search-api-viewmode .viewmode-link').bind('vm-clicked-active',function(event){$(this).parents('.block').toggleClass('hovered');$('.hovered').not($(this).parents('.block')).removeClass('hovered');});$('#block-materio-search-api-materio-search-api-viewmode .viewmode-link').bind('vm-clicked',function(event){$(this).parents('.block').removeClass('hovered');$('.hovered').not($(this).parents('.block')).removeClass('hovered');});};function onLoadingContent(event){_$content.addClass('faded');$('#materio-search-api-search-form').addClass('loading');};function onLoadedContent(event){_$content.removeClass('faded');$('#materio-search-api-search-form').removeClass('loading');};function onResultsChanged(event){trace('MaterioBaseTheme :: onResultsChanged',event);$(document).scrollTop(0);focusCard($('#content .search-results, #content .actuality-items').children('.node:first-child'));onResultsCompleted(event);};function onResultsCompleted(event){checkInfinitScroller();if(event.container!=undefined){setTimeout(function(){initCards(event.container);setUpGrid(event.container);},100);}};function initCards(container){trace('theme :: initCards',container);var $container=$(container);$container.children('.node:not(.listened)').bind('mouseenter focused mousemove click mouseleave',onCardEventDispatcher).each(function(i){protectFigures(this);if(_isLoggedIn){if(!$container.is('.modal-content')){initPreview(this);}else{if(!$(this).is(":first-child")){var $closebtn=$('
');$closebtn.bind('click',function(){$(this).parents('.node-materiau').remove();});$('nav.nav',this).append($closebtn);}}}}).addClass('listened');};function setUpGrid(container){var $card,top,old_top,col=0,line=0;$(container).children('.node').each(function(i){$card=$(this);top=$card.offset().top;if(old_top!=top){line++;old_top=top;col=0;} +$next=$('.tabs .active',_$homeBlockDidactique).siblings().eq(0);$next.trigger('click');}},15000);};function initHomeV2(){initCards('#home-v2 .panel-pane.news-panel .panel-col-first .views-row');$('.panel-pane.showroom .group-content-wrapper','#home-v2').attr('data-400-center-top','transform:translateX(-43em);opacity:0;').attr('data-100-center-center','transform[quadratic]:translateX(0em);opacity[quadratic]:1;').attr('data-top-bottom','transform[quadratic]:translateX(10em);');$('.panel-pane.showroom .field-name-field-bandeau img','#home-v2').attr('data-400-bottom-top','transform:translateY(-20em);').attr('data-200-top-bottom','transform:translateY(5em);');$('.panel-pane.bdd .group-content-wrapper','#home-v2').attr('data-400-center-top','transform:translateX(40em);opacity:0;').attr('data-200-center-center','transform[quadratic]:translateX(0em);opacity[quadratic]:1;');$('.panel-pane.bdd .field-name-field-bandeau img','#home-v2').attr('data-400-bottom-top','transform:translateX(0em);').attr('data-100-top-bottom','transform[quadratic]:translateX(-40em);');$('.panel-pane.news-panel .center-wrapper .panel-panel','#home-v2').each(function(i,e){$(this).attr('data-anchor-target',"#news-pane").attr('data--'+(i+1)*75+'-bottom-top','transform:translateY(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateY(0em);opacity:1;');});$('.panel-pane.formations .group-content-wrapper','#home-v2').attr('data-50-bottom-top','transform:translateX(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateX(0em);opacity:1;');$('.panel-pane.services .group-content-wrapper','#home-v2').attr('data-50-bottom-top','transform:translateX(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateX(0em);opacity:1;');$('.panel-pane.publication .views-row','#home-v2').each(function(i,e){$(this).attr('data--'+i*100+'-bottom-top','opacity:0;').attr('data-'+i*50+'-center-center','opacity:1;');});_skrollr=skrollr.init({skrollrBody:"root"});};function initLayout(){trace("initLayout");var height=$('#header').h()+$('#tasks').h();height+=$('#utilities').h();if(!$('html').is(".ie8")){$('#container').animate({'padding-top':height},300);}};function initInfinitScroller(){$.event.trigger({type:'init-scroller-pager',pager:$('ul.pager','#content')});$(document).bind('scroll',function(event){checkInfinitScroller();});};function checkInfinitScroller(){if($(window).scrollTop()+$(window).height()>getDocHeight()-200){infinitScrollPager();}};function infinitScrollPager(){if($('ul.pager','#content').length){var $nextpage=$('ul.pager .pager-current','#content').next(),href=$('a',$nextpage).attr('href');if(href){$.event.trigger({type:'record-stat',path:href});$.event.trigger({type:'load-scroller-pager',href:href});}}};function initEvents(){$(document).bind('init-layout',initLayout).bind('loading-content',onLoadingContent).bind('loaded-content',onLoadedContent).bind('resultschanged',onResultsChanged).bind('resultscompleted',onResultsCompleted).bind('mybookmarks-block-updated',onMybookmarksBlockUpdate).bind('mylists-block-builded',onMyListsBlockBuilded).bind('mylists-block-updated',onMyListsBlockUpdate).bind('flagGlobalAfterLinkUpdate',onAfterFlaging).bind('record-stat',onRecordStat).bind('view-mode-changed',onViewModeChanged).bind('ajax-register-block-loaded',onAjaxRegisterBlockLoaded);$(window).bind('resize',onResizeWindow);initFlagsEvent();$('#block-user-login h2, #block-menu-menu-top-menu h2').bind('click',function(event){event.preventDefault();$(this).parent('.block').toggleClass('hovered');$('.hovered').not($(this).parent('.block')).removeClass('hovered');return false;});$('#block-materio-search-api-materio-search-api-viewmode .viewmode-link').bind('vm-clicked-active',function(event){$(this).parents('.block').toggleClass('hovered');$('.hovered').not($(this).parents('.block')).removeClass('hovered');});$('#block-materio-search-api-materio-search-api-viewmode .viewmode-link').bind('vm-clicked',function(event){$(this).parents('.block').removeClass('hovered');$('.hovered').not($(this).parents('.block')).removeClass('hovered');});};function onLoadingContent(event){_$content.addClass('faded');$('#materio-search-api-search-form, #materio-search-api-advanced-search-form').addClass('loading');};function onLoadedContent(event){_$content.removeClass('faded');$('#materio-search-api-search-form, #materio-search-api-advanced-search-form').removeClass('loading');};function onResultsChanged(event){trace('MaterioBaseTheme :: onResultsChanged',event);$(document).scrollTop(0);focusCard($('#content .search-results, #content .actuality-items').children('.node:first-child'));onResultsCompleted(event);};function onResultsCompleted(event){checkInfinitScroller();if(event.container!=undefined){setTimeout(function(){initCards(event.container);setUpGrid(event.container);},100);}};function initCards(container){trace('theme :: initCards',container);var $container=$(container);$container.children('.node:not(.listened)').bind('mouseenter focused mousemove click mouseleave',onCardEventDispatcher).each(function(i){protectFigures(this);if(_isLoggedIn){if(!$container.is('.modal-content')){initPreview(this);}else{if(!$(this).is(":first-child")){var $closebtn=$('
');$closebtn.bind('click',function(){$(this).parents('.node-materiau').remove();});$('nav.nav',this).append($closebtn);}}}}).addClass('listened');};function setUpGrid(container){var $card,top,old_top,col=0,line=0;$(container).children('.node').each(function(i){$card=$(this);top=$card.offset().top;if(old_top!=top){line++;old_top=top;col=0;} col++;$card.attr('column',col).attr('line',line);});};function onViewModeChanged(event){if(_isBreveMateriauNodePage){$.event.trigger('loading-content');var url=_settings.basePath+_settings.pathPrefix+'materio_search_api_ajax/node/'+_themeSettings.node_nid;$.getJSON(url,function(json){$.event.trigger('loaded-content');$('#content>.inner-content').html(json.node);$.event.trigger({type:'resultschanged',container:'#content>.inner-content'});});}};function onCardEventDispatcher(event){var vmode=event.currentTarget.className.match(/vm-([a-z|A-Z]+)/);var cf='on_'+event.type+'_card';var f='on_'+event.type+'_'+vmode[1];if(typeof _this[cf]=='function') _this[cf].call(this,event);if(typeof _this[f]=='function') _this[f].call(this,event);};MaterioBaseTheme.prototype.on_mousemove_card=function(event){focusCard($(this));};MaterioBaseTheme.prototype.on_mouseenter_cardsmall=function(event){showLazyLoadedImages(event.currentTarget);};MaterioBaseTheme.prototype.on_focused_cardsmall=function(event){v1=$(this);v2=v1.offset();_$tooltip.html($('.group-header',this).clone().addClass('smallcard')).css({top:v2.top,left:v2.left+5+($(this).w())}).removeClass('op-hidden').addClass('op-visible');};MaterioBaseTheme.prototype.on_mousemove_cardsmall=function(event){horiHoverImagesSwitcher(event);_$tooltip.css({top:event.pageY-_$tooltip.h()-5,left:event.pageX+5+($(this).w()-event.layerX)});};MaterioBaseTheme.prototype.on_mouseleave_cardsmall=function(event){$('.images img.op-visible',this).removeClass('op-visible').addClass('op-hidden').eq(0).removeClass('op-hidden').addClass('op-visible');if($(this).is('.focused')) diff --git a/sites/all/themes/gui/materiobasetheme/scss/styles.scss b/sites/all/themes/gui/materiobasetheme/scss/styles.scss index dc05d5a2..667ccfc2 100644 --- a/sites/all/themes/gui/materiobasetheme/scss/styles.scss +++ b/sites/all/themes/gui/materiobasetheme/scss/styles.scss @@ -1157,13 +1157,17 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom; } }; - input#edit-create{ + // input#edit-create{ + div.search-btn-wrapper{ + display: inline-block; padding: 3px; } &.loading{ - background: transparent url('../img/ajax-loader.gif') no-repeat 98% center; - input#edit-create{ visibility: hidden; } + div.search-btn-wrapper{ + background: transparent url('../img/ajax-loader.gif') no-repeat center center; + input{ visibility: hidden; } + } } @media #{$small-only}{ @@ -1189,72 +1193,83 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom; // // text-align: right; // } - #materio-search-api-advanced-search-form{ - >div{ + #materio-search-api-advanced-search-form{ + >div{ + position: relative; + #advancedsearch-filters, >.form-wrapper{ + display: inline-block; + vertical-align: top; + } + + >.form-wrapper{ position: relative; - #advancedsearch-filters, >.form-wrapper{ - display: inline-block; - vertical-align: top; + text-align: center; + >*{display:block;} + a.back-search-home{ + color:#000; + padding-top: 0.45em; + i:before{ + font-size:1.3em; + } } - - >.form-wrapper{ - position: relative; - text-align: center; - >*{display:block;} - a.back-search-home{ - color:#000; - padding-top: 0.45em; - i:before{ - font-size:1.3em; - } - } - #edit-search{ - margin: 1em 0 0.5em; - } + #edit-search{ + margin: 1em 0 0.5em; } } - - - #advancedsearch-filters{ - padding-right: 0.5em; - margin-right: 0.5em; - border-right: 1px solid #ccc; - - .filter-line{ - margin:0.3em 0; - padding-top:0.3em; - - &:not(:first-child){ - border-top: 1px solid #ccc; - } - .form-item{ - display:inline-block; - vertical-align: middle; - @include fs12; line-height:1; - // padding-right:3em; - text-transform: capitalize; - // min-width : 4em; - margin:0 0em 0 0; - } - - select{ - width:auto; - } - } - - .rm-btn{ - float: right; - margin:0.4em 0 0.4em 0.4em; - } - - .add-filter{ - margin:0.5em 0; - } - } - - } + + #advancedsearch-filters{ + padding-right: 0.5em; + margin-right: 0.5em; + border-right: 1px solid #ccc; + + .filter-line{ + margin:0.3em 0; + padding-top:0.3em; + + &:not(:first-child){ + border-top: 1px solid #ccc; + } + .form-item{ + display:inline-block; + vertical-align: middle; + @include fs12; line-height:1; + // padding-right:3em; + text-transform: capitalize; + // min-width : 4em; + margin:0 0em 0 0; + } + + select{ + width:auto; + } + } + + .rm-btn{ + float: right; + margin:0.4em 0 0.4em 0.4em; + } + + .add-filter{ + margin:0.5em 0; + } + } + + div.search-btn-wrapper{ + display: inline-block; + // padding: 3px; + } + + &.loading{ + div.search-btn-wrapper{ + background: transparent url('../img/ajax-loader.gif') no-repeat center center; + input{ visibility: hidden; } + } + } + + } + // } }