diff --git a/assets/css/font-Ubuntu.css b/assets/css/font-Ubuntu.css new file mode 100644 index 0000000..6c61689 --- /dev/null +++ b/assets/css/font-Ubuntu.css @@ -0,0 +1,40 @@ + +/* http://font.ubuntu.com/ */ + +@font-face { + font-family: "Ubuntu"; + src: url('../fonts/Ubuntu-L.ttf'); +} +@font-face { + font-family: "Ubuntu"; + font-style: italic; + src: url('../fonts/Ubuntu-LI.ttf'); +} +@font-face { + font-family: "Ubuntu"; + font-weight: 300; + src: url('../fonts/Ubuntu-R.ttf'); +} +/* Ubuntu-RI.ttf */ +@font-face { + font-family: "Ubuntu"; + font-weight: 500; + src: url('../fonts/Ubuntu-M.ttf'); +} +/* Ubuntu-MI.ttf */ +@font-face { + font-family: "Ubuntu"; + font-weight: bold; + src: url('../fonts/Ubuntu-B.ttf'); +} +@font-face { + font-family: "Ubuntu"; + font-weight: bold; + font-style: italic; + src: url('../fonts/Ubuntu-BI.ttf'); +} +/* Ubuntu-C.ttf */ +/* UbuntuMono-BI.ttf */ +/* UbuntuMono-B.ttf */ +/* UbuntuMono-RI.ttf */ +/* UbuntuMono-R.ttf */ diff --git a/assets/css/main.css b/assets/css/main.css index a3e1050..3f81541 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,5 +1,6 @@ @import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,400,400italic,600"); @import url("font-awesome.min.css"); +@import url("font-Ubuntu.css"); /* Helios by HTML5 UP @@ -1555,8 +1556,8 @@ color: #4d5059; font-size: 15pt; line-height: 1.85em; - font-family: 'Source Sans Pro', sans-serif; - font-weight: 300; + font-family: 'Ubuntu','Source Sans Pro', sans-serif; + font-weight: normal; } body.is-loading *, body.is-loading *:after, body.is-loading *:before { @@ -1573,12 +1574,12 @@ input, textarea, select { font-size: 15pt; line-height: 1.85em; - font-family: 'Source Sans Pro', sans-serif; - font-weight: 300; + font-family: 'Ubuntu','Source Sans Pro', sans-serif; + font-weight: normal; } h1, h2, h3, h4, h5, h6 { - font-weight: 400; + font-weight: bold; color: #4d5059; line-height: 1.25em; } @@ -1589,9 +1590,9 @@ border-bottom-color: transparent; } - h1 strong, h2 strong, h3 strong, h4 strong, h5 strong, h6 strong { +/* h1 strong, h2 strong, h3 strong, h4 strong, h5 strong, h6 strong { font-weight: 600; - } + } */ h2 { font-size: 2.85em; @@ -1607,7 +1608,7 @@ } strong, b { - font-weight: 400; + font-weight: bold; color: #4d5059; } @@ -1873,7 +1874,7 @@ form label { display: block; - font-weight: 400; + font-weight: bold; color: #4d5059; margin: 0 0 1em 0; } @@ -1969,7 +1970,7 @@ table.default th { text-align: left; - font-weight: 400; + font-weight: bold; padding: 0.5em 1em 0.5em 1em; } @@ -1999,7 +2000,7 @@ border: 0; cursor: pointer; outline: 0; - font-weight: 300; + font-weight: normal; -moz-transition: background-color 0.35s ease-in-out, color 0.35s ease-in-out, border-bottom-color 0.35s ease-in-out; -webkit-transition: background-color 0.35s ease-in-out, color 0.35s ease-in-out, border-bottom-color 0.35s ease-in-out; -ms-transition: background-color 0.35s ease-in-out, color 0.35s ease-in-out, border-bottom-color 0.35s ease-in-out; @@ -2883,7 +2884,7 @@ #navPanel .link.depth-0 { color: #f5f5f5; - font-weight: 600; + font-weight: bold; } #navPanel .indent-1 { diff --git a/assets/fonts/Ubuntu-B.ttf b/assets/fonts/Ubuntu-B.ttf new file mode 100644 index 0000000..b173da2 Binary files /dev/null and b/assets/fonts/Ubuntu-B.ttf differ diff --git a/assets/fonts/Ubuntu-BI.ttf b/assets/fonts/Ubuntu-BI.ttf new file mode 100644 index 0000000..72a5a99 Binary files /dev/null and b/assets/fonts/Ubuntu-BI.ttf differ diff --git a/assets/fonts/Ubuntu-L.ttf b/assets/fonts/Ubuntu-L.ttf new file mode 100644 index 0000000..ed0f5bc Binary files /dev/null and b/assets/fonts/Ubuntu-L.ttf differ diff --git a/assets/fonts/Ubuntu-LI.ttf b/assets/fonts/Ubuntu-LI.ttf new file mode 100644 index 0000000..c6cec55 Binary files /dev/null and b/assets/fonts/Ubuntu-LI.ttf differ diff --git a/assets/fonts/Ubuntu-M.ttf b/assets/fonts/Ubuntu-M.ttf new file mode 100644 index 0000000..ca9c03a Binary files /dev/null and b/assets/fonts/Ubuntu-M.ttf differ diff --git a/assets/fonts/Ubuntu-R.ttf b/assets/fonts/Ubuntu-R.ttf new file mode 100644 index 0000000..d748728 Binary files /dev/null and b/assets/fonts/Ubuntu-R.ttf differ