shadowfacts
/
type
mirror of https://github.com/shadowfacts/type.git
1
0
Fork 0
Code Issues Releases Wiki Activity

font

This commit is contained in:
Mahdi Mohammadi 2017-06-12 10:49:29 +01:00
parent 13145b1b04
commit 720f106608
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
css/main.css
View File

@ -43,16 +43,24 @@
} }
#content { #content {
<<<<<<< HEAD font-family: "Ubuntu Mono" !important;
margin-top: 33px;
font-family: "Ubuntu Mono";
=======
margin-top: 50px; margin-top: 50px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
width: 80%; width: 80%;
border: 1px solid; border: none;
>>>>>>> ed75a73032ad7ad2add13679f8a0289e256c0ec3 }
.CodeMirror-cursor {
background-color: #ffc40d !important;
}
.CodeMirror-code, .CodeMirror {
background-color: transparent !important;
}
.CodeMirror pre {
font-family: "Ubuntu Mono" !important;
font-size:10pt;
} }
button { button {

4
type.html
View File

@ -4,13 +4,9 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Type</title> <title>Type</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.19.0/codemirror.min.css"> <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 rel="stylesheet" href="/css/main.css">
<link href='//fonts.googleapis.com/css?family=PT+Sans|Ubuntu+Mono' rel=stylesheet type='text/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"> <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
>>>>>>> ed75a73032ad7ad2add13679f8a0289e256c0ec3
</head> </head>
<body> <body>