dm1sh/dmitriy.icu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove strange captions

Browse Source
This commit is contained in:
Dm1tr1y147 2019-06-22 22:34:04 +05:00 committed by GitHub
parent 89f2145dfc
commit 7527411f91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.css
View File

@ -1,8 +1,5 @@
<<<<<<< HEAD
@import url('./fonts.css'); @import url('./fonts.css');
=======
@import url('https://fonts.googleapis.com/css?family=Wire+One|Assistant:300,400|Raleway'); @import url('https://fonts.googleapis.com/css?family=Wire+One|Assistant:300,400|Raleway');
>>>>>>> c27a4029688d84a604259109737c953b92088855
@-webkit-keyframes showen { @-webkit-keyframes showen {
from { from {
opacity: 0; opacity: 0;
@ -66,13 +63,10 @@ nav {
top: 0; top: 0;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
<<<<<<< HEAD
transition: box-shadow 0.5s ease-in-out; transition: box-shadow 0.5s ease-in-out;
} }
nav#shadow { nav#shadow {
box-shadow: 0 1px 6px 0 rgba(32,33,36,0.28); box-shadow: 0 1px 6px 0 rgba(32,33,36,0.28);
=======
>>>>>>> c27a4029688d84a604259109737c953b92088855
} }
#logo { #logo {
display: block; display: block;
@ -138,10 +132,7 @@ header p {
width: 100vw; width: 100vw;
overflow: hidden; overflow: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
<<<<<<< HEAD
box-shadow: inset 0 3px 6px -2px rgba(32,33,36,0.28); box-shadow: inset 0 3px 6px -2px rgba(32,33,36,0.28);
=======
>>>>>>> c27a4029688d84a604259109737c953b92088855
} }
#main p { #main p {
width: 100%; width: 100%;
@ -201,10 +192,7 @@ footer {
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
padding: 10vh; padding: 10vh;
background-color: #f8f8f8; background-color: #f8f8f8;
<<<<<<< HEAD
box-shadow: inset 0 3px 6px -2px rgba(32,33,36,0.28); box-shadow: inset 0 3px 6px -2px rgba(32,33,36,0.28);
=======
>>>>>>> c27a4029688d84a604259109737c953b92088855
} }
address, #social { address, #social {
display: grid; display: grid;