From ec779ab541e8113505a345a54df8aa14bee3ce00 Mon Sep 17 00:00:00 2001 From: sheychen Date: Tue, 16 Apr 2019 18:06:10 +0200 Subject: [PATCH] Grid position --- compiler/dist/mastodon/main.js | 2 +- compiler/dist/nextcloud-news/main.js | 2 +- compiler/dist/openweathermap/main.js | 2 +- compiler/src/mastodon/client.vue | 4 +- compiler/src/nextcloud-news/main.vue | 7 ++- compiler/src/openweathermap/chart.vue | 2 +- compiler/src/openweathermap/main.vue | 2 +- index.html | 6 ++- main.css | 66 +++++++++++++++++---------- main.css.map | 2 +- main.js | 10 +++- main.sass | 32 +++++++------ 12 files changed, 89 insertions(+), 48 deletions(-) diff --git a/compiler/dist/mastodon/main.js b/compiler/dist/mastodon/main.js index 17713ad..3571082 100644 --- a/compiler/dist/mastodon/main.js +++ b/compiler/dist/mastodon/main.js @@ -1 +1 @@ -!function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=81)}([function(t,e,n){var r=n(19)("wks"),o=n(13),i=n(1).Symbol,s="function"==typeof i;(t.exports=function(t){return r[t]||(r[t]=s&&i[t]||(s?i:o)("Symbol."+t))}).store=r},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e,n){t.exports=!n(3)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e,n){var r=n(5),o=n(36),i=n(17),s=Object.defineProperty;e.f=n(2)?Object.defineProperty:function(t,e,n){if(r(t),e=i(e,!0),r(n),o)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e,n){var r=n(8);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e,n){var r=n(4),o=n(18);t.exports=n(2)?function(t,e,n){return r.f(t,e,o(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(1),o=n(7),i=n(6),s=n(13)("src"),a=n(49),c=(""+a).split("toString");n(12).inspectSource=function(t){return a.call(t)},(t.exports=function(t,e,n,a){var u="function"==typeof n;u&&(i(n,"name")||o(n,"name",e)),t[e]!==n&&(u&&(i(n,s)||o(n,s,t[e]?""+t[e]:c.join(String(e)))),t===r?t[e]=n:a?t[e]?t[e]=n:o(t,e,n):(delete t[e],o(t,e,n)))})(Function.prototype,"toString",function(){return"function"==typeof this&&this[s]||a.call(this)})},function(t,e,n){var r=n(52),o=n(16);t.exports=function(t){return r(o(t))}},function(t,e,n){var r=n(1),o=n(12),i=n(7),s=n(9),a=n(38),c=function(t,e,n){var u,l,f,p,v=t&c.F,h=t&c.G,d=t&c.S,g=t&c.P,m=t&c.B,y=h?r:d?r[e]||(r[e]={}):(r[e]||{}).prototype,_=h?o:o[e]||(o[e]={}),b=_.prototype||(_.prototype={});for(u in h&&(n=e),n)f=((l=!v&&y&&void 0!==y[u])?y:n)[u],p=m&&l?a(f,r):g&&"function"==typeof f?a(Function.call,f):f,y&&s(y,u,f,t&c.U),_[u]!=f&&i(_,u,p),g&&b[u]!=f&&(b[u]=f)};r.core=o,c.F=1,c.G=2,c.S=4,c.P=8,c.B=16,c.W=32,c.U=64,c.R=128,t.exports=c},function(t,e){var n=t.exports={version:"2.6.5"};"number"==typeof __e&&(__e=n)},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e,n){var r=n(42),o=n(26);t.exports=Object.keys||function(t){return r(t,o)}},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e){t.exports=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t}},function(t,e,n){var r=n(8);t.exports=function(t,e){if(!r(t))return t;var n,o;if(e&&"function"==typeof(n=t.toString)&&!r(o=n.call(t)))return o;if("function"==typeof(n=t.valueOf)&&!r(o=n.call(t)))return o;if(!e&&"function"==typeof(n=t.toString)&&!r(o=n.call(t)))return o;throw TypeError("Can't convert object to primitive value")}},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e,n){var r=n(12),o=n(1),i=o["__core-js_shared__"]||(o["__core-js_shared__"]={});(t.exports=function(t,e){return i[t]||(i[t]=void 0!==e?e:{})})("versions",[]).push({version:r.version,mode:n(20)?"pure":"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})},function(t,e){t.exports=!1},function(t,e,n){"use strict";var r=n(1),o=n(6),i=n(15),s=n(65),a=n(17),c=n(3),u=n(29).f,l=n(30).f,f=n(4).f,p=n(67).trim,v=r.Number,h=v,d=v.prototype,g="Number"==i(n(28)(d)),m="trim"in String.prototype,y=function(t){var e=a(t,!1);if("string"==typeof e&&e.length>2){var n,r,o,i=(e=m?e.trim():p(e,3)).charCodeAt(0);if(43===i||45===i){if(88===(n=e.charCodeAt(2))||120===n)return NaN}else if(48===i){switch(e.charCodeAt(1)){case 66:case 98:r=2,o=49;break;case 79:case 111:r=8,o=55;break;default:return+e}for(var s,c=e.slice(2),u=0,l=c.length;uo)return NaN;return parseInt(c,r)}}return+e};if(!v(" 0o1")||!v("0b1")||v("+0x1")){v=function(t){var e=arguments.length<1?0:t,n=this;return n instanceof v&&(g?c(function(){d.valueOf.call(n)}):"Number"!=i(n))?s(new h(y(e)),n,v):y(e)};for(var _,b=n(2)?u(h):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),x=0;b.length>x;x++)o(h,_=b[x])&&!o(v,_)&&f(v,_,l(h,_));v.prototype=d,d.constructor=v,n(9)(r,"Number",v)}},function(t,e,n){"use strict";var r=n(1),o=n(6),i=n(2),s=n(11),a=n(9),c=n(50).KEY,u=n(3),l=n(19),f=n(23),p=n(13),v=n(0),h=n(40),d=n(41),g=n(51),m=n(55),y=n(5),_=n(8),b=n(10),x=n(17),w=n(18),S=n(28),O=n(58),k=n(30),E=n(4),C=n(14),j=k.f,M=E.f,P=O.f,N=r.Symbol,T=r.JSON,I=T&&T.stringify,R=v("_hidden"),A=v("toPrimitive"),L={}.propertyIsEnumerable,F=l("symbol-registry"),D=l("symbols"),$=l("op-symbols"),B=Object.prototype,V="function"==typeof N,G=r.QObject,H=!G||!G.prototype||!G.prototype.findChild,z=i&&u(function(){return 7!=S(M({},"a",{get:function(){return M(this,"a",{value:7}).a}})).a})?function(t,e,n){var r=j(B,e);r&&delete B[e],M(t,e,n),r&&t!==B&&M(B,e,r)}:M,U=function(t){var e=D[t]=S(N.prototype);return e._k=t,e},J=V&&"symbol"==typeof N.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof N},W=function(t,e,n){return t===B&&W($,e,n),y(t),e=x(e,!0),y(n),o(D,e)?(n.enumerable?(o(t,R)&&t[R][e]&&(t[R][e]=!1),n=S(n,{enumerable:w(0,!1)})):(o(t,R)||M(t,R,w(1,{})),t[R][e]=!0),z(t,e,n)):M(t,e,n)},X=function(t,e){y(t);for(var n,r=g(e=b(e)),o=0,i=r.length;i>o;)W(t,n=r[o++],e[n]);return t},Y=function(t){var e=L.call(this,t=x(t,!0));return!(this===B&&o(D,t)&&!o($,t))&&(!(e||!o(this,t)||!o(D,t)||o(this,R)&&this[R][t])||e)},q=function(t,e){if(t=b(t),e=x(e,!0),t!==B||!o(D,e)||o($,e)){var n=j(t,e);return!n||!o(D,e)||o(t,R)&&t[R][e]||(n.enumerable=!0),n}},K=function(t){for(var e,n=P(b(t)),r=[],i=0;n.length>i;)o(D,e=n[i++])||e==R||e==c||r.push(e);return r},Q=function(t){for(var e,n=t===B,r=P(n?$:b(t)),i=[],s=0;r.length>s;)!o(D,e=r[s++])||n&&!o(B,e)||i.push(D[e]);return i};V||(a((N=function(){if(this instanceof N)throw TypeError("Symbol is not a constructor!");var t=p(arguments.length>0?arguments[0]:void 0),e=function(n){this===B&&e.call($,n),o(this,R)&&o(this[R],t)&&(this[R][t]=!1),z(this,t,w(1,n))};return i&&H&&z(B,t,{configurable:!0,set:e}),U(t)}).prototype,"toString",function(){return this._k}),k.f=q,E.f=W,n(29).f=O.f=K,n(27).f=Y,n(44).f=Q,i&&!n(20)&&a(B,"propertyIsEnumerable",Y,!0),h.f=function(t){return U(v(t))}),s(s.G+s.W+s.F*!V,{Symbol:N});for(var Z="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),tt=0;Z.length>tt;)v(Z[tt++]);for(var et=C(v.store),nt=0;et.length>nt;)d(et[nt++]);s(s.S+s.F*!V,"Symbol",{for:function(t){return o(F,t+="")?F[t]:F[t]=N(t)},keyFor:function(t){if(!J(t))throw TypeError(t+" is not a symbol!");for(var e in F)if(F[e]===t)return e},useSetter:function(){H=!0},useSimple:function(){H=!1}}),s(s.S+s.F*!V,"Object",{create:function(t,e){return void 0===e?S(t):X(S(t),e)},defineProperty:W,defineProperties:X,getOwnPropertyDescriptor:q,getOwnPropertyNames:K,getOwnPropertySymbols:Q}),T&&s(s.S+s.F*(!V||u(function(){var t=N();return"[null]"!=I([t])||"{}"!=I({a:t})||"{}"!=I(Object(t))})),"JSON",{stringify:function(t){for(var e,n,r=[t],o=1;arguments.length>o;)r.push(arguments[o++]);if(n=e=r[1],(_(e)||void 0!==t)&&!J(t))return m(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!J(e))return e}),r[1]=e,I.apply(T,r)}}),N.prototype[A]||n(7)(N.prototype,A,N.prototype.valueOf),f(N,"Symbol"),f(Math,"Math",!0),f(r.JSON,"JSON",!0)},function(t,e,n){var r=n(4).f,o=n(6),i=n(0)("toStringTag");t.exports=function(t,e,n){t&&!o(t=n?t:t.prototype,i)&&r(t,i,{configurable:!0,value:e})}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(19)("keys"),o=n(13);t.exports=function(t){return r[t]||(r[t]=o(t))}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e){e.f={}.propertyIsEnumerable},function(t,e,n){var r=n(5),o=n(56),i=n(26),s=n(25)("IE_PROTO"),a=function(){},c=function(){var t,e=n(37)("iframe"),r=i.length;for(e.style.display="none",n(57).appendChild(e),e.src="javascript:",(t=e.contentWindow.document).open(),t.write(" diff --git a/main.css b/main.css index c5bfaa3..511a005 100644 --- a/main.css +++ b/main.css @@ -2,6 +2,7 @@ margin: 0; padding: 0; font-family: Verdana, Geneva, sans-serif; + scrollbar-width: thin; } body { @@ -51,16 +52,18 @@ a { #services { height: 100vh; - overflow: hidden; - display: -webkit-box; - display: -ms-flexbox; - display: flex; + display: -ms-grid; + display: grid; + grid-gap: .2em; + -ms-grid-columns: (minmax(0, 1fr))[8]; + grid-template-columns: repeat(8, minmax(0, 1fr)); + -ms-grid-rows: (minmax(0, 1fr))[4]; + grid-template-rows: repeat(4, minmax(0, 1fr)); + justify-items: stretch; } #services > div { - -webkit-box-flex: 1; - -ms-flex: 1; - flex: 1; + overflow: auto; } #services > div .service-header .title, #services > div .service-header .settings { @@ -117,20 +120,21 @@ a { } } +.mastodon { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; +} + .mastodon .client { display: -webkit-box; display: -ms-flexbox; display: flex; - height: 100vh; - overflow: hidden; -} - -.mastodon .client .list { - height: 100%; overflow-y: auto; - min-height: -webkit-min-content; - min-height: -moz-min-content; - min-height: min-content; } .mastodon .client .list > div { @@ -228,7 +232,6 @@ a { -webkit-box-direction: normal; -ms-flex-direction: column; flex-direction: column; - max-width: 30%; } .openweathermap .list { @@ -253,9 +256,12 @@ a { -webkit-box-flex: 1; -ms-flex: 1; flex: 1; - max-height: 100%; - overflow-y: auto; - overflow-x: hidden; + overflow: hidden; +} + +.openweathermap .forecast .chart { + position: relative; + height: 100%; } .openweathermap .weather { @@ -308,9 +314,9 @@ a { grid-area: remove; -ms-grid-column-align: right; justify-self: right; - -ms-flex-item-align: bottom; - -ms-grid-row-align: bottom; - align-self: bottom; + -ms-flex-item-align: end; + -ms-grid-row-align: end; + align-self: end; font-size: .8em; } @@ -324,6 +330,20 @@ a { margin-top: -10px; } +.nextcloud-news { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; +} + +.nextcloud-news .unreaded { + overflow-y: auto; +} + .nextcloud-news .news { margin: 0.3em; background-color: #222; diff --git a/main.css.map b/main.css.map index 1526206..c3d9b37 100644 --- a/main.css.map +++ b/main.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "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", + "mappings": "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", "sources": [ "main.sass" ], diff --git a/main.js b/main.js index 4f3078d..489526c 100644 --- a/main.js +++ b/main.js @@ -33,7 +33,7 @@ var app = new Vue({ this.services.push({ type: this.newService, - options: {} + options: {}, position: {} }) this.newService = '' this.showManager = false @@ -41,7 +41,7 @@ var app = new Vue({ }, setService(id, options) { this.$set(this.services, id, { - type: this.services[id].type, + ...this.services[id], options: options }) this.saveServices() @@ -53,6 +53,12 @@ var app = new Vue({ saveServices() { localStorage.setItem(servicesStorage, JSON.stringify(this.services)) this.$forceUpdate() + }, + gridPos(id, position = {}) { + return { + "grid-row": `${position.x || 1} / span ${position.h || 2}`, + "grid-column": `${position.y || id*2+1} / span ${position.w || 2}` + } } } }) \ No newline at end of file diff --git a/main.sass b/main.sass index f7097de..66f839d 100644 --- a/main.sass +++ b/main.sass @@ -18,6 +18,7 @@ $foreColor: #eee margin: 0 padding: 0 font-family: Verdana, Geneva, sans-serif + scrollbar-width: thin body background-color: $backColor @@ -53,10 +54,13 @@ a #services height: 100vh - overflow: hidden - display: flex + display: grid + grid-gap: .2em + grid-template-columns: repeat(8, minmax(0, 1fr)) + grid-template-rows: repeat(4, minmax(0, 1fr)) + justify-items: stretch & > div - flex: 1 + overflow: auto .service-header .title, .settings @include tile @@ -85,14 +89,12 @@ a transform: rotate(360deg) .mastodon + display: flex + flex-direction: column .client display: flex - height: 100vh - overflow: hidden + overflow-y: auto .list - height: 100% - overflow-y: auto - min-height: min-content & > div @include tile .statues @@ -151,7 +153,6 @@ a .openweathermap display: flex flex-direction: column - max-width: 30% .list display: flex flex-wrap: wrap @@ -160,9 +161,10 @@ a @include tile .forecast flex: 1 - max-height: 100% - overflow-y: auto - overflow-x: hidden + overflow: hidden + .chart + position: relative + height: 100% .weather min-width: 17em border: 1px solid $tileColor @@ -188,7 +190,7 @@ a .remove grid-area: remove justify-self: right - align-self: bottom + align-self: end font-size: .8em .ic overflow: hidden @@ -198,6 +200,10 @@ a margin-top: -10px .nextcloud-news + display: flex + flex-direction: column + .unreaded + overflow-y: auto .news @include tile .date