Commit d8425a23 authored by barth23's avatar barth23
Browse files

remove merge markers

parent 184ee833
......@@ -71,35 +71,6 @@ button:focus {
-webkit-filter: grayscale(1); /* Old WebKit Browsers */
}
.architrave-funder-logo-goe {
max-height: 60px;
filter: grayscale(100%); /* Standard CSS */
-webkit-filter: grayscale(100%); /* CSS for Webkit Browsers */
filter: url(/elements/grayscale.svg#desaturate); /* Firefox 4-34 */
filter: gray; /* Internet Explorer IE6-9 */
-webkit-filter: grayscale(1); /* Old WebKit Browsers */
}
.architrave-funder-logo-dfk {
max-width: 200px;
filter: grayscale(100%); /* Standard CSS */
-webkit-filter: grayscale(100%); /* CSS for Webkit Browsers */
filter: url(/elements/grayscale.svg#desaturate); /* Firefox 4-34 */
filter: gray; /* Internet Explorer IE6-9 */
-webkit-filter: grayscale(1); /* Old WebKit Browsers */
}
.architrave-funder-logo:hover {
filter: none;
-webkit-filter: grayscale(0%);
}
.architrave-funder-logo-dfk:hover {
filter: none;
-webkit-filter: grayscale(0%);
}
.architrave-funder-logo-goe:hover {
filter: none;
-webkit-filter: grayscale(0%);
=======
.latin {
font-family: "ModernAntiqua", sans-serif;
font-size: 0.85em;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment