mirror of https://github.com/shadowfacts/type.git
font
This commit is contained in:
parent
13145b1b04
commit
720f106608
20
css/main.css
20
css/main.css
|
@ -43,16 +43,24 @@
|
|||
}
|
||||
|
||||
#content {
|
||||
<<<<<<< HEAD
|
||||
margin-top: 33px;
|
||||
font-family: "Ubuntu Mono";
|
||||
=======
|
||||
font-family: "Ubuntu Mono" !important;
|
||||
margin-top: 50px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
width: 80%;
|
||||
border: 1px solid;
|
||||
>>>>>>> ed75a73032ad7ad2add13679f8a0289e256c0ec3
|
||||
border: none;
|
||||
}
|
||||
.CodeMirror-cursor {
|
||||
background-color: #ffc40d !important;
|
||||
}
|
||||
|
||||
.CodeMirror-code, .CodeMirror {
|
||||
background-color: transparent !important;
|
||||
}
|
||||
|
||||
.CodeMirror pre {
|
||||
font-family: "Ubuntu Mono" !important;
|
||||
font-size:10pt;
|
||||
}
|
||||
|
||||
button {
|
||||
|
|
|
@ -4,13 +4,9 @@
|
|||
<meta charset="UTF-8">
|
||||
<title>Type</title>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.19.0/codemirror.min.css">
|
||||
<<<<<<< HEAD
|
||||
<link rel="stylesheet" href="/css/main.css">
|
||||
<link href='//fonts.googleapis.com/css?family=PT+Sans|Ubuntu+Mono' rel=stylesheet type='text/css'>
|
||||
=======
|
||||
<link rel="stylesheet" href="./css/main.css">
|
||||
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
|
||||
>>>>>>> ed75a73032ad7ad2add13679f8a0289e256c0ec3
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
Loading…
Reference in New Issue