diff options
| author | Alwin1847207 | 2019-11-04 17:03:10 +0530 |
|---|---|---|
| committer | Alwin1847207 | 2019-11-04 17:03:10 +0530 |
| commit | 7c650b158109a9d59882365d26f0327390268f13 (patch) | |
| tree | 1140bf6b65c75b9b175adb08d9206104f60104a5 /fossee_manim/static/css | |
| parent | 9a63fcaff0974fa6401d48c5dae53782f50c4ddc (diff) | |
| parent | cfdc41deed280bddbcc6c3cf45e30f33ea139e88 (diff) | |
| download | FOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.tar.gz FOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.tar.bz2 FOSSEE_animations-7c650b158109a9d59882365d26f0327390268f13.zip | |
removed merge conflicts
Diffstat (limited to 'fossee_manim/static/css')
| -rw-r--r-- | fossee_manim/static/css/index.css | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fossee_manim/static/css/index.css b/fossee_manim/static/css/index.css index 54bda1b..9840f69 100644 --- a/fossee_manim/static/css/index.css +++ b/fossee_manim/static/css/index.css @@ -62,7 +62,7 @@ form.example::after { } #btns { - padding: 25 25 25 25; + padding:25 25 25 25; font-size: 155%; font-family: 'Lato', sans-serif; } @@ -128,8 +128,16 @@ hr { .footer{ right: 0; left: 0; +<<<<<<< HEAD bottom: 0; padding: 1rem; +======= + position: relative; + bottom: 0; + + owerflow: hidden; + padding: 95px; +>>>>>>> cfdc41deed280bddbcc6c3cf45e30f33ea139e88 text-align: center; } a{ |