From: Jakub Pawlowicz Date: Sun, 3 May 2015 11:09:50 +0000 (+0100) Subject: Fixes #551 - edge case in restructuring. X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=dd606460bac4b7f0a91318ced2e0d462dac87df4;p=clean-css.git Fixes #551 - edge case in restructuring. There was a bug in restructuring algorithm which allowed properties to be moved too high up by using multi property moves. This commit changes the behavior to drop a multi-property move on a first occasion, i.e. when one of properties with different value is encountered. --- diff --git a/History.md b/History.md index 31bec353..cbedfb7d 100644 --- a/History.md +++ b/History.md @@ -9,6 +9,11 @@ * Moves URL rebasing & rewriting into lib/urls. * Fixed issue [#436](https://github.com/jakubpawlowicz/clean-css/issues/436) - refactors URI rewriting. +[3.2.7 / 2015-xx-xx](https://github.com/jakubpawlowicz/clean-css/compare/v3.2.6...3.2) +================== + +* Fixed issue [#551](https://github.com/jakubpawlowicz/clean-css/issues/551) - edge case in restructuring. + [3.2.6 / 2015-04-28](https://github.com/jakubpawlowicz/clean-css/compare/v3.2.5...v3.2.6) ================== diff --git a/lib/selectors/optimizers/advanced.js b/lib/selectors/optimizers/advanced.js index f0981ba3..b4662d49 100644 --- a/lib/selectors/optimizers/advanced.js +++ b/lib/selectors/optimizers/advanced.js @@ -500,8 +500,44 @@ AdvancedOptimizer.prototype.restructure = function (tokens) { var key = movedProperty[4]; var toMove = movableTokens[key]; - if (toMove && toMove.length > 1) - shortenIfPossible(position, movedProperty); + if (toMove && toMove.length > 1) { + if (!shortenMultiMovesIfPossible(position, movedProperty)) + shortenIfPossible(position, movedProperty); + } + } + + function shortenMultiMovesIfPossible(position, movedProperty) { + var candidates = []; + var propertiesAndMergableTokens = []; + var key = movedProperty[4]; + var tokensToShorten = movableTokens[key]; + var j, k; + + movableLoop: + for (var value in movableTokens) { + var tokensList = movableTokens[value]; + + for (j = tokensToShorten.length - 1; j >= 0; j--) { + if (tokensList.indexOf(tokensToShorten[j]) == -1) + continue movableLoop; + } + + candidates.push(value); + } + + if (candidates.length < 2) + return false; + + for (j = candidates.length - 1; j >= 0; j--) { + for (k = movedProperties.length - 1; k >= 0; k--) { + if (movedProperties[k][4] == candidates[j]) { + propertiesAndMergableTokens.unshift([movedProperties[k], tokensToShorten]); + break; + } + } + } + + return processMultiPropertyMove(position, propertiesAndMergableTokens); } function processMultiPropertyMove(position, propertiesAndMergableTokens) { @@ -594,8 +630,11 @@ AdvancedOptimizer.prototype.restructure = function (tokens) { if (movedToBeDropped.indexOf(k) == -1 && !canReorderSingle(property, movedProperty) && !boundToAnotherPropertyInCurrrentToken(property, movedProperty, token)) { dropPropertiesAt(i + 1, movedProperty, token); - movedToBeDropped.push(k); - delete movableTokens[movedProperty[4]]; + + if (movedToBeDropped.indexOf(k) == -1) { + movedToBeDropped.push(k); + delete movableTokens[movedProperty[4]]; + } } if (!movedSameProperty) @@ -615,7 +654,8 @@ AdvancedOptimizer.prototype.restructure = function (tokens) { movedToBeDropped = movedToBeDropped.sort(naturalSorter); for (j = 0, m = movedToBeDropped.length; j < m; j++) { - movedProperties.splice(movedToBeDropped[j] - j, 1); + var dropAt = movedToBeDropped[j] - j; + movedProperties.splice(dropAt, 1); } } diff --git a/test/fixtures/960-min.css b/test/fixtures/960-min.css index 1450b834..b01f3d2b 100644 --- a/test/fixtures/960-min.css +++ b/test/fixtures/960-min.css @@ -1,4 +1,3 @@ -.clear,.clearfix:after,.clearfix:before{width:0;display:block;overflow:hidden;visibility:hidden} .clear,.clearfix:after{clear:both} .container_24{margin-right:auto;margin-left:auto;width:960px} .grid_1,.grid_10,.grid_11,.grid_12,.grid_13,.grid_14,.grid_15,.grid_16,.grid_17,.grid_18,.grid_19,.grid_2,.grid_20,.grid_21,.grid_22,.grid_23,.grid_24,.grid_3,.grid_4,.grid_5,.grid_6,.grid_7,.grid_8,.grid_9{display:inline;float:right;margin-right:5px;margin-left:5px} @@ -29,6 +28,7 @@ .container_24 .grid_22{width:870px} .container_24 .grid_23{width:910px} .container_24 .grid_24{width:950px} +.clear,.clearfix:after,.clearfix:before{display:block;overflow:hidden;visibility:hidden;width:0;height:0} .container_24 .prefix_1{padding-right:40px} .container_24 .prefix_2{padding-right:80px} .container_24 .prefix_3{padding-right:120px} @@ -121,6 +121,5 @@ .container_24 .pull_21{right:-840px} .container_24 .pull_22{right:-880px} .container_24 .pull_23{right:-920px} -.clear{height:0} -.clearfix:after,.clearfix:before{content:'\0020';height:0} +.clearfix:after,.clearfix:before{content:'\0020'} .clearfix{zoom:1} \ No newline at end of file diff --git a/test/fixtures/big-min.css b/test/fixtures/big-min.css index 0749e231..d73e8889 100644 --- a/test/fixtures/big-min.css +++ b/test/fixtures/big-min.css @@ -1,11 +1,10 @@ /*! normalize.css 2012-01-31T16:06 UTC - http://github.com/necolas/normalize.css */ small,sub,sup{font-size:75%} +button::-moz-focus-inner,input::-moz-focus-inner,legend{border:0;padding:0} .alpha,.ie .une_normale .liste_carre_999.liste_une .ie_impair,.liste_carre_999.liste_une li:nth-child(2n+3){clear:left} -.clear,.clearfix:after,.deplier{visibility:hidden} article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block} audio,canvas,video{display:inline-block} [hidden],audio:not([controls]){display:none} -.tt13_capital,.tt15_capital,.tt20,.tt24,.tt28,.tt32,.tt40{display:block} button,html,input,select,textarea{font-family:sans-serif} body,figure,form{margin:0} a:focus{outline:dotted thin} @@ -14,7 +13,6 @@ h1,h2,h3,h4,h5,h6{margin:0;font-weight:700} p{-webkit-margin-before:0;-webkit-margin-after:0} abbr[title]{border-bottom:1px dotted} b,strong{font-weight:700} -.tt13_capital,.tt15_capital,.tt20,.tt24,.tt26_capital,.tt28,.tt32,.tt40{font-weight:400} blockquote{margin:1em 40px} dfn{font-style:italic} mark{background:#ff0;color:#000} @@ -31,44 +29,42 @@ nav ol,nav ul{list-style:none} img{-ms-interpolation-mode:bicubic} svg:not(:root){overflow:hidden} fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em} -legend{border:0;padding:0;white-space:normal} +legend{white-space:normal} button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline} button,input{line-height:normal} -.tt28,.tt32,.tt40{line-height:105%} button,input[type=button],input[type=reset],input[type=submit]{cursor:pointer;-webkit-appearance:button} button[disabled],input[disabled]{cursor:default} .obf,a{cursor:pointer} input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0} input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box} input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none} -button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} textarea{overflow:auto;vertical-align:top} table{border-spacing:0;border-collapse:collapse} @font-face{font-family:TheSerifOffice;src:url(/medias/web/font/svg/TheSerifOffice-OT7_West.svgz#TheSerifOffice)format('svg');src:url(/medias/web/font/eot/TheSerifOffice-TT7_.eot);src:url(/medias/web/font/eot/TheSerifOffice-TT7_.eot?#iefix)format('embedded-opentype'),url(/medias/web/font/woff/TheSerifOffice-TT7_.woff)format('woff');font-weight:400;font-style:normal} @font-face{font-family:FetteEngschrift;src:url(/medias/web/font/eot/fetteengschrift.eot);src:url(/medias/web/font/eot/fetteengschrift.eot?#iefix)format('embedded-opentype'),url(/medias/web/font/woff/fetteengschrift.woff)format('woff');font-weight:400;font-style:normal} .global .bloc_bandeau .bandeau,.global .bloc_droit .bandeau{font-family:FetteEngschrift,'Arial Narrow',sans-serif} -.tt28,.tt32,.tt40{font-family:TheSerifOffice,georgia,serif} +.tt28,.tt32,.tt40{display:block;font-weight:400;line-height:105%;font-family:TheSerifOffice,georgia,serif} .tt40{font-size:4rem;margin:0 0 .5rem} .ie .tt40{font-size:40px;margin:0 0 .5px} .tt32{font-size:3.2rem} .ie .tt32{font-size:32px;margin:0 0 10px} .tt28{font-size:2.8rem;margin:0 0 1rem} .ie .tt28{font-size:28px;margin:0 0 10px} -.tt26_capital{font-size:2.6rem;line-height:120%;font-family:FetteEngschrift,'Arial Narrow',sans-serif;margin:0 0 .4rem;text-transform:uppercase} -.tt17,.tt17_capital,.tt20,.tt24{font-family:TheSerifOffice,georgia,serif} -.tt20,.tt24{line-height:105%} +.tt26_capital{font-size:2.6rem;line-height:120%;font-family:FetteEngschrift,'Arial Narrow',sans-serif;font-weight:400;margin:0 0 .4rem;text-transform:uppercase} +.tt20,.tt24{font-family:TheSerifOffice,georgia,serif;line-height:105%;font-weight:400} .ie .tt26_capital{font-size:26px;margin:0 0 4px} -.tt24{font-size:2.4rem;margin:0 0 .3rem} +.tt24{display:block;font-size:2.4rem;margin:0 0 .3rem} .ie .tt24{font-size:24px;margin:0 0 3px} -.tt20{font-size:2rem;padding:0 0 .3rem} +.tt20{display:block;font-size:2rem;padding:0 0 .3rem} +.tt13_capital,.tt15_capital,.tt17,.tt17_capital{display:block;line-height:120%;font-weight:400} .ie .tt20{font-size:20px;padding:0 0 3px} -.tt17,.tt17_capital{display:block;font-size:1.7rem;line-height:120%;font-weight:400;margin:0 0 .4rem} -.tt13_capital,.tt15_capital,.tt17_capital{font-family:FetteEngschrift,'Arial Narrow',sans-serif} -.tt17_capital{text-transform:uppercase;margin:0 0 4px} +.tt17,.tt17_capital{font-size:1.7rem;font-family:TheSerifOffice,georgia,serif;margin:0 0 .4rem} +.tt13_capital,.tt15_capital,.tt17_capital{text-transform:uppercase;font-family:FetteEngschrift,'Arial Narrow',sans-serif} +.tt17_capital{margin:0 0 4px} .ie .tt17,.ie .tt17_capital{font-size:17px} -.tt15_capital{font-size:1.5rem;line-height:120%;text-transform:uppercase} +.tt15_capital{font-size:1.5rem} .ie .tt15_capital{font-size:15px;margin:0 0 4px} -.tt13_capital{font-size:1.3rem;line-height:120%;margin:0 0 .4rem;text-transform:uppercase} +.tt13_capital{font-size:1.3rem;margin:0 0 .4rem} .txt10,.txt11,.txt12,.txt13_120,.txt13_140,.txt14_120,.txt14_140,.txt15_120,body{font-family:arial,sans-serif} .ie .tt13_capital{font-size:13px;margin:0 0 4px} .txt18{font-size:1.8rem;line-height:105%} @@ -89,7 +85,6 @@ table{border-spacing:0;border-collapse:collapse} .ie .txt10{font-size:10px} .container_18{margin:0 13px;width:974px} .grid_1,.grid_10,.grid_11,.grid_12,.grid_13,.grid_14,.grid_15,.grid_16,.grid_17,.grid_18,.grid_2,.grid_3,.grid_4,.grid_5,.grid_6,.grid_7,.grid_8,.grid_9{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;display:inline;float:left;position:relative;margin-left:8px;margin-right:8px} -.clear,.clearfix{display:block} .alpha{margin-left:0} .omega{margin-right:0;clear:right} .container_18 .grid_1{width:39px} @@ -110,6 +105,7 @@ table{border-spacing:0;border-collapse:collapse} .container_18 .grid_16{width:864px} .container_18 .grid_17{width:919px} .container_18 .grid_18{width:974px} +.clear,.clearfix:after{visibility:hidden;display:block;width:0;height:0} .container_18 .prefix_1{padding-left:55px} .container_18 .prefix_2{padding-left:110px} .container_18 .prefix_3{padding-left:165px} @@ -178,9 +174,10 @@ table{border-spacing:0;border-collapse:collapse} .container_18 .pull_15{left:-825px} .container_18 .pull_16{left:-880px} .container_18 .pull_17{left:-935px} -.clear{overflow:hidden;width:0;height:0} -.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;width:0;height:0} +.clear{overflow:hidden} +.clearfix:after{clear:both;content:' ';font-size:0;line-height:0} * html .clearfix{height:1%} +.clearfix{display:block} html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size:62.5%} body{font-size:1.3rem;font-size:13px;line-height:140%;color:#16212c;background:#e9edf0} .global{width:1000px;margin:0 auto;padding:20px 0 10px;background:#fff} @@ -260,8 +257,8 @@ img[width="202"]{margin-bottom:4px} .btn_abo{color:#000b15;background-color:#ffc600;background-image:-moz-linear-gradient(top,#ffe562,#ffc600);background-image:-ms-linear-gradient(top,#ffe562,#ffc600);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ffe562),to(#ffc600));background-image:-webkit-linear-gradient(top,#ffe562,#ffc600);background-image:-o-linear-gradient(top,#ffe562,#ffc600);background-image:linear-gradient(top,#ffe562,#ffc600);background-repeat:repeat-x;border-color:#ffc600;border-color:rgba(0,0,0,.1);filter:progid:dximagetransform.microsoft.gradient(enabled=false)} .btn.large{width:100%;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} .btn_petit{padding:2px 4px;font-size:11px;line-height:16px} -.btn:hover,.btn_abo:hover,.btn_fonce:hover,.btn_petit:hover{text-decoration:none;background-position:0 -15px;-o-transition:background-position .1s linear;transition:background-position .1s linear} -.btn:hover,.btn_abo:hover,.btn_fonce:hover,.btn_petit:hover,.conteneur_pagination .next:hover,.conteneur_pagination .prev:hover{-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-ms-transition:background-position .1s linear} +.btn:hover,.btn_abo:hover,.btn_fonce:hover,.btn_petit:hover{background-position:0 -15px;transition:background-position .1s linear} +.btn:hover,.btn_abo:hover,.btn_fonce:hover,.btn_petit:hover,.conteneur_pagination .next:hover,.conteneur_pagination .prev:hover{text-decoration:none;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-ms-transition:background-position .1s linear;-o-transition:background-position .1s linear} .btn:hover,.btn_petit:hover{color:#2e3942;background-color:#e6e6e6} .btn.active,.btn.disabled,.btn.disabled:hover,.btn:active,.btn[disabled],.btn_petit.active,.btn_petit:active,.btn_petit[disabled],input[type=submit].disabled{background-color:#e6e6e6;color:#d2d6db} .btn.disabled:hover,input[type=submit].disabled{background-image:none;background-color:#e6e6e6;cursor:default} @@ -335,14 +332,14 @@ button::-moz-focus-inner,input[type=submit]::-moz-focus-inner{padding:0;border:0 .nl_blanc{background-position:-26px -25px;width:14px;height:10px} .education .nl_blanc_bg{padding:2px 3px 1px;border-radius:2px;line-height:10px} .bloc_droit .bandeau .ico_annee_en_france{vertical-align:text-top} -.pic_commentes_abo,.pic_debrief_abo{margin:0 8px 0 0;vertical-align:text-bottom} .partage_ligne .intitule{display:inline-block;color:#747b83;font-weight:700} .filet_plus{border-top:1px solid #e9edf0;font-size:16px;line-height:1px;margin:20px 0;font-weight:700;text-align:center} .chevron_en_dur,.liste_horaire.liste_img_lien figcaption{font-weight:400} +.pic_commentes_abo,.pic_debrief_abo{display:inline-block;margin:0 8px 0 0;vertical-align:text-bottom} .filet_plus .bg_plus{background:#b9c0c5;padding:0 5px} .filet_plus .plus{color:#fff} -.pic_debrief_abo{display:inline-block;width:24px;height:24px;background:url(/medias/web/img/sprites/pictos_abos.png)0 -24px no-repeat} -.pic_commentes_abo{display:inline-block;height:23px;width:32px;background:url(/medias/web/img/sprites/pictos_abos.png)no-repeat} +.pic_debrief_abo{width:24px;height:24px;background:url(/medias/web/img/sprites/pictos_abos.png)0 -24px no-repeat} +.pic_commentes_abo{height:23px;width:32px;background:url(/medias/web/img/sprites/pictos_abos.png)no-repeat} .liste_bordure li{padding:8px 16px 6px;border-bottom:1px solid #eef1f5} .liste_chevron{display:block;padding:0 0 0 10px;position:relative} .chevron,.chevron_en_dur{display:inline-block} @@ -439,6 +436,7 @@ article .liste_carre_999{margin-top:5px} .global.revue_web .big_brother div+div{float:right;padding:16px 13px 0 0} .global.revue_web .bg{clear:both;height:130px;padding:8px 10px 6px;background:#fafbfc} .global.revue_web .vidberg{display:table-cell;width:335px;border-left:1px solid #eef1f5;padding-bottom:10px} +.fleuve .jour_parution,.global.supp_partenaires a{font-weight:700;display:block} .global.revue_web .vidberg ul{height:253px} .global.revue_web .vidberg li{height:33px} .global.revue_web .vidberg li:last-child{border-bottom:0} @@ -461,7 +459,6 @@ article .liste_carre_999{margin-top:5px} .global.supp_partenaires .position_pub div~div~div{width:330px} .global.supp_partenaires .position_pub div p+p{width:174px;float:left} .global.supp_partenaires .conteneur_img{float:left;margin:0 16px 0 0} -.global.supp_partenaires a{font-weight:700;display:block} .une_revolutionnaire .tt40{text-align:center} .une_revolutionnaire h1+p{margin:0 0 8px;text-align:center} .une_revolutionnaire .titres{margin:18px 0 8px} @@ -480,7 +477,7 @@ article .liste_carre_999{margin-top:5px} .fleuve .urgent .grid_1 .tt13_capital{padding:0 0 10px;border-bottom:1px solid #cb2626} .fleuve .conteneur_fleuve{background:#fff;margin-left:0;padding:0;width:605px} .fleuve .urgent .conteneur_fleuve{padding-top:10px} -.fleuve .jour_parution{background:#fff;display:block;padding:0 0 20px;color:#2e3942;text-transform:uppercase;font-weight:700} +.fleuve .jour_parution{background:#fff;padding:0 0 20px;color:#2e3942;text-transform:uppercase} .fleuve .atome{margin:0 0 10px} .fleuve .liens{margin:16px 0 0;color:#a2a9ae} .fleuve .liens>span:first-child{float:left} @@ -490,8 +487,9 @@ article .liste_carre_999{margin-top:5px} .fleuve .liens .permalien .invisible{width:210px} .fleuve .liens .partage{float:right} .fleuve blockquote{display:block;padding-left:16px;margin:20px 0;border-left:3px solid #b9c0c5;color:#5d666d} -.article .lire,.fleuve .lire{padding:8px 16px 6px;clear:both;background:#f8f9fb;border-left:1px solid #e4e6e9;font-weight:700;margin:20px 0} -.article .twit,.fleuve .twit{padding:8px 16px 6px;clear:both;overflow:hidden;background:#f8f9fb;border-left:3px solid #41c8f5;margin:20px 0;font-size:12px;line-height:18px} +.article .lire,.article .twit,.fleuve .lire,.fleuve .twit{padding:8px 16px 6px;clear:both;background:#f8f9fb;margin:20px 0} +.article .lire,.fleuve .lire{border-left:1px solid #e4e6e9;font-weight:700} +.article .twit,.fleuve .twit{overflow:hidden;border-left:3px solid #41c8f5;font-size:12px;line-height:18px} .article .twit .img,.fleuve .twit .img{float:left;width:58px} .article .twit img,.fleuve .twit img{margin-right:10px;border-radius:4px} .article .twit .texte_twit,.fleuve .twit .texte_twit{display:block;float:left;width:85%;margin:0} @@ -511,9 +509,10 @@ input[type=checkbox],input[type=radio]{vertical-align:bottom;margin-bottom:.2rem .confirmation .fermer{position:absolute;right:10px;top:10px;width:10px;height:10px;background:url(/medias/web/img/sprites/icos_petites.png)-22px -191px no-repeat;text-indent:-9999px;cursor:pointer} .bandeau_info_importante{padding:10px;background:#fff1ae;color:#c09853} .bandeau_important{padding:6px 16px;background:#d50303;color:#fff;font-weight:700} +.entete_abonnes,.entete_abonnes_bg{font-weight:700;display:block;color:#464f57} input[disabled=disabled]{background:#eef1f5} -.entete_abonnes{display:block;padding-top:8px;padding-bottom:9px;border-top:3px solid #ffd500;border-bottom:1px solid #e9edf0;color:#464f57;font-weight:700} -.entete_abonnes_bg{display:block;padding:4px 16px 2px;background:#ffd500;color:#464f57;font-weight:700} +.entete_abonnes{padding-top:8px;padding-bottom:9px;border-top:3px solid #ffd500;border-bottom:1px solid #e9edf0} +.entete_abonnes_bg{padding:4px 16px 2px;background:#ffd500} .rnd5{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px} .rnd4{-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;-o-border-radius:4px;border-radius:4px} .conteneur_autocompletion{position:relative} @@ -545,11 +544,11 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .ico_infographie_mini,.ico_live_mini,.ico_portfolio_mini,.ico_video_mini{display:inline-block;background-image:url(/medias/web/img/sprites/icos_medias.png)} .ico_portfolio_mini{width:17px;height:12px;margin:0 5px 0 0;background-position:-143px 0;vertical-align:baseline} .ico_infographie_mini{width:11px;height:10px;margin:0 5px 0 0;background-position:-143px -64px;vertical-align:baseline} -.ico_live_mini,.ico_video_mini{width:13px;height:13px;margin:1px 5px 0 0} -.ico_video_mini{background-position:-143px -128px;vertical-align:text-bottom} -.ico_live_mini{background-position:-143px -192px;vertical-align:text-bottom} +.ico_live_mini,.ico_video_mini{width:13px;height:13px;margin:1px 5px 0 0;vertical-align:text-bottom} +.ico_video_mini{background-position:-143px -128px} +.ico_live_mini{background-position:-143px -192px} .voir_plus.hovered{background:#f1f5f8;cursor:pointer} -.deplier{display:block;height:16px;margin:10px 0 0;text-indent:-9999px;background:url(/medias/web/img/pictos/chevrons_double_haut_bas.png)50% 3px no-repeat #e4e6e9;border-top:1px solid #a2a9ae} +.deplier{display:block;visibility:hidden;height:16px;margin:10px 0 0;text-indent:-9999px;background:url(/medias/web/img/pictos/chevrons_double_haut_bas.png)50% 3px no-repeat #e4e6e9;border-top:1px solid #a2a9ae} .deplier.visible{visibility:visible} .deplier.ouvert{background-position:50% -13px} .deplier:hover{cursor:pointer} @@ -557,7 +556,7 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .edito_ensemble_lien{cursor:pointer} .edito_ensemble_lien .double_chevron{display:inline-block;width:9px;height:9px;margin-left:10px;background:url(/medias/web/img/pictos/chevrons_double_haut_bas.png)no-repeat} .edito_ensemble_lien.resize_mini .double_chevron{transform:rotate(0);-ms-transform:rotate(0);-moz-transform:rotate(0);-webkit-transform:rotate(0);-o-transform:rotate(0);transition-property:transform;transition-duration:.5s;transition-timing-function:ease-in} -.edito_ensemble_lien.resize_maxi .double_chevron,.edito_ensemble_lien.resize_mini .double_chevron{-moz-transition-duration:.5s;-webkit-transition-timing-function:ease-in;-moz-transition-timing-function:ease-in;-webkit-transition-property:transform;-moz-transition-property:transform;-webkit-transition-duration:.5s} +.edito_ensemble_lien.resize_maxi .double_chevron,.edito_ensemble_lien.resize_mini .double_chevron{-webkit-transition-property:transform;-webkit-transition-duration:.5s;-webkit-transition-timing-function:ease-in;-moz-transition-property:transform;-moz-transition-duration:.5s;-moz-transition-timing-function:ease-in} .edito_ensemble_lien.resize_maxi .double_chevron{transform:rotate(180deg);-ms-transform:rotate(180deg);-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg);-o-transform:rotate(180deg);transition-property:transform;transition-duration:.5s;transition-timing-function:ease-in} .conteneur_onglets{height:35px;border:solid #d2d6db;border-width:0 0 1px} .conteneur_onglets .onglet{float:left;background:#fff;text-align:center} @@ -568,16 +567,16 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .conteneur_onglets .onglet.desactive>span{cursor:default;color:#b8c0c3} .conteneur_onglets .onglet.courant>a{font-weight:700;color:#2e3942;cursor:default} .lien_img314x64{display:block;width:314px;height:64px;margin-bottom:16px} -.abonne_cartouche44x12,.courrier72x21,.ea109x13,.ea_article,.huffington148x10,.telerama47x18{display:inline-block} .lien_img314x64:hover{opacity:.7;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"} -.abonne_cartouche44x12{width:44px;height:12px;margin:0 0 0 5px;background:url(/medias/web/img/elements_lm/abonne_cartouche44x12.png);text-indent:-9999px;font-size:13px;vertical-align:middle} -.ea109x13{width:109px;height:13px;background:url(/medias/web/img/elements_lm/edition_abonnes109x13.png);text-indent:-9999px;font-size:13px;vertical-align:baseline} -.logo_lm95x16,.logo_lm_abo95x16{display:inline-block;width:95px;height:16px;background:url(/medias/web/img/elements_lm/logo_lm95x16.png);text-indent:-9999px;font-size:13px;vertical-align:baseline} +.abonne_cartouche44x12{display:inline-block;width:44px;height:12px;margin:0 0 0 5px;background:url(/medias/web/img/elements_lm/abonne_cartouche44x12.png);text-indent:-9999px;font-size:13px;vertical-align:middle} +.ea109x13,.logo_lm95x16,.logo_lm_abo95x16{text-indent:-9999px;display:inline-block;font-size:13px;vertical-align:baseline} +.ea109x13{width:109px;height:13px;background:url(/medias/web/img/elements_lm/edition_abonnes109x13.png)} +.logo_lm95x16,.logo_lm_abo95x16{width:95px;height:16px;background:url(/medias/web/img/elements_lm/logo_lm95x16.png)} .logo_lm95x16{background:url(/medias/web/img/elements_lm/logo_lm95x16.png)0 -16px} -.ea_article{position:absolute;left:-18px;top:3px;width:55px;height:59px;text-indent:-9999px;background:url(/medias/web/img/elements_lm/marqueur_ea_article.png)} -.huffington148x10{width:148px;height:10px;text-indent:-9999px;background:url(/medias/web/img/groupe/logo_huffington149x10.png)} -.telerama47x18{width:47px;height:18px;text-indent:-9999px;background:url(/medias/web/img/groupe/logo_teleramafr47x18.png)} -.courrier72x21{width:72px;height:21px;text-indent:-9999px;background:url(/medias/web/img/groupe/logo_courrier72x21.png)} +.ea_article{position:absolute;left:-18px;top:3px;display:inline-block;width:55px;height:59px;text-indent:-9999px;background:url(/medias/web/img/elements_lm/marqueur_ea_article.png)} +.huffington148x10{display:inline-block;width:148px;height:10px;text-indent:-9999px;background:url(/medias/web/img/groupe/logo_huffington149x10.png)} +.telerama47x18{display:inline-block;width:47px;height:18px;text-indent:-9999px;background:url(/medias/web/img/groupe/logo_teleramafr47x18.png)} +.courrier72x21{display:inline-block;width:72px;height:21px;text-indent:-9999px;background:url(/medias/web/img/groupe/logo_courrier72x21.png)} .lien_img314x64.festival_cannes_une{background:url(/medias/web/img/evenementiel/festival_de_cannes_2012/widget_une.png);text-indent:-9999px} .lien_img314x64.legislatives_2012_une{background:url(/medias/web/img/evenementiel/legislatives_2012/widget_une.png);text-indent:-9999px} #en_ce_moment{height:33px;overflow:hidden;background:#2d3143;background:-moz-linear-gradient(top,#2d3143 0,#10141d 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#2d3143),color-stop(100%,#10141d));background:-webkit-linear-gradient(top,#2d3143 0,#10141d 100%);background:-o-linear-gradient(top,#2d3143 0,#10141d 100%);background:-ms-linear-gradient(top,#2d3143 0,#10141d 100%);background:linear-gradient(top,#2d3143 0,#10141d 100%)} @@ -601,7 +600,8 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .pagination_large{margin-top:10px} .pagination .adroite{float:right} .conteneur_pagination .next,.conteneur_pagination .prev{display:block;float:left;width:27px;height:26px;text-shadow:0 1px 1px rgba(255,255,255,.75);background-color:#fafafa;background-image:-webkit-gradient(linear,0 0,0 100%,from(#fefefe),color-stop(25%,#fefefe),to(#e4e6e9));background-image:-webkit-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:-moz-linear-gradient(left,#fefefe,#fefefe 25%,#e4e6e9);background-image:-ms-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:-o-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e6e9', GradientType=0);text-align:center;line-height:26px;font-size:15px;color:#2e3942} -.conteneur_pagination .next:hover,.conteneur_pagination .prev:hover{color:#2e3942;text-decoration:none;background-color:#e4e6e9;background-position:0 -15px;-o-transition:background-position .1s linear;transition:background-position .1s linear} +.pagination .page,.pagination .plus ul .page{text-align:center;line-height:26px;font-size:12px} +.conteneur_pagination .next:hover,.conteneur_pagination .prev:hover{color:#2e3942;background-color:#e4e6e9;background-position:0 -15px;transition:background-position .1s linear} #footer .obf:hover,#footer a:hover,#footer_services .entete .obf:hover{text-decoration:underline} .conteneur_pagination .prev{border-right:1px solid #d2d6db} .conteneur_pagination .next{border-left:1px solid #d2d6db;float:right} @@ -614,7 +614,7 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .pagination li{display:block;float:left} .pagination>li{background:#f8f9fb} .pagination>li:hover{background:#e4e6e9} -.pagination .page{border:solid #e4e6e9;border-width:0 0 0 1px;display:block;float:left;padding:0 9px;height:26px;border-left:1px solid #e4e6e9;text-align:center;line-height:26px;font-size:12px} +.pagination .page{border:solid #e4e6e9;border-width:0 0 0 1px;display:block;float:left;padding:0 9px;height:26px;border-left:1px solid #e4e6e9} .pagination>li>a,.pagination>li>span{color:#5d666d} .pagination .page.actif{height:28px;margin-top:-1px;padding-top:1px;background:#fff;border-color:#fff;color:#b9c0c5} .pagination .plus{position:relative} @@ -626,7 +626,7 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .pagination .plus .pointeur{display:block;height:12px;background:url(/medias/web/img/pictos/pagination_fle.png)554px 0 no-repeat} .pagination_large .plus .pointeur{background-position:884px 0} .pagination .plus:hover div{display:block} -.pagination .plus ul .page{border:solid #b9c0c5;border-width:0 1px 0 0;text-align:center;line-height:26px;font-size:12px;color:#fff} +.pagination .plus ul .page{border:solid #b9c0c5;border-width:0 1px 0 0;color:#fff} .toute-l-actualite{color:#d2d6db;padding:13px 13px 0;font-size:11px;line-height:120%} .toute-l-actualite h2,.toute-l-actualite h3{display:inline;font-size:11px;font-weight:400} #footer_services{overflow:hidden;padding:16px 13px 0;width:974px;margin:16px auto 50px;font-size:11px;text-align:left;background:#fff} @@ -663,7 +663,6 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} #footer,.ie #footer{font-size:11px} #footer_services .liste_tv .logo+p b{display:block;font-size:11px} #footer_services .liste_tv .logo,#footer_services .liste_tv .note{display:inline-block;margin:0 5px 0 0;width:47px;height:27px;background:url(/medias/web/img/sprites/tv.png)no-repeat;text-indent:-9999px;vertical-align:baseline} -.article .toolbar,.conteneur_ligatus *{vertical-align:bottom} #footer_services .liste_tv .note{float:left;margin-top:2px} #footer_services .liste_tv .logo_france_2{background-position:0 -28px} #footer_services .liste_tv .logo_france_3{background-position:0 -56px} @@ -727,6 +726,7 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .col_droite .position_pub.filled{margin-bottom:25px;padding:7px 7px 13px;background:url(/medias/web/img/textes/marqueur_pub_col_droite.png)bottom right no-repeat #e9edf0} .col_droite .position_pub.filled.noborder{background:0 0;padding:0} .conteneur_ligatus{margin:25px 0} +.conteneur_ligatus *{vertical-align:bottom} .conteneur_carrousel{position:relative;overflow:hidden;height:321px} .carrousel{width:6000px;position:relative} .carrousel .elt{width:644px;float:left;position:relative} @@ -818,7 +818,6 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} #header .acces_compte .avatar{width:28px;border-right:1px solid #d2d6db} #header .acces_compte .avatar img{display:block;margin:4px auto 0;vertical-align:middle} #header .acces_compte .nom{padding:0 16px;border-right:1px solid #d2d6db;border-left:1px solid #fff} -.loginbox .abonne_journal,.loginbox .signup{line-height:140%;font-size:14px;border-left:1px solid #e4e6e9} #header .acces_compte .fle{width:28px;background:url(/medias/web/img/pictos/fle_bas_noir7x4.png)50% 50% no-repeat} #header .acces_compte ul{position:absolute;right:0;top:29px;width:98%;background:#fff;list-style-type:none;text-align:left;display:none;border:1px solid #d2d6db;border-radius:0 0 3px 3px} #header .acces_compte:hover ul{display:block} @@ -845,13 +844,14 @@ label i{font-style:normal;display:none} .saisie_erreur label i{display:inline} .boite_formulaire .erreur{display:none} .loginbox .back{padding:0 15px;line-height:4rem;border-top:1px solid #d2d6db} +.loginbox .abonne_journal,.loginbox .signup{float:left;font-size:14px;line-height:140%;border-left:1px solid #e4e6e9} .loginbox #login_error_email{background:#f2dede;border:1px solid #c00;color:#c00;text-align:center} -.loginbox .signup{float:left;width:180px;height:230px;padding:10px 40px 10px 15px;border-right:1px solid #fff} +.loginbox .signup{width:180px;height:230px;padding:10px 40px 10px 15px;border-right:1px solid #fff} .loginbox .accroche{display:block;margin:20px 0 15px;color:#464f57} -.loginbox .abonne_journal{position:relative;float:left;width:185px;height:235px;padding:10px 55px 10px 16px;background:url(/medias/web/img/elements_lm/login_box_journal.jpg)right 130px no-repeat} +.loginbox .abonne_journal{position:relative;width:185px;height:235px;padding:10px 55px 10px 16px;background:url(/medias/web/img/elements_lm/login_box_journal.jpg)right 130px no-repeat} .loginbox .abonne_journal .btn,.loginbox .login_form .btn_abo{position:absolute;bottom:15px;left:16px} -#ariane_az .suite_entrees,#nav_ariane .az{position:absolute;left:-9999px} .loginbox .rmdp .btn{position:static;margin:15px 0} +#ariane_az .suite_entrees,#nav_ariane .az{position:absolute;left:-9999px} .loginbox #password_recover_box_email{width:300px} .rmdp{padding:0 15px} #barre_titre{background:#fff;text-align:center;padding:10px 0} @@ -925,7 +925,6 @@ label i{font-style:normal;display:none} #ariane_az #sn,#ariane_az #sn .navlist{border:0} #ariane_az #sn{margin:0;background:#fff;border:solid #e4e6e9;border-width:0 0 1px} #ariane_az #sn .navlist li{border-style:solid;border-color:#fff;border-width:0 0 0 1px} -.grid_12 .bloc_base,.voir_aussi{border:solid #eef1f5;border-width:0 1px 1px} #ariane_az #sn .navlist li:first-child{display:none} #ariane_az #sn .navlist li:hover,#ariane_az #sn .navlist li:hover+li{border-color:#eef1f5} #ariane_az #sn .navlist li a{height:28px;line-height:28px;padding:0 8px;font-size:12px;border:0} @@ -964,6 +963,7 @@ label i{font-style:normal;display:none} .article_normal .illustration_haut figcaption .lien_interne{color:#fff} .article .auteur,.liste_reactions .btn span,.liste_reactions .intitule span{color:#747b83} .article_normal .illustration_haut img{border:none} +.grid_12 .bloc_base,.voir_aussi{border:solid #eef1f5;border-width:0 1px 1px} .liste_reactions{padding-top:10px;border-top:3px solid #ffd500} .liste_reactions .intitule{float:left;font-weight:700} .liste_reactions .entete{height:38px;padding:0 0 10px} @@ -1009,6 +1009,7 @@ label i{font-style:normal;display:none} .reaction_redaction .signature .alerte{display:none;float:right;width:170px;margin:5px 0 0;color:#464f57} .liste_reactions .regles_conduite{margin:20px 0 0} .liste_reactions .bloc_readaction ul{list-style-type:disc;margin:10px 15px;font-size:13px} +.voir_aussi,.voir_aussi .az{font-weight:700;font-size:12px} .grid_12 .bloc_base{margin:0 0 25px} .grid_12 .bloc_base .entete{border-top:3px solid #16212c;display:block;padding:8px 16px 6px;font-weight:700} .grid_12 .bloc_base .contenu{padding:0 16px} @@ -1017,17 +1018,17 @@ label i{font-style:normal;display:none} .meme_sujet .liste_chevron li{padding:8px 0} .meme_sujet .entete_exclu_abonnes{margin:8px 0} .meme_sujet .bt{margin:8px 0 0;text-align:center} -.voir_aussi{overflow:hidden;clear:both;margin:0 0 25px;color:#a2a9ae;font-weight:700;font-size:12px} +.voir_aussi{overflow:hidden;clear:both;margin:0 0 25px;color:#a2a9ae} .voir_aussi .entrees_visible{overflow:hidden} .voir_aussi .intitule{float:left;padding:7px 9px 0} .voir_aussi .entrees{float:left;width:400px;height:33px;line-height:33px;padding:2px 0 0;overflow:hidden} .voir_aussi .obf,.voir_aussi a,.voir_aussi span{padding:0 9px;color:#a2a9ae} .voir_aussi .obf:hover,.voir_aussi a:hover{color:#464f57} -.voir_aussi .az{float:right;padding:10px 3px 10px 10px;height:15px;font-size:12px;line-height:12px;font-weight:700} +.voir_aussi .az{float:right;padding:10px 3px 10px 10px;height:15px;line-height:12px} .voir_aussi .az span{padding:0} .voir_aussi .suite_entrees p{border-top:1px solid #eef1f5;width:100%} .fenetre{padding:10px 16px;background:#f8f9fb;border:1px solid #eef1f5;color:#16212c;margin:0 0 25px} -.article .toolbar{display:block;min-height:30px;margin:0 0 13px;overflow:hidden} +.article .toolbar{display:block;min-height:30px;vertical-align:bottom;margin:0 0 13px;overflow:hidden} .barre_outils{postion:relative;height:28px;border:solid #eef1f5;border-width:1px 0;line-height:27px;font-size:11px;font-weight:700} .barre_outils .bt_abo{float:left;height:22px;margin:-1px 4px 0 0;border:solid #ca0;border-width:1px 0;font-size:10px;line-height:11px;color:#650} .barre_outils span{display:inline-block;color:#747b83} @@ -1261,7 +1262,6 @@ label i{font-style:normal;display:none} .conteneur_lives .live.petit .bandeau:hover{background-color:#fe2f2f;background-position:0 -25px;-webkit-transition:background-position .06s linear;-moz-transition:background-position .06s linear;-ms-transition:background-position .06s linear;-o-transition:background-position .06s linear;transition:background-position .06s linear;cursor:pointer} .conteneur_lives .live .bandeau .titre{float:left;padding:0 7px;width:220px;font-family:arial,sans-serif;font-size:13px;font-weight:700} .conteneur_lives .lives .chrome .titre{float:left;width:230px;height:25px;overflow:hidden;color:#fff;text-align:left;font-weight:700;font-family:arial,sans-serif;font-size:13px;line-height:25px} -#mainContent,.site-liberation #header-liberation h1,.site-liberation #header-liberation h2{font-family:Verdana,Arial,Helvetica,sans-serif} .conteneur_lives .lives .chrome .titre .tt_live{display:inline-block;width:20px;height:10px;margin:0 5px 0 16px;text-indent:-9999px;background:url(/medias/web/img/sprites/icos_live.png)-162px 0} .conteneur_lives .lives .chrome{background:url(/medias/web/img/textes/tt_live_bas.png)no-repeat #d50303;height:25px;line-height:23px;padding:0 5px 0 40px;display:none;width:283px;cursor:pointer} .conteneur_lives .live.grand .bandeau,.conteneur_lives.popuped .lives .chrome{cursor:default} @@ -1524,7 +1524,7 @@ label.comparer input{margin-right:8px} *{margin:0;padding:0} form,img{border:0} ul{list-style:none inside} -#mainContent{background:#fff;font-size:12px;color:#222} +#mainContent{background:#fff;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:12px;color:#222} body>img{position:absolute} .megaban{margin-right:auto;margin-left:auto} .ad-top .megaban{width:1000px} @@ -1587,15 +1587,14 @@ img.spacer{width:1px;height:1px} #header-liberation .header-base .sites-info-search .search{display:block;width:278px;height:22px;border:1px solid grey} #header-liberation .header-base .sites-info-search .search input[type=text]{border:0;color:grey;height:22px;width:220px;padding:0 5px} #header-liberation .header-base .sites-info-search .search input[type=submit]{background:url(http://s0.libe.com/libe/img/common/_sprites_header/header.png?df8de01457fa)0 -32px no-repeat;display:block;float:right;width:29px;height:22px;border:0} +#header-liberation .header-base .nav .nav2 li,#header-liberation .header-base .nav li{display:block;float:left} #header-liberation .header-base .links h2{font-weight:400;text-transform:uppercase;font-size:11px;height:16px} #header-liberation .header-base .links ul li{font-family:Arial,Verdana,sans-serif;font-size:11.5px} #header-liberation .header-base .links ul li a{color:grey} #header-liberation .header-base .nav{display:block;clear:both;position:relative} -#header-liberation .header-base .nav li{display:block;float:left} #header-liberation .header-base .nav .nav1{font-weight:400;text-transform:uppercase;font-size:11px} #header-liberation .header-base .nav .nav1 a{display:block} #header-liberation .header-base .nav .nav2{position:absolute;z-index:5000;bottom:0;left:0;width:100%} -#header-liberation .header-base .nav .nav2 li{display:block;float:left} #header-liberation .header-base .nav .nav2 li a{position:relative;display:block} #core-liberation form h2{margin-bottom:10px} #core-liberation form p{padding-top:10px;padding-bottom:10px} @@ -1701,6 +1700,7 @@ body.iframe{padding-top:0} .ad-google .googleBanner .annonce:last-of-type{margin-bottom:0} .lnk-libeplus{background-image:url(http://s0.libe.com/libe/img/common/ico-lnk-libeplus.png?2967b1507eee);padding-right:20px} .lnk-libeplus-big{background-image:url(http://s0.libe.com/libe/img/common/ico-lnk-libeplus-big.png?401394d0f866);padding-right:30px} +.site-liberation #header-liberation h1,.site-liberation #header-liberation h2{font-family:Verdana,Arial,Helvetica,sans-serif} .site-liberation .hot-topics{display:block;clear:both;margin:14px 10px 0;padding:14px 0;font-size:11px} .site-liberation .hot-topics h1{border-right:1px dotted;float:left;margin:0 0 0 21px;padding:0 21px 0 0;text-transform:uppercase;font-size:20px} .site-liberation .hot-topics h5{float:left;margin:0 0 0 21px;padding:5px 21px 5px 0;background:url(http://s0.libe.com/libe/img/common/bg-puce-losange.png?099dfb8021ab)center right no-repeat;text-transform:uppercase;font-size:12px} @@ -1759,8 +1759,8 @@ body.iframe{padding-top:0} #footer-liberation .monlibe{width:112px;margin-right:14px;padding-left:14px} #footer-liberation .news,#footer-liberation .services{width:168px;padding:0 14px} #footer-liberation .monlibe h5,#footer-liberation .news h5,#footer-liberation .services h5{text-transform:uppercase;padding:0 0 4px;font-size:10px} -#footer-liberation .abo h2{text-transform:uppercase;font-size:12px} -#footer-liberation .abo h3{text-transform:uppercase;font-weight:400;font-size:12px;margin-bottom:20px} +#footer-liberation .abo h2,#footer-liberation .abo h3{text-transform:uppercase;font-size:12px} +#footer-liberation .abo h3{font-weight:400;margin-bottom:20px} #footer-liberation .news h5,#footer-liberation .services h5{margin-bottom:10px} #footer-liberation .news ul,#footer-liberation .services ul{border-right:1px dotted;font-size:10px;width:83px;float:left;min-height:150px} #footer-liberation .news ul:last-of-type,#footer-liberation .services ul:last-of-type{border-right:none;width:84px} @@ -2252,7 +2252,7 @@ form .btn-rounded-degraded input[type=button],form .btn-rounded-degraded input[t #core-liberation .block .pager ul.circle li a.on{background-image:url(http://s0.libe.com/libe/img/common/btn-circle-on.gif?c66d45940adc)} #core-liberation .block .pager ul.circle li a.prev{background-image:url(http://s0.libe.com/libe/img/common/bg-search-pagination-prev.png?0ae4b5772718)} #core-liberation .block .pager ul.circle li a.next{background-image:url(http://s0.libe.com/libe/img/common/bg-search-pagination-next.png?363861606f55)} -#core-liberation .bg-sprites-icons a.facebook,#core-liberation .bg-sprites-icons a.mail,#core-liberation .bg-sprites-icons a.star,#core-liberation .bg-sprites-icons a.twitter{display:block;background-image:url(http://s0.libe.com/libe/img/common/_sprites_icons/icons.png?9914d0d70a49);background-repeat:no-repeat} +#core-liberation .bg-sprites-icons .arrow-grey-b,#core-liberation .bg-sprites-icons .arrow-grey-l,#core-liberation .bg-sprites-icons .community-bubble,#core-liberation .bg-sprites-icons a.facebook,#core-liberation .bg-sprites-icons a.mail,#core-liberation .bg-sprites-icons a.star,#core-liberation .bg-sprites-icons a.twitter{background-repeat:no-repeat;display:block;background-image:url(http://s0.libe.com/libe/img/common/_sprites_icons/icons.png?9914d0d70a49)} #core-liberation .bg-sprites-icons a.twitter{background-position:-64px 0;width:12px;height:15px} #core-liberation .bg-sprites-icons a.twitter:hover{background-position:-64px -17px} #core-liberation .bg-sprites-icons a.facebook{background-position:-78px 0;width:9px;height:16px} @@ -2261,10 +2261,9 @@ form .btn-rounded-degraded input[type=button],form .btn-rounded-degraded input[t #core-liberation .bg-sprites-icons a.mail:hover{background-position:-89px -16px} #core-liberation .bg-sprites-icons a.star{background-position:-38px -56px;width:20px;height:18px} #core-liberation .bg-sprites-icons .on a.star,#core-liberation .bg-sprites-icons a.star:hover{background-position:-23px -36px} -#core-liberation .bg-sprites-icons .arrow-grey-b,#core-liberation .bg-sprites-icons .arrow-grey-l{display:block;background-image:url(http://s0.libe.com/libe/img/common/_sprites_icons/icons.png?9914d0d70a49);background-repeat:no-repeat} #core-liberation .bg-sprites-icons .arrow-grey-l{background-position:0 -66px;width:6px;height:8px} #core-liberation .bg-sprites-icons .arrow-grey-b{background-position:0 -75px;width:8px;height:7px} -#core-liberation .bg-sprites-icons .community-bubble{display:block;background-image:url(http://s0.libe.com/libe/img/common/_sprites_icons/icons.png?9914d0d70a49);background-repeat:no-repeat;background-position:0 -36px;width:21px;height:18px} +#core-liberation .bg-sprites-icons .community-bubble{background-position:0 -36px;width:21px;height:18px} .site-liberation .toolbox{border-top:1px solid;border-bottom:1px solid;display:block;height:30px;letter-spacing:-1px} .site-liberation .toolbox li{float:left;display:block;margin:0 4px;height:30px} #core-liberation .toolbox>li:first-child{margin-left:0} @@ -2350,7 +2349,7 @@ body.init-bar-is-closed #bar-liberation{height:15px} #bar-liberation .content .mail-box a:hover span.letter{background-position:-112px 0} #bar-liberation .content .activities-stream{width:503px;left:295px;z-index:10030;height:40px;overflow:hidden;border-bottom:1px solid} #bar-liberation .content .activities-stream a.displayer{display:block;position:absolute;width:40px;height:100%;right:0} -#page-paywall .content a,.site-liberation a,.site-liberation a p,.site-liberation a:hover h5 .theme,.site-liberation h5 a.theme:hover{text-decoration:none} +#page-paywall .content a,.site-liberation a:hover h5 .theme,.site-liberation h5 a.theme:hover{text-decoration:none} #bar-liberation .content .other{width:267px;left:799px;z-index:10050} #bar-liberation .content .other a{display:block;height:100%;width:100%} #bar-liberation .content .other .ad-1{padding:6px 10px} @@ -2378,10 +2377,9 @@ body.init-bar-is-closed #bar-liberation{height:15px} #page-paywall .content a.close strong{text-transform:uppercase;font-size:8px} #page-paywall .content .video{margin-bottom:20px;width:437px} #page-paywall .content .video h5{margin-bottom:15px;padding:3px 0 5px;border-top:1px dotted;border-bottom:1px dotted;float:right;font-size:16px;font-style:italic;font-weight:400} -#page-paywall .content .video h4{clear:both;margin-bottom:20px} +#page-paywall .content .arguments,#page-paywall .content .video h4{clear:both;margin-bottom:20px} #page-paywall .content .video h4 span{float:right;padding:0 0 0 10px;text-transform:uppercase;line-height:13px;font-size:16px;font-weight:400} #page-paywall .content .video .player{width:354px;height:200px;float:right} -#page-paywall .content .arguments{clear:both;margin-bottom:20px} #page-paywall .content .arguments .arg{float:left;width:240px;padding:0 10px} body.access-ess #page-paywall .content .arguments .arg{float:none;margin:auto} #page-paywall .content .arguments .arg .visual{display:block;float:left;margin-right:10px;width:110px} @@ -2436,12 +2434,12 @@ body.access-ess #page-paywall .content .arguments .arg{float:none;margin:auto} .site-liberation .slug{background:url(http://s0.libe.com/libe/img/common/bg-puce-losange.png?099dfb8021ab)right center no-repeat;padding-right:18px;margin-right:3px;text-transform:uppercase;font-size:10px} .site-liberation .author{font-size:10px} .site-liberation .author strong{text-transform:uppercase} -.site-liberation a,.site-liberation a p{outline:0} +.site-liberation a,.site-liberation a p{text-decoration:none;outline:0} .site-liberation .block-call-items .mini-tpl .whosaid h5 a.theme:hover,.site-liberation .block-call-items .tpl-search-results h4 a:hover span,.site-liberation a:hover,.site-liberation a:hover h2,.site-liberation a:hover h3,.site-liberation a:hover h4,.site-liberation a:hover h5,.site-liberation a:hover h6,.site-liberation a:hover p{text-decoration:underline} .site-liberation .lnk-comments{background:url(http://s0.libe.com/libe/img/common/ico-lnk-comment.png?48525c2557e6)left 2px no-repeat;padding-left:20px;font-size:10px;line-height:15px} .site-liberation .block-call-items .block-top{margin-bottom:10px} .site-liberation .block-call-items .block-top h5{padding:3px 10px;background-color:#e20000;color:#fff} -.site-liberation .block-call-items .mini-tpl .lnk-libeplus,.site-liberation .block-call-items .mini-tpl .lnk-libeplus-big,.site-liberation .col-contextual .block-call-items .block-top h5{padding:0;background:0 0} +.site-liberation .block-call-items .mini-tpl .lnk-libeplus,.site-liberation .block-call-items .mini-tpl .lnk-libeplus-big,.site-liberation .col-contextual .block-call-items .block-top h5{background:0 0;padding:0} .site-liberation .block-call-items .mini-tpl h6{margin:0;font-family:Georgia,"Times New Roman",Times,serif;font-weight:400;font-size:12px} .site-liberation .block-call-items .mini-tpl{border-bottom:1px dotted;margin-bottom:14px;clear:both} .site-liberation .block-call-items .mini-tpl:last-of-type{border-bottom:0;margin-bottom:0:} @@ -2480,15 +2478,14 @@ body.access-ess #page-paywall .content .arguments .arg{float:none;margin:auto} .site-liberation .block-call-items .mini-tpl .whosaid .answer a{float:right;font-size:14px} .site-liberation .block-call-items .mini-tpl .chat .contribute{display:block} .site-liberation .block-call-items .mini-tpl .chat .contribute a{display:block;margin-top:14px} +.site-liberation .w14unit .block-call-items .mini-tpl .big,.site-liberation .w14unit .block-call-items .mini-tpl .pano,.site-liberation .w17unit .block-call-items .mini-tpl .big,.site-liberation .w17unit .block-call-items .mini-tpl .pano{margin:0 0 14px;clear:both} .site-liberation .block-call-items .mini-tpl .chat .contribute form{padding:14px 0} .site-liberation .block-call-items .mini-tpl .chat .contribute form fieldset{border:0} .site-liberation .block-call-items .mini-tpl .chat .contribute form fieldset input[type=text]{float:left;width:216px;height:18px} .site-liberation .block-call-items .mini-tpl .chat .contribute form fieldset input[type=submit]{float:right} .site-liberation .block-call-items .mini-tpl .chat .contribute .btn{float:left} .site-liberation .w17unit .block-call-items .mini-tpl .others,.site-liberation .w17unit .block-call-items .mini-tpl .others ul.list-linked-items{clear:both} -.site-liberation .w17unit .block-call-items .mini-tpl .big,.site-liberation .w17unit .block-call-items .mini-tpl .pano{clear:both;margin:0 0 14px} .site-liberation .w14unit .block-call-items .mini-tpl .others,.site-liberation .w14unit .block-call-items .mini-tpl .others ul.list-linked-items{clear:both} -.site-liberation .w14unit .block-call-items .mini-tpl .big,.site-liberation .w14unit .block-call-items .mini-tpl .pano{clear:both;margin:0 0 14px} .site-liberation .w14unit .block-call-items .mini-tpl .big{width:392px;height:261px} .site-liberation .w14unit .block-call-items .mini-tpl .pano{width:392px;height:85px} .site-liberation .w11unit .block-call-items .mini-tpl .pano{width:300px;height:65px} @@ -2569,7 +2566,6 @@ body.access-ess #page-paywall .content .arguments .arg{float:none;margin:auto} .site-liberation .block-call-items .tpl-visual-square-left .chat .contribute{clear:both} .site-liberation .block-call-items .tpl-visual-square-left .chat .contribute form{margin:14px 0;padding:0} .site-liberation .block-call-items .tpl-visual-square-left-arround .visual{display:block;float:left;margin:3px 10px 0 0;width:84px;height:84px} -.site-liberation .bg-sprites-icons .close1,.site-liberation .bg-sprites-icons .close1-black,.site-liberation .bg-sprites-icons .close1-monlibe,.site-liberation .bg-sprites-icons .edit1,.site-liberation .bg-sprites-icons .edit1-black,.site-liberation .bg-sprites-icons .edit1-monlibe{width:15px;height:15px} .site-liberation .block-call-items .tpl-visual-square-left-arround h5{margin-bottom:0} .site-liberation .block-call-items .tpl-visual-square-left-arround p.subtitle{font-size:11px} body.barry-white{background:url(http://s0.libe.com/libe/img/common/bg-body-fff.gif?62ad83bcadf5)center 0 repeat-y #f8f8f8} @@ -2829,6 +2825,7 @@ body.slideshow .ad-top .megaban{background:#333} #core-liberation .pagination .current{background-color:transparent;color:#e20000} .site-liberation .bg-sprites-icons .icon{display:block;background-image:url(http://s0.libe.com/libe/img/common/_sprites_icons/icons.png?9914d0d70a49);background-repeat:no-repeat} .site-liberation .bg-sprites-icons .folder1,.site-liberation .bg-sprites-icons .folder1-black,.site-liberation .bg-sprites-icons .folder1-monlibe{width:19px;height:15px} +.site-liberation .bg-sprites-icons .close1,.site-liberation .bg-sprites-icons .close1-black,.site-liberation .bg-sprites-icons .close1-monlibe,.site-liberation .bg-sprites-icons .edit1,.site-liberation .bg-sprites-icons .edit1-black,.site-liberation .bg-sprites-icons .edit1-monlibe{width:15px;height:15px} .site-liberation .bg-sprites-icons .folder1{background-position:-110px -84px} .site-liberation .bg-sprites-icons .folder1-black{background-position:-152px -84px} .site-liberation .bg-sprites-icons .folder1-monlibe,.site-liberation .cat-monlibe .bg-sprites-icons .on .folder1,.site-liberation .cat-monlibe .bg-sprites-icons a:hover .folder1{background-position:-131px -84px} diff --git a/test/fixtures/bootstrap-min.css b/test/fixtures/bootstrap-min.css index ce44ad31..096fbeb7 100644 --- a/test/fixtures/bootstrap-min.css +++ b/test/fixtures/bootstrap-min.css @@ -1,7 +1,4 @@ body,figure{margin:0} -.collapse,.invisible{visibility:hidden} -.popover>.arrow,.popover>.arrow:after,.tooltip-arrow{width:0;height:0;border-color:transparent;border-style:solid} -.breadcrumb,.dropdown-menu,.list-inline,.list-unstyled,.media-list,.nav,.pager{list-style:none} html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size:10px;-webkit-tap-highlight-color:transparent} article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block} audio,canvas,progress,video{display:inline-block;vertical-align:baseline} @@ -347,6 +344,7 @@ dt,kbd kbd,label{font-weight:700} } .small,small{font-size:85%} .mark,mark{padding:.2em;background-color:#fcf8e3} +.list-inline,.list-unstyled{list-style:none;padding-left:0} .text-left{text-align:left} .text-right{text-align:right} .text-center{text-align:center} @@ -381,8 +379,7 @@ pre code,table{background-color:transparent} dl,ol,ul{margin-top:0} ol,ul{margin-bottom:10px} ol ol,ol ul,ul ol,ul ul{margin-bottom:0} -.list-unstyled{padding-left:0} -.list-inline{padding-left:0;margin-left:-5px} +.list-inline{margin-left:-5px} .list-inline>li{display:inline-block;padding-right:5px;padding-left:5px} dl{margin-bottom:20px} dd{margin-left:0} @@ -394,23 +391,20 @@ abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777} blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee} blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0} blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;color:#777} -code,kbd{font-size:90%} blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'} .blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0} caption,th{text-align:left} -code,kbd{padding:2px 4px} +code,kbd{padding:2px 4px;font-size:90%} .blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''} .blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'} address{margin-bottom:20px;font-style:normal} code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace} -.popover,.tooltip{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif} code{color:#c7254e;background-color:#f9f2f4} kbd{color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)} kbd kbd{padding:0;font-size:100%;-webkit-box-shadow:none;box-shadow:none} pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc} .container,.container-fluid{margin-right:auto;margin-left:auto} pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;border-radius:0} -.badge,.btn,.dropdown-header,.dropdown-menu>li>a,.input-group-btn,.label{white-space:nowrap} .container,.container-fluid{padding-right:15px;padding-left:15px} .pre-scrollable{max-height:340px;overflow-y:scroll} @media (min-width:768px){.container{width:750px} @@ -640,7 +634,6 @@ caption{padding-top:8px;padding-bottom:8px;color:#777} .table>tbody+tbody{border-top:2px solid #ddd} .table .table{background-color:#fff} .table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px} -fieldset,legend{border:0;padding:0} .table-bordered,.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd} .table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px} .table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9} @@ -648,7 +641,6 @@ fieldset,legend{border:0;padding:0} table col[class*=col-]{position:static;display:table-column;float:none} table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none} .btn-group>.btn-group,.btn-toolbar .btn-group,.btn-toolbar .input-group,.dropdown-menu{float:left} -.checkbox,.has-feedback,.radio{position:relative} .table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8} .table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8} .table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6} @@ -667,14 +659,14 @@ table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;f .table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0} .table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0} } +fieldset,legend{padding:0;border:0} fieldset{min-width:0;margin:0} legend{display:block;width:100%;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border-bottom:1px solid #e5e5e5} -.form-control,output{font-size:14px;color:#555} label{display:inline-block;max-width:100%;margin-bottom:5px} -.checkbox,.form-control,.radio,input[type=file],output{display:block} input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none} input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px \9;line-height:normal} -.form-control,output{line-height:1.42857143} +.form-control,output{display:block;font-size:14px;line-height:1.42857143;color:#555} +input[type=file]{display:block} input[type=range]{display:block;width:100%} select[multiple],select[size]{height:auto} input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px} @@ -693,7 +685,7 @@ textarea.form-control{height:auto} .input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px} } .form-group{margin-bottom:15px} -.checkbox,.radio{margin-top:10px;margin-bottom:10px} +.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px} .checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer} .checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px \9;margin-left:-20px} .checkbox+.checkbox,.radio+.radio{margin-top:-5px} @@ -717,6 +709,7 @@ select[multiple].input-lg,textarea.input-lg{height:auto} select.form-group-lg .form-control{height:46px;line-height:46px} select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-control{height:auto} .form-group-lg .form-control-static{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333} +.has-feedback{position:relative} .has-feedback .form-control{padding-right:42.5px} .form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none} .collapsing,.dropdown,.dropup{position:relative} @@ -736,13 +729,12 @@ select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-contro .has-feedback label~.form-control-feedback{top:25px} .has-feedback label.sr-only~.form-control-feedback{top:0} .help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373} -@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle} +@media (min-width:768px){.form-inline .form-control-static,.form-inline .form-group{display:inline-block} +.form-inline .control-label,.form-inline .form-group{margin-bottom:0;vertical-align:middle} .form-inline .form-control{display:inline-block;width:auto;vertical-align:middle} -.form-inline .form-control-static{display:inline-block} .form-inline .input-group{display:inline-table;vertical-align:middle} .form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto} .form-inline .input-group>.form-control{width:100%} -.form-inline .control-label{margin-bottom:0;vertical-align:middle} .form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle} .form-inline .checkbox label,.form-inline .radio label{padding-left:0} .form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0} @@ -753,13 +745,11 @@ select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-contro .form-horizontal .checkbox,.form-horizontal .radio{min-height:27px} .form-horizontal .form-group{margin-right:-15px;margin-left:-15px} .form-horizontal .has-feedback .form-control-feedback{right:15px} -.dropdown-menu-right,.dropdown-menu.pull-right{left:auto;right:0} @media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right} .form-horizontal .form-group-lg .control-label{padding-top:14.33px} .form-horizontal .form-group-sm .control-label{padding-top:6px} } -.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;border-radius:4px} -.dropdown-menu,.input-group-addon,.popover{border:1px solid #ccc} +.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;border-radius:4px} .btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px} .btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none} .btn.active,.btn:active{outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)} @@ -797,12 +787,11 @@ select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-contro .btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px} .btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px} .btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px} -.dropdown-header,.dropdown-menu>li>a{display:block;padding:3px 20px;line-height:1.42857143} .btn-block{display:block} .btn-block+.btn-block{margin-top:5px} .fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear} .fade.in{opacity:1} -.collapse{display:none} +.collapse{display:none;visibility:hidden} .collapse.in{display:block;visibility:visible} tr.collapse.in{display:table-row} tbody.collapse.in{display:table-row-group} @@ -811,11 +800,12 @@ tbody.collapse.in{display:table-row-group} .input-group-addon:last-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0} .input-group-addon:first-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0} .dropdown-toggle:focus{outline:0} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)} .btn-group-vertical>.btn:not(:first-child):not(:last-child),.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn,.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0} -.badge,.input-group-addon,.label,.nav-justified>li>a,.pager,.progress-bar{text-align:center} +.dropdown-header,.dropdown-menu>li>a{white-space:nowrap;padding:3px 20px;line-height:1.42857143} +.dropdown-menu-right,.dropdown-menu.pull-right{right:0;left:auto} .dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5} -.dropdown-menu>li>a{clear:both;font-weight:400;color:#333} +.dropdown-menu>li>a{display:block;clear:both;font-weight:400;color:#333} .dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5} .dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0} .dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777} @@ -823,7 +813,7 @@ tbody.collapse.in{display:table-row-group} .open>.dropdown-menu{display:block} .open>a{outline:0} .dropdown-menu-left{right:auto;left:0} -.dropdown-header{font-size:12px;color:#777} +.dropdown-header{display:block;font-size:12px;color:#777} .dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990} .btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover,.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2} .nav-justified>.dropdown .dropdown-menu,.nav-tabs.nav-justified>.dropdown .dropdown-menu{left:auto;top:auto} @@ -864,8 +854,7 @@ tbody.collapse.in{display:table-row-group} .btn-group-justified>.btn-group .btn{width:100%} .btn-group-justified>.btn-group .dropdown-menu{left:auto} [data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none} -.input-group,.input-group-btn,.input-group-btn>.btn,.nav>li,.nav>li>a,.navbar{position:relative} -.input-group{display:table;border-collapse:separate} +.input-group{position:relative;display:table;border-collapse:separate} .input-group[class*=col-]{float:none;padding-right:0;padding-left:0} .input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0} .input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px} @@ -875,20 +864,20 @@ select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.i select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px} select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto} .input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell} +.nav>li,.nav>li>a{position:relative;display:block} .input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0} .input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle} -.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;background-color:#eee;border-radius:4px} -.badge,.label{font-weight:700} +.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px} .input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px} .input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px} .input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0} .input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0} .input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0} -.input-group-btn{font-size:0} +.input-group-btn{position:relative;font-size:0;white-space:nowrap} +.input-group-btn>.btn{position:relative} .input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px} -.nav{padding-left:0;margin-bottom:0} -.nav>li{display:block} -.nav>li>a{display:block;padding:10px 15px} +.nav{padding-left:0;margin-bottom:0;list-style:none} +.nav>li>a{padding:10px 15px} .nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee} .nav>li.disabled>a{color:#777} .nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent} @@ -915,7 +904,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7} .nav-stacked>li+li{margin-top:2px;margin-left:0} .nav-justified{width:100%} -.nav-justified>li>a{margin-bottom:5px} +.nav-justified>li>a{margin-bottom:5px;text-align:center} .nav-tabs-justified{border-bottom:0} .nav-tabs-justified>li>a{margin-right:0;border-radius:4px} .navbar,.navbar-toggle{border:1px solid transparent} @@ -928,7 +917,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .tab-content>.tab-pane{display:none;visibility:hidden} .tab-content>.active{display:block;visibility:visible} .nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0} -.navbar{min-height:50px;margin-bottom:20px} +.navbar{position:relative;min-height:50px;margin-bottom:20px} .navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)} .navbar-collapse.in{overflow-y:auto} @media (min-width:768px){.navbar{border-radius:4px} @@ -965,27 +954,26 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .navbar-nav .open .dropdown-menu>li>a{line-height:20px} .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none} } -.progress-bar-striped,.progress-striped .progress-bar,.progress-striped .progress-bar-danger,.progress-striped .progress-bar-info,.progress-striped .progress-bar-success,.progress-striped .progress-bar-warning{background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)} +.progress-bar-striped,.progress-striped .progress-bar,.progress-striped .progress-bar-danger,.progress-striped .progress-bar-info,.progress-striped .progress-bar-success,.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)} @media (min-width:768px){.navbar-toggle{display:none} .navbar-nav{float:left;margin:0} .navbar-nav>li{float:left} .navbar-nav>li>a{padding-top:15px;padding-bottom:15px} } .navbar-form{padding:10px 15px;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin:8px -15px} -@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle} +@media (min-width:768px){.navbar-form .form-control-static,.navbar-form .form-group{display:inline-block} +.navbar-form .control-label,.navbar-form .form-group{margin-bottom:0;vertical-align:middle} .navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle} -.navbar-form .form-control-static{display:inline-block} .navbar-form .input-group{display:inline-table;vertical-align:middle} .navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto} .navbar-form .input-group>.form-control{width:100%} -.navbar-form .control-label{margin-bottom:0;vertical-align:middle} .navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle} .navbar-form .checkbox label,.navbar-form .radio label{padding-left:0} .navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0} .navbar-form .has-feedback .form-control-feedback{top:0} } +.btn .badge,.btn .label{position:relative;top:-1px} .breadcrumb>li,.pagination{display:inline-block} -.badge,.label{vertical-align:baseline} @media (max-width:767px){.navbar-form .form-group{margin-bottom:5px} .navbar-form .form-group:last-child{margin-bottom:0} } @@ -1047,13 +1035,13 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .navbar-inverse .btn-link{color:#9d9d9d} .navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff} .navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444} -.breadcrumb{padding:8px 15px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px} +.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px} .breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"} .breadcrumb>.active{color:#777} .pagination{padding-left:0;margin:20px 0;border-radius:4px} .pager li,.pagination>li{display:inline} .pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd} -.badge,.label{line-height:1} +.badge,.label{text-align:center;font-weight:700;line-height:1;white-space:nowrap;vertical-align:baseline} .pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px} .pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px} .pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd} @@ -1065,7 +1053,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px} .pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px} .pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px} -.pager{padding-left:0;margin:20px 0} +.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none} .pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px} .pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee} .pager .next>a,.pager .next>span{float:right} @@ -1074,7 +1062,6 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .label{display:inline;padding:.2em .6em .3em;font-size:75%;color:#fff;border-radius:.25em} a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer} .label:empty{display:none} -.btn .label{position:relative;top:-1px} .label-default{background-color:#777} .label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e} .label-primary{background-color:#337ab7} @@ -1090,7 +1077,6 @@ a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer} .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;color:#fff;background-color:#777;border-radius:10px} .badge:empty{display:none} .media-object,.thumbnail{display:block} -.btn .badge{position:relative;top:-1px} .btn-xs .badge{top:0;padding:1px 5px} a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer} .list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff} @@ -1142,7 +1128,7 @@ to{background-position:0 0} to{background-position:0 0} } .progress{height:20px;margin-bottom:20px;background-color:#f5f5f5;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)} -.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease} +.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease} .progress-bar-striped,.progress-striped .progress-bar{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px} .progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite} .progress-bar-success{background-color:#5cb85c} @@ -1163,7 +1149,7 @@ to{background-position:0 0} .media-middle{vertical-align:middle} .media-bottom{vertical-align:bottom} .media-heading{margin-top:0;margin-bottom:5px} -.media-list{padding-left:0} +.media-list{padding-left:0;list-style:none} .list-group{padding-left:0;margin-bottom:20px} .list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd} .list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px} @@ -1267,6 +1253,7 @@ a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-gro .well-lg{padding:24px;border-radius:6px} .well-sm{padding:9px;border-radius:3px} .close{float:right;font-size:21px;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2} +.popover,.tooltip{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:400} .close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5} button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0} .modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;-webkit-overflow-scrolling:touch;outline:0} @@ -1293,44 +1280,45 @@ button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;bor .modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)} .modal-sm{width:300px} } +.tooltip.top-left .tooltip-arrow,.tooltip.top-right .tooltip-arrow{bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000} @media (min-width:992px){.modal-lg{width:900px} } -.tooltip{position:absolute;z-index:1070;display:block;font-size:12px;font-weight:400;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0} +.popover>.arrow,.popover>.arrow:after,.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid} +.tooltip{position:absolute;z-index:1070;display:block;font-size:12px;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0} .tooltip.in{filter:alpha(opacity=90);opacity:.9} .tooltip.top{padding:5px 0;margin-top:-3px} .tooltip.right{padding:0 5px;margin-left:3px} .tooltip.bottom{padding:5px 0;margin-top:3px} .tooltip.left{padding:0 5px;margin-left:-3px} .tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px} -.tooltip-arrow{position:absolute} .tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000} -.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000} -.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000} +.tooltip.top-left .tooltip-arrow{right:5px} +.tooltip.top-right .tooltip-arrow{left:5px} .tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000} .tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000} .tooltip.bottom .tooltip-arrow{left:50%;margin-left:-5px} .tooltip.bottom-left .tooltip-arrow{right:5px;margin-top:-5px} .tooltip.bottom-right .tooltip-arrow{left:5px;margin-top:-5px} -.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)} +.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-size:14px;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)} .popover.top{margin-top:-10px} .popover.right{margin-left:10px} .popover.bottom{margin-top:10px} .popover.left{margin-left:-10px} .popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0} .popover-content{padding:9px 14px} -.popover>.arrow,.popover>.arrow:after{position:absolute;display:block} +.popover>.arrow,.popover>.arrow:after{display:block} .carousel,.carousel-inner{position:relative} .popover>.arrow{border-width:11px} .popover>.arrow:after{content:"";border-width:10px} -.popover.bottom>.arrow:after,.popover.left>.arrow:after,.popover.right>.arrow:after,.popover.top>.arrow:after{content:" "} .popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0} -.popover.top>.arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0} +.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0} +.popover.left>.arrow:after,.popover.right>.arrow:after{bottom:-10px;content:" "} .popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0} -.popover.right>.arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0} +.popover.right>.arrow:after{left:1px;border-right-color:#fff;border-left-width:0} .popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)} -.popover.bottom>.arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff} +.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff} .popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)} -.popover.left>.arrow:after{right:1px;bottom:-10px;border-right-width:0;border-left-color:#fff} +.popover.left>.arrow:after{right:1px;border-right-width:0;border-left-color:#fff} .carousel-inner{width:100%;overflow:hidden} .carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left} .carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1} @@ -1376,6 +1364,7 @@ button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;bor .hide{display:none!important} .show{display:block!important} .hidden,.visible-lg,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important} +.invisible{visibility:hidden} .text-hide{font:0/0 a;color:transparent;background-color:transparent;border:0} .hidden{visibility:hidden!important} .affix{position:fixed} diff --git a/test/fixtures/issue-437-min.css b/test/fixtures/issue-437-min.css index 8cf2192f..01be134b 100644 --- a/test/fixtures/issue-437-min.css +++ b/test/fixtures/issue-437-min.css @@ -1,3 +1,3 @@ -.one,.two{background-size:120px 240px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACPklEQVQ4jaWST0jTARTHv+/9fm46XcOxFCxpObE1igiiCKMMCjqZThGLoINBIUR0K4quFSHRxQ4ZFEiWqSuK8GSnLiGUHZwZcxNLysw/8//P/d7rNpzUKnq39w4fvt/3/QL/ObT+cN/nc3vc3kaTzaOwUt01Y8NPsgHMtUvnpvL9Zq6jnUVHoBoRh/36rxU89QerDMYzIblQHxt+2OErLTHczj1EJCqr/Q2JxNffAtrh3eDaWvwBjEvfY9HuYn/wJgycUaH3RMRC2MUpvWuNRq82ANZaAANAXmDjOWYaCMeij4sCoRY1sG9+ei5UG48erBkZPMDTMyE1tdLhD974pYJIINSroo8WZ5N9Lo97GLzqT4kU5iDvlrJsYMX5peTCjzxP/pAtKzvr4vHRDAUCfQO2enNdBV5mXAzHYhMm5+5WtVsVeCDg1hOTY+Oq9NYQ55Uuf8W1nrLtr9KArF+27fVRzzMAVj2cBjCoEuI4trw4PyWC2z2BQFFKlt8RGc0wjNMMae7wlZYQ6V6bV+6AjISCh9ZYsPuYqe7U1JfPxNxGyIlYs9ZCbXywOhwbqsJMcsbpye+Cjba6eHwUhEZbU5H0EzvLyjymOgdIU5cnEp+6ssXoKK2ohcnXv60kd5wdH19M++vcXH7IdJjPsxWpe8u2JjKoBaThcOxjX0YTgXVVJkQsWeqxkqumq9ATJtVqJfKLtdxYPzbSn9GDDAhQkBMIniTwERF9qQovG3rcVnkxm5y61zQ5Ofen5P5pfgKK5A55njIWAwAAAABJRU5ErkJggg==)} +.one,.two{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACPklEQVQ4jaWST0jTARTHv+/9fm46XcOxFCxpObE1igiiCKMMCjqZThGLoINBIUR0K4quFSHRxQ4ZFEiWqSuK8GSnLiGUHZwZcxNLysw/8//P/d7rNpzUKnq39w4fvt/3/QL/ObT+cN/nc3vc3kaTzaOwUt01Y8NPsgHMtUvnpvL9Zq6jnUVHoBoRh/36rxU89QerDMYzIblQHxt+2OErLTHczj1EJCqr/Q2JxNffAtrh3eDaWvwBjEvfY9HuYn/wJgycUaH3RMRC2MUpvWuNRq82ANZaAANAXmDjOWYaCMeij4sCoRY1sG9+ei5UG48erBkZPMDTMyE1tdLhD974pYJIINSroo8WZ5N9Lo97GLzqT4kU5iDvlrJsYMX5peTCjzxP/pAtKzvr4vHRDAUCfQO2enNdBV5mXAzHYhMm5+5WtVsVeCDg1hOTY+Oq9NYQ55Uuf8W1nrLtr9KArF+27fVRzzMAVj2cBjCoEuI4trw4PyWC2z2BQFFKlt8RGc0wjNMMae7wlZYQ6V6bV+6AjISCh9ZYsPuYqe7U1JfPxNxGyIlYs9ZCbXywOhwbqsJMcsbpye+Cjba6eHwUhEZbU5H0EzvLyjymOgdIU5cnEp+6ssXoKK2ohcnXv60kd5wdH19M++vcXH7IdJjPsxWpe8u2JjKoBaThcOxjX0YTgXVVJkQsWeqxkqumq9ATJtVqJfKLtdxYPzbSn9GDDAhQkBMIniTwERF9qQovG3rcVnkxm5y61zQ5Ofen5P5pfgKK5A55njIWAwAAAABJRU5ErkJggg==);background-size:120px 240px} .one{background-position:0 -200px} -.two{background-position:-40px -200px} \ No newline at end of file +.two{background-position:-40px -200px} diff --git a/test/selectors/optimizer-test.js b/test/selectors/optimizer-test.js index e5fc14bf..a39d9f6d 100644 --- a/test/selectors/optimizer-test.js +++ b/test/selectors/optimizer-test.js @@ -149,6 +149,10 @@ vows.describe(SelectorsOptimizer) 'div{margin:0}.one{margin-bottom:0}.two{display:block;margin:0}', '.two,div{margin:0}.one{margin-bottom:0}.two{display:block}' ], + 'dropping longer content at a right place': [ + '.one,a:hover{color:red}a:hover{color:#000;display:block;border-color:#000}.longer-name{color:#000;border-color:#000}', + '.one,a:hover{color:red}.longer-name,a:hover{color:#000;border-color:#000}a:hover{display:block}' + ], 'over media without overriding': [ 'div{margin:0}@media{.one{color:red}}.two{display:block;margin:0}', '.two,div{margin:0}@media{.one{color:red}}.two{display:block}'