squeegily
/
pleroma
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 42 Wiki Activity
Browse Source

Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop' 

Update frontend to c54111797a

See merge request pleroma/pleroma!2158
revert/attachment-cleanup
lain 4 years ago
parent
e8f22451da f5bfb29d3b
commit
f1d5c0f079
22 changed files with 164 additions and 23 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      priv/static/index.html
  2. BIN
      priv/static/static/font/fontello.1579102213354.woff2
  3. BIN
      priv/static/static/font/fontello.1580232989700.eot
  4. +0
    -0
      priv/static/static/font/fontello.1580232989700.svg
  5. BIN
      priv/static/static/font/fontello.1580232989700.ttf
  6. BIN
      priv/static/static/font/fontello.1580232989700.woff
  7. BIN
      priv/static/static/font/fontello.1580232989700.woff2
  8. +136
    -0
      priv/static/static/fontello.1580232989700.css
  9. +2
    -2
      priv/static/static/js/2.59b096781ddca107175d.js
  10. +1
    -1
      priv/static/static/js/2.59b096781ddca107175d.js.map
  11. +0
    -1
      priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js.map
  12. +2
    -0
      priv/static/static/js/app.9cfed8f3d06c299128ea.js
  13. +1
    -0
      priv/static/static/js/app.9cfed8f3d06c299128ea.js.map
  14. +0
    -2
      priv/static/static/js/app.a43640742dacfb13b6b0.js
  15. +0
    -1
      priv/static/static/js/app.a43640742dacfb13b6b0.js.map
  16. +0
    -1
      priv/static/static/js/app.a9b3f4c3e79baf3fa8b7.js.map
  17. +0
    -1
      priv/static/static/js/vendors~app.3f1ed7a4fdfc37ee27a7.js.map
  18. +0
    -1
      priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js.map
  19. +9
    -8
      priv/static/static/js/vendors~app.9ab182239f3a2abee89f.js
  20. +1
    -0
      priv/static/static/js/vendors~app.9ab182239f3a2abee89f.js.map
  21. +1
    -1
      priv/static/sw-pleroma.js
  22. +10
    -3
      priv/static/sw.js

+ 1
- 1
priv/static/index.html View File

@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.ae04505b31bb0ee2765e.css rel=stylesheet><link href=/static/fontello.1579102213354.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.86bc6d5e06d2e17976c5.js></script><script type=text/javascript src=/static/js/app.a43640742dacfb13b6b0.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.ae04505b31bb0ee2765e.css rel=stylesheet><link href=/static/fontello.1580232989700.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.9ab182239f3a2abee89f.js></script><script type=text/javascript src=/static/js/app.9cfed8f3d06c299128ea.js></script></body></html>

BIN
priv/static/static/font/fontello.1579102213354.woff2 View File


BIN
priv/static/static/font/fontello.1579102213354.eot → priv/static/static/font/fontello.1580232989700.eot View File


priv/static/static/font/fontello.1579102213354.svg → priv/static/static/font/fontello.1580232989700.svg View File


BIN
priv/static/static/font/fontello.1579102213354.ttf → priv/static/static/font/fontello.1580232989700.ttf View File


BIN
priv/static/static/font/fontello.1579102213354.woff → priv/static/static/font/fontello.1580232989700.woff View File


BIN
priv/static/static/font/fontello.1580232989700.woff2 View File


+ 136
- 0
priv/static/static/fontello.1580232989700.css View File

@@ -0,0 +1,136 @@
@font-face {
font-family: "Icons";
src: url("./font/fontello.1580232989700.eot");
src: url("./font/fontello.1580232989700.eot") format("embedded-opentype"),
url("./font/fontello.1580232989700.woff2") format("woff2"),
url("./font/fontello.1580232989700.woff") format("woff"),
url("./font/fontello.1580232989700.ttf") format("truetype"),
url("./font/fontello.1580232989700.svg") format("svg");
font-weight: normal;
font-style: normal;
}

