Parcourir la source

fix layout changes late 2021

Mike L il y a 3 ans
Parent
commit
917ec32567
2 fichiers modifiés avec 6 ajouts et 6 suppressions
  1. 3 3
      dist/webshot.js
  2. 3 3
      src/webshot.ts

+ 3 - 3
dist/webshot.js

@@ -96,10 +96,10 @@ class Webshot extends CallableInstance {
                         logger.warn(`navigation timed out at ${getTimerTime()} ms`);
                         logger.warn(`navigation timed out at ${getTimerTime()} ms`);
                         return null;
                         return null;
                     })
                     })
-                        .then(() => page.addStyleTag({ content: 'nav,footer,main>*>*+*,header+div,header~div>div>div+div,main button,canvas,main section,main section+div>ul>:not(div),' +
-                            'main section+div>ul>div [role="button"],header~div [tabindex="0"]>*>[tabindex="-1"]~div{display:none!important} ' +
+                        .then(() => page.addStyleTag({ content: 'nav,footer,main>*>*+*,header div>[class$=" "]>[class]+div,main button,canvas,main section,main section+div>ul>:not(div),' +
+                            'main section+div>ul>div [role="button"],section+div h2,article>*>:first-child+*>*>:first-child+*{display:none!important} ' +
                             'section+div{overflow:hidden} section+*>*{position:relative!important} article{border-bottom:1px solid!important} ' +
                             'section+div{overflow:hidden} section+*>*{position:relative!important} article{border-bottom:1px solid!important} ' +
-                            'main section+div>ul>div>li{padding:6px 2px 12px!important}',
+                            'main section+div>ul{width:auto!important;padding:16px 0!important} main section+div>ul>div>li{padding:6px 2px 12px!important}',
                     }))
                     }))
                         .then(() => page.addStyleTag({
                         .then(() => page.addStyleTag({
                         content: '*{font-family:-apple-system,".Helvetica Neue DeskInterface",Hiragino Sans,Hiragino Sans GB,sans-serif!important}',
                         content: '*{font-family:-apple-system,".Helvetica Neue DeskInterface",Hiragino Sans,Hiragino Sans GB,sans-serif!important}',

+ 3 - 3
src/webshot.ts

@@ -135,10 +135,10 @@ class Webshot extends CallableInstance<[LazyMediaItem[], (...args) => void, numb
             // hide header, footer, "more options" button, like and share count, avatar stories/live indicator
             // hide header, footer, "more options" button, like and share count, avatar stories/live indicator
             // person tags, carousel navigator, 2nd avatar, and comments; adjust layout for center alignment
             // person tags, carousel navigator, 2nd avatar, and comments; adjust layout for center alignment
             .then(() => page.addStyleTag({content:
             .then(() => page.addStyleTag({content:
-              'nav,footer,main>*>*+*,header+div,header~div>div>div+div,main button,canvas,main section,main section+div>ul>:not(div),' +
-              'main section+div>ul>div [role="button"],header~div [tabindex="0"]>*>[tabindex="-1"]~div{display:none!important} ' +
+              'nav,footer,main>*>*+*,header div>[class$=" "]>[class]+div,main button,canvas,main section,main section+div>ul>:not(div),' +
+              'main section+div>ul>div [role="button"],section+div h2,article>*>:first-child+*>*>:first-child+*{display:none!important} ' +
               'section+div{overflow:hidden} section+*>*{position:relative!important} article{border-bottom:1px solid!important} ' +
               'section+div{overflow:hidden} section+*>*{position:relative!important} article{border-bottom:1px solid!important} ' +
-              'main section+div>ul>div>li{padding:6px 2px 12px!important}',
+              'main section+div>ul{width:auto!important;padding:16px 0!important} main section+div>ul>div>li{padding:6px 2px 12px!important}',
             }))
             }))
             .then(() => page.addStyleTag({
             .then(() => page.addStyleTag({
               content: '*{font-family:-apple-system,".Helvetica Neue DeskInterface",Hiragino Sans,Hiragino Sans GB,sans-serif!important}',
               content: '*{font-family:-apple-system,".Helvetica Neue DeskInterface",Hiragino Sans,Hiragino Sans GB,sans-serif!important}',