alicestrt/vvvw
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaned css

Browse Source
This commit is contained in:
alicestrt 2020-09-09 17:25:21 +02:00
parent 0722a4d6bc
commit e5385cfa0d
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
static/css/style.css
View File

@ -1,10 +1,4 @@
<<<<<<< HEAD
html {
background-color: gray;
}
=======
>>>>>>> 8b9db01a45a2a649684b6c229c428187d4edaf29
#video1 { #video1 {
margin-top: 300px; margin-top: 300px;
} }
@ -28,8 +22,6 @@ img {
margin-left: 400px; margin-left: 400px;
} }
<<<<<<< HEAD
/* audio and pop up images */
#transcriptWrapper { #transcriptWrapper {
overflow: hidden; overflow: hidden;
} }
@ -41,7 +33,8 @@ img {
.speaking { .speaking {
font-weight: bold; font-weight: bold;
======= }
#background_a { #background_a {
background-image: url("../images/map.png"); background-image: url("../images/map.png");
background-repeat: no-repeat; background-repeat: no-repeat;
@ -62,5 +55,4 @@ img {
#background_c { #background_c {
background-image: url("../images/test2_opacity.jpeg"); background-image: url("../images/test2_opacity.jpeg");
>>>>>>> 8b9db01a45a2a649684b6c229c428187d4edaf29
} }