Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@flatsiedatsie
flatsiedatsie authored Jun 7, 2022
1 parent 14872e1 commit be26299
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 27 deletions.
81 changes: 63 additions & 18 deletions css/extension.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
}


#extension-voco-content-container{
width:100%;
max-width:80rem;
margin: 0 auto;
}

/* DELETE */


Expand Down Expand Up @@ -100,17 +106,12 @@
.extension-voco-item{
padding: 0;
display: flex;
/*background-color: #46769C;*/
background-color:rgba(0,0,0,.2);
border-radius:.5rem;
margin-top:1rem;
border-radius: .5rem;
position: relative;
width:100%;
}

.extension-voco-item{
margin-top: 4rem;
margin-bottom: 4rem;
}


Expand All @@ -127,6 +128,7 @@
overflow: hidden;
display:flex;
flex-wrap:wrap;
box-sizing:border-box;
}
.extension-voco-item-right{
text-align:center;
Expand All @@ -137,11 +139,12 @@
}

#extension-voco-server-list-toggle{
border-left: 1px solid rgba(255,255,255,.3);
border-top: 1px solid rgba(255,255,255,.3);
}

#extension-voco-view .rule-switch{
padding-right:0;
padding-top:1rem;
}


Expand Down Expand Up @@ -172,6 +175,8 @@
width:auto;
display:flex;
flex-wrap:wrap;
flex-direction:column;
margin:4rem auto;
}


Expand Down Expand Up @@ -261,12 +266,11 @@ body #extension-voco-view .extension-voco-tab-selected{


.extension-voco-tab-buttons{
margin-top: 4rem;
background-color: rgba(255,255,255,.1);
border-radius: .7rem;
overflow: hidden;
font-size:0;
max-width: 60rem;
/*max-width: 60rem;*/
margin: 4rem auto 0 auto;
}

Expand Down Expand Up @@ -363,13 +367,20 @@ body #extension-voco-view .extension-voco-tab-selected{

/* VOCO Timers */

/*
.extension-voco-centered-page{
padding:2rem 0;
max-width:80rem;
}
*/
/*
.extension-voco-centered-error,
.extension-voco-centered-page{
padding:2rem 0;
max-width:60rem;
margin: 4rem auto;
}

*/
.extension-voco-centered-error{
text-align:center;
padding:2rem;
Expand Down Expand Up @@ -546,7 +557,7 @@ body #extension-voco-view .extension-voco-tab-selected{
background-color: rgba(0,0,0,.1);
padding: 2rem;
border-radius: 0.5rem;
max-width: 60rem;
/*max-width: 60rem;*/
margin: 4rem auto;
box-sizing: border-box;
}
Expand Down Expand Up @@ -686,6 +697,7 @@ body #extension-voco-view .extension-voco-tab-selected{

#extension-voco-matrix-advanced-tip > p{
display:flex;
flex-wrap:wrap;
justify-content:space-between;
align-items:center;
}
Expand Down Expand Up @@ -716,6 +728,9 @@ body #extension-voco-view .extension-voco-tab-selected{
margin-left:auto;
}

#extension-voco-matrix-learn-more-button{
margin-top:2rem;
}

.extension-voco-align-items-right{
display:flex;
Expand Down Expand Up @@ -838,6 +853,27 @@ body #extension-voco-view .extension-voco-tab-selected{
}


@media screen and (max-width: 640px) {
#extension-voco-matrix-advanced-tip > p span{
display:block;
text-align:center;
padding:2rem;
width:100%;
}
#extension-voco-matrix-advanced-tip button{
margin: 0 auto;
}
.extension-voco-item{
flex-direction:column;
}
.extension-voco-item-menu{
border-top:1px solid rgba(255,255,255,.3);
}
.extension-voco-item-setter{
border-right:none;
}
}

@media screen and (min-width: 641px) {
.extension-voco-line2{
width:auto;
Expand All @@ -853,34 +889,43 @@ body #extension-voco-view .extension-voco-tab-selected{
.extension-voco-time{
margin-right:1rem;
}

/*
.extension-voco-centered-page{
padding: 2rem;
}

*/
.extension-voco-select-satellites-question{
flex-direction:row;
}

#extension-voco-view button{
padding:1rem 2rem;
}
#extension-voco-server-list-toggle{
border-top: none;
border-left: 1px solid rgba(255,255,255,.3);
}
#extension-voco-server-list-toggle{

}
}


