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:40:55 +05:00 committed by GitHub
parent 81a5a71cd6
commit d9cf4120dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gallery/main.css
View File

@ -62,13 +62,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;
@ -133,11 +130,8 @@ main img:hover {
cursor: pointer; cursor: pointer;
} }
<<<<<<< HEAD
#popup, #popupBg { #popup, #popupBg {
=======
#popup, #popup_bg { #popup, #popup_bg {
>>>>>>> c27a4029688d84a604259109737c953b92088855
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
@ -150,19 +144,16 @@ main img:hover {
z-index: 1001; z-index: 1001;
display: none; display: none;
} }
<<<<<<< HEAD
#popupBg { #popupBg {
z-index: 1005; z-index: 1005;
background-color: #fff; background-color: #fff;
} }
#popupImg { #popupImg {
=======
#popup_bg { #popup_bg {
z-index: 1005; z-index: 1005;
background-color: #fff; background-color: #fff;
} }
#popup_img { #popup_img {
>>>>>>> c27a4029688d84a604259109737c953b92088855
max-width: 100vw; max-width: 100vw;
max-height: 100vh; max-height: 100vh;
z-index: 1006; z-index: 1006;
@ -175,10 +166,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;
@ -312,8 +300,5 @@ footer {
-webkit-animation: showen 1s; -webkit-animation: showen 1s;
animation: showen 1s; animation: showen 1s;
} }
<<<<<<< HEAD
} }
=======
} }
>>>>>>> c27a4029688d84a604259109737c953b92088855