[class^="icon-"]::before,
[class*=" icon-"]::before {
font-family: "Icons";
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
font-variant: normal;
text-transform: none;
line-height: 1em;
margin-left: .2em;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.icon-spin4::before { content: "\e834"; }

.icon-cancel::before { content: "\e800"; }

.icon-upload::before { content: "\e801"; }

.icon-spin3::before { content: "\e832"; }

.icon-reply::before { content: "\f112"; }

.icon-star::before { content: "\e802"; }

.icon-star-empty::before { content: "\e803"; }

.icon-retweet::before { content: "\e804"; }

.icon-eye-off::before { content: "\e805"; }

.icon-binoculars::before { content: "\f1e5"; }

.icon-cog::before { content: "\e807"; }

.icon-user-plus::before { content: "\f234"; }

.icon-menu::before { content: "\f0c9"; }

.icon-logout::before { content: "\e808"; }

.icon-down-open::before { content: "\e809"; }

.icon-attach::before { content: "\e80a"; }

.icon-link-ext::before { content: "\f08e"; }

.icon-link-ext-alt::before { content: "\f08f"; }

.icon-picture::before { content: "\e80b"; }

.icon-video::before { content: "\e80c"; }

.icon-right-open::before { content: "\e80d"; }

.icon-left-open::before { content: "\e80e"; }

.icon-up-open::before { content: "\e80f"; }

.icon-comment-empty::before { content: "\f0e5"; }

.icon-mail-alt::before { content: "\f0e0"; }

.icon-lock::before { content: "\e811"; }

.icon-lock-open-alt::before { content: "\f13e"; }

.icon-globe::before { content: "\e812"; }

.icon-brush::before { content: "\e813"; }

.icon-search::before { content: "\e806"; }

.icon-adjust::before { content: "\e816"; }

.icon-thumbs-up-alt::before { content: "\f164"; }

.icon-attention::before { content: "\e814"; }

.icon-plus-squared::before { content: "\f0fe"; }

.icon-plus::before { content: "\e815"; }

.icon-edit::before { content: "\e817"; }

.icon-play-circled::before { content: "\f144"; }

.icon-pencil::before { content: "\e818"; }

.icon-chart-bar::before { content: "\e81b"; }

.icon-smile::before { content: "\f118"; }

.icon-bell-alt::before { content: "\f0f3"; }

.icon-wrench::before { content: "\e81a"; }

.icon-pin::before { content: "\e819"; }

.icon-ellipsis::before { content: "\f141"; }

.icon-bell-ringing-o::before { content: "\e810"; }

.icon-zoom-in::before { content: "\e81c"; }

.icon-gauge::before { content: "\f0e4"; }

.icon-users::before { content: "\e81d"; }

.icon-info-circled::before { content: "\e81f"; }

.icon-home-2::before { content: "\e821"; }

.icon-chat::before { content: "\e81e"; }

.icon-login::before { content: "\e820"; }

.icon-arrow-curved::before { content: "\e822"; }

priv/static/static/js/2.8896ea39a0ea8016391a.js → priv/static/static/js/2.59b096781ddca107175d.js View File

@@ -1,2 +1,2 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([[2],{567:function(t,e,i){var c=i(568);"string"==typeof c&&(c=[[t.i,c,""]]),c.locals&&(t.exports=c.locals);(0,i(3).default)("cc6cdea4",c,!0,{})},568:function(t,e,i){(t.exports=i(2)(!1)).push([t.i,".sticker-picker{width:100%}.sticker-picker .contents{min-height:250px}.sticker-picker .contents .sticker-picker-content{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 4px}.sticker-picker .contents .sticker-picker-content .sticker{display:-ms-flexbox;display:flex;-ms-flex:1 1 auto;flex:1 1 auto;margin:4px;width:56px;height:56px}.sticker-picker .contents .sticker-picker-content .sticker img{height:100%}.sticker-picker .contents .sticker-picker-content .sticker img:hover{filter:drop-shadow(0 0 5px var(--link,#d8a070))}",""])},569:function(t,e,i){"use strict";i.r(e);var c=i(88),n={components:{TabSwitcher:i(49).a},data:function(){return{meta:{stickers:[]},path:""}},computed:{pack:function(){return this.$store.state.instance.stickers||[]}},methods:{clear:function(){this.meta={stickers:[]}},pick:function(t,e){var i=this,n=this.$store;fetch(t).then(function(t){t.blob().then(function(t){var a=new File([t],e,{mimetype:"image/png"}),s=new FormData;s.append("file",a),c.a.uploadMedia({store:n,formData:s}).then(function(t){i.$emit("uploaded",t),i.clear()},function(t){console.warn("Can't attach sticker"),console.warn(t),i.$emit("upload-failed","default")})})})}}},a=i(0);var s=function(t){i(567)},r=Object(a.a)(n,function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"sticker-picker"},[i("tab-switcher",{staticClass:"tab-switcher",attrs:{"render-only-focused":!0,"scrollable-tabs":""}},t._l(t.pack,function(e){return i("div",{key:e.path,staticClass:"sticker-picker-content",attrs:{"image-tooltip":e.meta.title,image:e.path+e.meta.tabIcon}},t._l(e.meta.stickers,function(c){return i("div",{key:c,staticClass:"sticker",on:{click:function(i){i.stopPropagation(),i.preventDefault(),t.pick(e.path+c,e.meta.title)}}},[i("img",{attrs:{src:e.path+c}})])}),0)}),0)],1)},[],!1,s,null,null);e.default=r.exports}}]);
//# sourceMappingURL=2.8896ea39a0ea8016391a.js.map
(window.webpackJsonp=window.webpackJsonp||[]).push([[2],{575:function(t,e,i){var c=i(576);"string"==typeof c&&(c=[[t.i,c,""]]),c.locals&&(t.exports=c.locals);(0,i(3).default)("cc6cdea4",c,!0,{})},576:function(t,e,i){(t.exports=i(2)(!1)).push([t.i,".sticker-picker{width:100%}.sticker-picker .contents{min-height:250px}.sticker-picker .contents .sticker-picker-content{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 4px}.sticker-picker .contents .sticker-picker-content .sticker{display:-ms-flexbox;display:flex;-ms-flex:1 1 auto;flex:1 1 auto;margin:4px;width:56px;height:56px}.sticker-picker .contents .sticker-picker-content .sticker img{height:100%}.sticker-picker .contents .sticker-picker-content .sticker img:hover{filter:drop-shadow(0 0 5px var(--link,#d8a070))}",""])},577:function(t,e,i){"use strict";i.r(e);var c=i(88),n={components:{TabSwitcher:i(51).a},data:function(){return{meta:{stickers:[]},path:""}},computed:{pack:function(){return this.$store.state.instance.stickers||[]}},methods:{clear:function(){this.meta={stickers:[]}},pick:function(t,e){var i=this,n=this.$store;fetch(t).then(function(t){t.blob().then(function(t){var a=new File([t],e,{mimetype:"image/png"}),s=new FormData;s.append("file",a),c.a.uploadMedia({store:n,formData:s}).then(function(t){i.$emit("uploaded",t),i.clear()},function(t){console.warn("Can't attach sticker"),console.warn(t),i.$emit("upload-failed","default")})})})}}},a=i(0);var s=function(t){i(575)},r=Object(a.a)(n,function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"sticker-picker"},[i("tab-switcher",{staticClass:"tab-switcher",attrs:{"render-only-focused":!0,"scrollable-tabs":""}},t._l(t.pack,function(e){return i("div",{key:e.path,staticClass:"sticker-picker-content",attrs:{"image-tooltip":e.meta.title,image:e.path+e.meta.tabIcon}},t._l(e.meta.stickers,function(c){return i("div",{key:c,staticClass:"sticker",on:{click:function(i){i.stopPropagation(),i.preventDefault(),t.pick(e.path+c,e.meta.title)}}},[i("img",{attrs:{src:e.path+c}})])}),0)}),0)],1)},[],!1,s,null,null);e.default=r.exports}}]);
//# sourceMappingURL=2.59b096781ddca107175d.js.map

