Commit adb53bd5 authored by sarah's avatar sarah

merge

parent 6bbbd58f
......@@ -363,14 +363,11 @@ h2#problematisation-and-essayism {
// margin-top: 7px;
}
<<<<<<< HEAD
h2 {
=======
}
h2, h2 span {
>>>>>>> df363a7ff56841f9b7695555e12079bc5ab3b16c
font-family: "dauphine" !important;
font-weight: "regular";
font-size: 23pt !important;
......@@ -456,7 +453,6 @@ blockquote {
font-size: 10pt !important;
font-style: regular;
text-decoration: none;
<<<<<<< HEAD
// text-shadow: none;
// background: none;
text-shadow: 0 1px 0 #fff, 0 2px 0 #fff, 0 -1px 0 #fff, 0 -2px 0 #fff, -1px 1px 0 #fff, -1px 2px 0 #fff, 1px 1px 0 #fff, 1px 2px 0 #fff, -1px 0 0 #fff, 0 -3px 0 #fff;
......@@ -465,8 +461,7 @@ blockquote {
background-position: 0 92%;
background-repeat: repeat-x;
=======
>>>>>>> df363a7ff56841f9b7695555e12079bc5ab3b16c
}
}
......
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