diff options
-rw-r--r-- | app/Resources/static/themes/_global/share.scss | 39 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig | 14 | ||||
-rw-r--r-- | web/wallassets/public.css | 2 |
3 files changed, 37 insertions, 18 deletions
diff --git a/app/Resources/static/themes/_global/share.scss b/app/Resources/static/themes/_global/share.scss index 5a853324..72e73a9a 100644 --- a/app/Resources/static/themes/_global/share.scss +++ b/app/Resources/static/themes/_global/share.scss | |||
@@ -148,7 +148,7 @@ article h3, | |||
148 | article h4, | 148 | article h4, |
149 | article h5, | 149 | article h5, |
150 | article h6 { | 150 | article h6 { |
151 | text-align: left !important; | 151 | text-align: left; |
152 | line-height: 1.3; | 152 | line-height: 1.3; |
153 | } | 153 | } |
154 | 154 | ||
@@ -380,28 +380,45 @@ tbody { | |||
380 | border-width: 1px 0; | 380 | border-width: 1px 0; |
381 | } | 381 | } |
382 | 382 | ||
383 | article { | 383 | figure { |
384 | padding: 0 1em; | 384 | text-align: center; |
385 | } | ||
386 | |||
387 | figure > * { | ||
388 | margin: 0 auto; | ||
389 | } | ||
390 | |||
391 | header { | ||
392 | text-align: center; | ||
393 | } | ||
394 | |||
395 | .shared-by { | ||
396 | margin-bottom: 1em; | ||
385 | } | 397 | } |
386 | 398 | ||
387 | /* --------------------- Responsive design ------------------------- */ | 399 | /* --------------------- Responsive design ------------------------- */ |
388 | 400 | ||
401 | @media (max-width: 719px) { | ||
402 | header > *:not(.preview), | ||
403 | article { | ||
404 | padding: 0 1em; | ||
405 | } | ||
406 | } | ||
407 | |||
389 | @media (min-width: 720px) { | 408 | @media (min-width: 720px) { |
390 | blockquote { | 409 | blockquote { |
391 | margin-left: -1.4375em; | 410 | margin-left: -1.4375em; |
392 | padding-left: 1.25em; | 411 | padding-left: 1.25em; |
393 | } | 412 | } |
394 | 413 | ||
395 | article { | 414 | header { |
396 | margin: 0 auto; | 415 | margin-top: 32px; |
397 | max-width: 43.75em; | ||
398 | padding: 0 1.25em; | ||
399 | } | 416 | } |
400 | 417 | ||
401 | header { | 418 | .block { |
419 | margin-left: auto; | ||
420 | margin-right: auto; | ||
402 | max-width: 43.75em; | 421 | max-width: 43.75em; |
403 | margin: 0 auto; | 422 | padding: 0 1.25em; |
404 | margin-top: 32px; | ||
405 | text-align: center; | ||
406 | } | 423 | } |
407 | } | 424 | } |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig index 955420ba..9b0503d6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig | |||
@@ -1,6 +1,9 @@ | |||
1 | <!DOCTYPE html> | ||
1 | <html> | 2 | <html> |
2 | <head> | 3 | <head> |
4 | <meta charset="utf-8"> | ||
3 | <title>{{ entry.title|e|raw }}</title> | 5 | <title>{{ entry.title|e|raw }}</title> |
6 | <meta name="viewport" content="initial-scale=1.0"> | ||
4 | <meta property="og:title" content="{{ entry.title|e|raw }}" /> | 7 | <meta property="og:title" content="{{ entry.title|e|raw }}" /> |
5 | <meta property="og:type" content="article" /> | 8 | <meta property="og:type" content="article" /> |
6 | <meta property="og:url" content="{{ app.request.uri }}" /> | 9 | <meta property="og:url" content="{{ app.request.uri }}" /> |
@@ -22,16 +25,15 @@ | |||
22 | 25 | ||
23 | </head> | 26 | </head> |
24 | <body> | 27 | <body> |
25 | <header> | 28 | <header class="block"> |
26 | <h1>{{ entry.title|e|raw }}</h1> | 29 | <h1>{{ entry.title|e|raw }}</h1> |
27 | <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div> | 30 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a> |
28 | <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</div> | 31 | <p class="shared-by">{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</p> |
29 | |||
30 | {% if entry.previewPicture is not null %} | 32 | {% if entry.previewPicture is not null %} |
31 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div> | 33 | <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /> |
32 | {% endif %} | 34 | {% endif %} |
33 | </header> | 35 | </header> |
34 | <article> | 36 | <article class="block"> |
35 | {{ entry.content | raw }} | 37 | {{ entry.content | raw }} |
36 | </article> | 38 | </article> |
37 | </body> | 39 | </body> |
diff --git a/web/wallassets/public.css b/web/wallassets/public.css index 6ddfa954..9257d40d 100644 --- a/web/wallassets/public.css +++ b/web/wallassets/public.css | |||
@@ -1,2 +1,2 @@ | |||
1 | a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,video{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:"";content:none}table{border-spacing:0}body{background-color:#fff;color:#444;font-family:Georgia;line-height:1.7;-ms-content-zooming:none;margin-bottom:64px}h1,h2,h3,h4,h5,h6{font-weight:600;margin:.2em 0}article h1,article h2,article h3,article h4,article h5,article h6{text-align:left!important;line-height:1.3}h1{font-size:1.4em}h2{font-size:1.3em}h3,h4{font-size:1.2em}h5,h6{font-size:1.1em}p{margin-bottom:.75em}b,strong{font-weight:700}em,i{font-style:italic}a{color:#444;text-decoration:underline}a:active,a:hover{outline:0}dl,ol,p,ul{margin:0 0 1.75em}ol,ul{padding-left:1.25em}li{padding-bottom:.2em;line-height:1.6}li li:last-child,li p:last-child{margin-bottom:-.2em}ol li:last-child,ul li:last-child{padding-bottom:0}mark{padding:0 .2em}mark a{text-decoration:none}blockquote{font-style:italic;border-left:.25em solid #000;margin-left:-20px;padding-left:17px;margin-bottom:.5em;margin-top:.5em}blockquote cite{text-transform:uppercase;font-size:.8em;font-style:normal}blockquote cite:before{content:"\2014";margin-right:.5em}img{display:block;height:auto;margin-bottom:.5em;max-width:100%}figure{margin:0}figure figcaption{display:block;margin-top:.3em;font-style:italic;font-size:.8em}button{display:none!important}hr{display:block;height:1px;border:solid #666;border-width:1px 0 0;margin:1.6em 0;padding:0}small{font-size:.7em}dl{margin:1.6em 0}dl dt{float:left;width:11.25em;overflow:hidden;clear:left;text-align:right;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap;font-weight:700}dl dd,dl dt{margin-bottom:1em}dl dd{margin-left:12.5em}pre{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:4em 0;border:.0625em solid #efefef;width:100%;padding:1em;font-family:Consolas,monospace;white-space:pre;overflow:auto}pre code{line-height:1.6em;white-space:pre-wrap;background:transparent;border:none;padding:0;vertical-align:inherit}code,pre code{font-size:.8em}code{padding:.125em .375em;margin:0 .2em;font-family:Consolas,monospace;white-space:pre;border:1px solid #d3d3d3;overflow:auto}audio,video{max-width:43.75em}::selection,mark{background:#666;color:#fff}table{border-collapse:collapse;margin-bottom:2em;width:100%}td,th{padding:.25em;text-align:left}thead tr{text-transform:uppercase;font-size:.85em;letter-spacing:1px;font-family:Segoe UI,sans-serif;font-weight:600}tbody tr:nth-child(odd){background:rgba(0,0,0,.1)}tbody{border:solid #999;border-width:1px 0}article{padding:0 1em}@media (min-width:720px){blockquote{margin-left:-1.4375em;padding-left:1.25em}article{padding:0 1.25em}article,header{margin:0 auto;max-width:43.75em}header{margin-top:32px;text-align:center}} | 1 | a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,video{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:"";content:none}table{border-collapse:collapse;border-spacing:0}body{background-color:#fff;color:#444;font-family:Georgia;line-height:1.7;-ms-content-zooming:none;margin-bottom:64px}h1,h2,h3,h4,h5,h6{font-weight:600;margin:.2em 0}article h1,article h2,article h3,article h4,article h5,article h6{text-align:left;line-height:1.3}h1{font-size:1.4em}h2{font-size:1.3em}h3,h4{font-size:1.2em}h5,h6{font-size:1.1em}p{margin-bottom:.75em}b,strong{font-weight:700}em,i{font-style:italic}a{color:#444;text-decoration:underline}a:active,a:hover{outline:0}dl,ol,p,ul{margin:0 0 1.75em}ol,ul{padding-left:1.25em}li{padding-bottom:.2em;line-height:1.6}li li:last-child,li p:last-child{margin-bottom:-.2em}ol li:last-child,ul li:last-child{padding-bottom:0}mark{padding:0 .2em}mark a{text-decoration:none}blockquote{font-style:italic;border-left:.25em solid #000;margin-left:-20px;padding-left:17px;margin-bottom:.5em;margin-top:.5em}blockquote cite{text-transform:uppercase;font-size:.8em;font-style:normal}blockquote cite:before{content:"\2014";margin-right:.5em}img{display:block;height:auto;margin-bottom:.5em;max-width:100%}figure{margin:0}figure figcaption{display:block;margin-top:.3em;font-style:italic;font-size:.8em}button{display:none!important}hr{display:block;height:1px;border:solid #666;border-width:1px 0 0;margin:1.6em 0;padding:0}small{font-size:.7em}dl{margin:1.6em 0}dl dt{float:left;width:11.25em;overflow:hidden;clear:left;text-align:right;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap;font-weight:700}dl dd,dl dt{margin-bottom:1em}dl dd{margin-left:12.5em}pre{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:4em 0;border:.0625em solid #efefef;width:100%;padding:1em;font-family:Consolas,monospace;white-space:pre;overflow:auto}pre code{line-height:1.6em;white-space:pre-wrap;background:transparent;border:none;padding:0;vertical-align:inherit}code,pre code{font-size:.8em}code{padding:.125em .375em;margin:0 .2em;font-family:Consolas,monospace;white-space:pre;border:1px solid #d3d3d3;overflow:auto}audio,video{max-width:43.75em}::selection,mark{background:#666;color:#fff}table{border-collapse:collapse;margin-bottom:2em;width:100%}td,th{padding:.25em;text-align:left}thead tr{text-transform:uppercase;font-size:.85em;letter-spacing:1px;font-family:Segoe UI,sans-serif;font-weight:600}tbody tr:nth-child(2n+1){background:rgba(0,0,0,.1)}tbody{border:solid #999;border-width:1px 0}figure{text-align:center}figure>*{margin:0 auto}header{text-align:center}.shared-by{margin-bottom:1em}@media (max-width:719px){article,header>:not(.preview){padding:0 1em}}@media (min-width:720px){blockquote{margin-left:-1.4375em;padding-left:1.25em}header{margin-top:32px}.block{margin-left:auto;margin-right:auto;max-width:43.75em;padding:0 1.25em}} |
2 | /*# sourceMappingURL=public.css.map*/ \ No newline at end of file | 2 | /*# sourceMappingURL=public.css.map*/ \ No newline at end of file |