priv/static/static/js/2.59b096781ddca107175d.js.map
File diff suppressed because it is too large
View File


+ 0
- 1
priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js.map
File diff suppressed because it is too large
View File


+ 2
- 0
priv/static/static/js/app.9cfed8f3d06c299128ea.js
File diff suppressed because it is too large
View File


+ 1
- 0
priv/static/static/js/app.9cfed8f3d06c299128ea.js.map
File diff suppressed because it is too large
View File


+ 0
- 2
priv/static/static/js/app.a43640742dacfb13b6b0.js
File diff suppressed because it is too large
View File


+ 0
- 1
priv/static/static/js/app.a43640742dacfb13b6b0.js.map
File diff suppressed because it is too large
View File


+ 0
- 1
priv/static/static/js/app.a9b3f4c3e79baf3fa8b7.js.map
File diff suppressed because it is too large
View File


+ 0
- 1
priv/static/static/js/vendors~app.3f1ed7a4fdfc37ee27a7.js.map
File diff suppressed because it is too large
View File


+ 0
- 1
priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js.map
File diff suppressed because it is too large
View File


priv/static/static/js/vendors~app.9ab182239f3a2abee89f.js
File diff suppressed because it is too large
View File


+ 1
- 0
priv/static/static/js/vendors~app.9ab182239f3a2abee89f.js.map
File diff suppressed because it is too large
View File


+ 1
- 1
priv/static/sw-pleroma.js View File

@@ -1,4 +1,4 @@
var serviceWorkerOption = {"assets":["/static/fontello.1579102213354.css","/static/font/fontello.1579102213354.eot","/static/font/fontello.1579102213354.svg","/static/font/fontello.1579102213354.ttf","/static/font/fontello.1579102213354.woff","/static/font/fontello.1579102213354.woff2","/static/img/nsfw.74818f9.png","/static/css/app.ae04505b31bb0ee2765e.css","/static/js/app.a43640742dacfb13b6b0.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.86bc6d5e06d2e17976c5.js","/static/js/2.8896ea39a0ea8016391a.js"]};
var serviceWorkerOption = {"assets":["/static/fontello.1580232989700.css","/static/font/fontello.1580232989700.eot","/static/font/fontello.1580232989700.svg","/static/font/fontello.1580232989700.ttf","/static/font/fontello.1580232989700.woff","/static/font/fontello.1580232989700.woff2","/static/img/nsfw.74818f9.png","/static/css/app.ae04505b31bb0ee2765e.css","/static/js/app.9cfed8f3d06c299128ea.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.9ab182239f3a2abee89f.js","/static/js/2.59b096781ddca107175d.js"]};
!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/",t(t.s=1)}([function(e,n){
/*!


+ 10
- 3
priv/static/sw.js
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save