@media screen and (min-width: 1025px) {
#extension-voco-view{
left:9.6rem;
top: 0;
height:100vh;
/*
left:9.6rem;
top: 0;
position:absolute;
width: calc(100% - 9.6rem);
padding-right:9.6rem;
*/
}

#extension-voco-content-container{
height:auto;
width: calc(100% - 3rem);
/*width: calc(100% - 3rem);*/
}

#extension-candleappstore-selected-main{
Expand All @@ -894,11 +939,11 @@ body #extension-voco-view .extension-voco-tab-selected{
.extension-voco-vlak .extension-voco-vlak{
padding:2rem;
}

/*
.extension-voco-centered-page{
max-width:70rem;
}

*/
#extension-voco-text-input-field{
margin:0 1rem 0 0;
}
Expand Down
2 changes: 1 addition & 1 deletion js/extension.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@
this.regenerate_items();
}
else{
list.innerHTML = '<div class="extension-voco-centered-page" style="text-align:center"><p>There are currently no active timers, reminders or alarms.</p></div>';
list.innerHTML = '<div class="extension-voco-centered-page"><p style="width:100%;text-align:center;display:bloc">There are currently no active timers, reminders or alarms.</p>';
}


Expand Down
13 changes: 5 additions & 8 deletions views/content.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,13 @@ <h2 style="text-align:center">Registering...</h2>

<div id="extension-voco-matrix-create-account-step1" class="extension-voco-hidden">
<div class="extension-voco-two-column">
<div>
<div class="extension-voco-vlak">
<img src="/extensions/voco/images/candle_voco_chat.png"/>
<h2>Chat with your home</h2>
<p>You can chat with Voco a privacy friendly and encrypted messaging network called Matrix. This is very similar to Whatsapp or Signal. There are many ways to use it, such as installing a Matrix app on your phone or tablet, or logging in through a web application.
<br/>
<!--<span id="extension-voco-matrix-learn-more-button">Learn more</span>-->
<button id="extension-voco-matrix-learn-more-button" type="button" class="text-button">Learn more</button>
</p>
<p>You can chat with Voco a privacy friendly and encrypted messaging network called Matrix. This is very similar to Whatsapp or Signal. There are many ways to use it, such as installing a Matrix app on your phone or tablet, or logging in through a web application.</p>
<button id="extension-voco-matrix-learn-more-button" type="button" class="text-button">Learn more</button>
<div id="extension-voco-matrix-learn-more" class="extension-voco-hidden">
<p>Matrix is like a cross between email and Whatsapp/Signal. Where Apps like Whatsapp have a central server that controls the entire chat network, with Matrix it's more like email, where lots of different servers exchange the messages. And as with email you can choose what provider you trust your messages with.</p>
<p>Matrix is like a cross between email and Whatsapp/Signal. Where Apps like Whatsapp have a central server that controls the entire chat network, with Matrix it's more like email, where lots of different servers exchange the messages. Just as with email you can choose what provider you trust your messages with.</p>
<p>This design means no single organisation owns the chat network. Anyone can create a server, and then these servers route the messages between them so they get to the intented destination. You could even run your own server if you wanted, which would give you very high levels of control over your data.</p>
<p>This is made possible by the Matrix software that all these servers run. Matrix is open source, managed by the Matrix.org foundation, and supported by a worldwide community of people and organisations. The open source nature means the programming code can be viewed by anyone, including you. You can even help improve it. For many people this level of transparency allows for greater levels of trust.</p>
<p>The Matrix software can encrypt the messages, and Voco enables this for all the messages it sends.</p>
Expand Down Expand Up @@ -211,7 +208,7 @@ <h3>Creating a Matrix account</h3>
</div>

<div id="extension-voco-matrix-advanced-tip" class="extension-voco-vlak">
<p><span>Already have a Matrix account?</span> <span id="extension-voco-matrix-show-new-account-skip">Skip account creation</span></p>
<p><span>Already have a Matrix account?</span> <button id="extension-voco-matrix-show-new-account-skip" class="text-button">Skip account creation</button></p>
<!--<p>If you are an advanced user you can <span id="extension-voco-matrix-show-new-account-advanced">view the advanced settings</span>.</p>-->
</div>

Expand Down

0 comments on commit be26299

Please sign in to comment.