Merge remote-tracking branch 'upstream/master' into material-icons

This commit is contained in:
MrTimscampi 2020-01-29 08:45:20 +01:00
commit cdefae3dee
128 changed files with 5226 additions and 2581 deletions

View file

@ -3,8 +3,8 @@
margin-left: 30%;
margin-right: 30%;
height: 4.2em;
background: rgba(28,28,28,0.8);
border-radius: .3em;
background: rgba(28, 28, 28, 0.8);
border-radius: 0.3em;
color: #fff;
position: absolute;
}
@ -14,7 +14,7 @@
top: 0;
right: 0;
color: #ccc;
z-index: 2;
z-index: 2;
}
.subtitleSyncTextField {
@ -27,7 +27,7 @@
text-align: center;
font-size: 20px;
color: white;
z-index: 2;
z-index: 2;
}
#prompt {
@ -43,6 +43,6 @@
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1;
border-radius: .3em;
z-index: 1;
}
border-radius: 0.3em;
z-index: 1;
}