Skip to content
Snippets Groups Projects
Commit e71a588a authored by Aleksandr Gumroian's avatar Aleksandr Gumroian
Browse files

Merge branch 'fix-small-bugs' into 'master' 

Fix small bugs

See merge request turris/webapps!10
parents 7371c96b 61108eb3
Branches
Tags v4.1.0
1 merge request!10Fix small bugs
Hide whitespace changes
Inline Side-by-side
css/styles.css
+ 6
− 8
View file @ e71a588a
......@@ -40,7 +40,7 @@ main .intro {
}
.row-cols-1 .card {
max-width: 330px;
max-width: 310px;
}
.card {
......@@ -82,14 +82,12 @@ footer p {
}
/* Safari only */
@media not all and (min-resolution:.001dpcm){
@supports (-webkit-appearance:none) {
@media not all and (min-resolution: 0.001dpcm) {
@supports (-webkit-appearance: none) {
/* Fix odd icons padding */
.card-img-top {
padding-top: 0!important;
padding-bottom: 0!important;
}
padding-top: 0 !important;
padding-bottom: 0 !important;
}
}
}
css/styles.min.css
+ 1
− 1
View file @ e71a588a
body{background-color:#f5f5f5;padding-top:60px}main .intro{padding-top:1rem;padding-bottom:1rem;margin-bottom:0;background-color:none}@media (min-width:768px){.intro{padding-top:3rem;padding-bottom:3rem}}.intro p:last-child{margin-bottom:0}.intro h1{font-weight:300}.intro .container{max-width:40rem}#progress-bar{transition:all 1s linear}.row-cols-1 .card{max-width:330px}.card{transition:transform .4s;-webkit-transition:transform .4s}.card:hover{box-shadow:0 1rem 1.5rem rgba(0,0,0,.175)!important;transform:scale(1.03);-webkit-transform:scale(1.03);transition:transform .4s;-webkit-transition:transform .4s}.card-body a:hover{text-decoration:none}.card p.card-text{margin-bottom:.5rem}footer{padding-top:3rem;padding-bottom:3rem}footer p{margin-bottom:.25rem}.footer{background-color:#f5f5f5}.alt-theme-color{background-color:#000}@media not all and (min-resolution:.001dpcm){@supports (-webkit-appearance:none){.card-img-top{padding-top:0!important;padding-bottom:0!important}}}
\ No newline at end of file
body{background-color:#f5f5f5;padding-top:60px}main .intro{padding-top:1rem;padding-bottom:1rem;margin-bottom:0;background-color:none}@media (min-width:768px){.intro{padding-top:3rem;padding-bottom:3rem}}.intro p:last-child{margin-bottom:0}.intro h1{font-weight:300}.intro .container{max-width:40rem}#progress-bar{transition:all 1s linear}.row-cols-1 .card{max-width:310px}.card{transition:transform .4s;-webkit-transition:transform .4s}.card:hover{box-shadow:0 1rem 1.5rem rgba(0,0,0,.175)!important;transform:scale(1.03);-webkit-transform:scale(1.03);transition:transform .4s;-webkit-transition:transform .4s}.card-body a:hover{text-decoration:none}.card p.card-text{margin-bottom:.5rem}footer{padding-top:3rem;padding-bottom:3rem}footer p{margin-bottom:.25rem}.footer{background-color:#f5f5f5}.alt-theme-color{background-color:#000}@media not all and (min-resolution:0.001dpcm){@supports (-webkit-appearance:none){.card-img-top{padding-top:0!important;padding-bottom:0!important}}}
\ No newline at end of file
js/apps.json
+ 2
− 2
View file @ e71a588a
......@@ -2,11 +2,11 @@
"langs": {
"en": {
"title": "Available applications",
"countdown": "Switching to the highlighted app in:"
"countdown": "Switching to the default app in:"
},
"cs": {
"title": "Dostupné rozhraní",
"countdown": "Přepnutí na označené rozhraní za:"
"countdown": "Přepnutí na výchozí rozhraní za:"
}
},
"selected": "foris",
......
js/script.js
+ 3
− 3
View file @ e71a588a
......@@ -115,14 +115,14 @@ getJSON("js/apps.json")
<a
href="${url}"
title="${title} - ${appDescription}"
class="stretched-link"
class="stretched-link d-inline-block"
tabindex="${i + 1}"
>
<h2 class="h3 text-dark d-inline-block align-middle card-name">${title}</h2>
<h2 class="h3 text-dark d-inline align-middle card-name">${title}</h2>
</a>
${
selectedApp
? "<span class='badge badge-primary ml-1 mb-1 align-middle'>default</span>"
? "<span class='badge badge-primary align-middle'>default</span>"
: ""
}
<p class="card-text text-truncate">
......
js/script.min.js
+ 1
− 1
View file @ e71a588a
const intro=document.getElementById("intro"),progressBar=document.getElementById("progress-bar");let appRedirect;window.onload=(()=>{let e=!0;setTimeout(()=>{if(e){e=!1;let n=25,a=100;const s=document.getElementById("progress-bar"),c=document.getElementById("timeout");c.textContent=` ${n} sec.`;const r=setInterval(t,1e3);function t(){let t=a/n;n=Math.max(0,n-1),c.textContent=` ${n} sec.`,a<1?(clearInterval(r),e=!0,redirectTo(appRedirect)):(a-=t,s.style.width=a+"%")}}},100)});const redirectTo=e=>{window.location.assign(e)},getJSON=async e=>{try{const t=await fetch(e);if(!t.ok)throw new Error(t.statusText);const n=await t.json();return n}catch(e){return e}};getJSON("js/apps.json").then(e=>{const t=e.langs,n=navigator.language||navigator.userLanguage;var a,s;switch(n){case"cs":a=t.cs.title,s=t.cs.countdown;break;default:a=t.en.title,s=t.en.countdown}intro.insertAdjacentHTML("beforeBegin",`<h1>${a}</h1>\n <p class="lead text-muted">${s}<span id="timeout"></span></p>`);for(let t=0;t<e.apps.length;t++){const a=e.apps[t],{title:s,icon:r,id:o,url:d}=a,{selected:i}=e,l=document.querySelector(".container .row");var c=a.description;switch(n){case"cs":c=a.description.cs;break;default:c=a.description.en}c||(c=a.description.en),i==o?(selectedApp=!0)&&(appRedirect=d):selectedApp=!1,l.innerHTML+=`\n <div class="col mb-5">\n <div class="card h-100 shadow-sm mr-auto ml-auto">\n <img class="bd-placeholder-img card-img-top p-5 border-bottom" src="${r}" alt="${s}" />\n <div class="card-body">\n <a \n href="${d}" \n title="${s} - ${c}" \n class="stretched-link" \n tabindex="${t+1}"\n >\n <h2 class="h3 text-dark d-inline-block align-middle card-name">${s}</h2>\n </a>\n ${selectedApp?"<span class='badge badge-primary ml-1 mb-1 align-middle'>default</span>":""} \n <p class="card-text text-truncate">\n ${c}\n </p>\n </div>\n </div>\n </div>`}}).catch(e=>{console.error(e)});
\ No newline at end of file
const intro=document.getElementById("intro"),progressBar=document.getElementById("progress-bar");let appRedirect;window.onload=(()=>{let e=!0;setTimeout(()=>{if(e){e=!1;let n=25,a=100;const s=document.getElementById("progress-bar"),c=document.getElementById("timeout");c.textContent=` ${n} sec.`;const r=setInterval(t,1e3);function t(){let t=a/n;n=Math.max(0,n-1),c.textContent=` ${n} sec.`,a<1?(clearInterval(r),e=!0,redirectTo(appRedirect)):(a-=t,s.style.width=a+"%")}}},100)});const redirectTo=e=>{window.location.assign(e)},getJSON=async e=>{try{const t=await fetch(e);if(!t.ok)throw new Error(t.statusText);const n=await t.json();return n}catch(e){return e}};getJSON("js/apps.json").then(e=>{const t=e.langs,n=navigator.language||navigator.userLanguage;var a,s;switch(n){case"cs":a=t.cs.title,s=t.cs.countdown;break;default:a=t.en.title,s=t.en.countdown}intro.insertAdjacentHTML("beforeBegin",`<h1>${a}</h1>\n <p class="lead text-muted">${s}<span id="timeout"></span></p>`);for(let t=0;t<e.apps.length;t++){const a=e.apps[t],{title:s,icon:r,id:o,url:i}=a,{selected:d}=e,l=document.querySelector(".container .row");var c=a.description;switch(n){case"cs":c=a.description.cs;break;default:c=a.description.en}c||(c=a.description.en),d==o?(selectedApp=!0)&&(appRedirect=i):selectedApp=!1,l.innerHTML+=`\n <div class="col mb-5">\n <div class="card h-100 shadow-sm mr-auto ml-auto">\n <img class="bd-placeholder-img card-img-top p-5 border-bottom" src="${r}" alt="${s}" />\n <div class="card-body">\n <a \n href="${i}" \n title="${s} - ${c}" \n class="stretched-link d-inline-block" \n tabindex="${t+1}"\n >\n <h2 class="h3 text-dark d-inline align-middle card-name">${s}</h2>\n </a>\n ${selectedApp?"<span class='badge badge-primary align-middle'>default</span>":""} \n <p class="card-text text-truncate">\n ${c}\n </p>\n </div>\n </div>\n </div>`}}).catch(e=>{console.error(e)});
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment