diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css index 524b83cf..cbdc059d 100644 --- a/webapp/src/main/webapp/themes/iph/css/iph.css +++ b/webapp/src/main/webapp/themes/iph/css/iph.css @@ -20,7 +20,7 @@ html, body { padding: 0; height: 100%; /* needed for container min-height */ - font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; + font-family: "IPH Serif","Roboto","Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; height: auto !important; /* real browsers */ height: 100%; /* IE6: treaded as min-height*/; min-height: 100%; /* real browsers */ @@ -35,12 +35,12 @@ body { max-width: 1920px; width: 100%; background-size: 100%; - background: url(../images/header-image.png) center 0 no-repeat; - height: 200px; - display: flex; - flex-direction: column; - flex-wrap: nowrap; - justify-content: center; + background: url(../images/header-image.png) center 0 no-repeat; + height: 200px; + display: flex; + flex-direction: column; + flex-wrap: nowrap; + justify-content: center; } a { color: #000000; @@ -61,11 +61,11 @@ h2 { padding: 10px 0 12px 0; margin: 0; font-size: 1.375em; - color: #064d68; + color: #000000; line-height: 1.5em; } h2 a { - color: #2485ae; + color: #8B4513; } h2 a:link, h2 a:visited { @@ -87,7 +87,7 @@ h5 { padding: 10px 0 12px 0; margin: 0; font-size: .875em; - color: #064d68; + color: #8B4513; } /* -------------------------------------------------> */ /* EDITING STYLES ----------------------------------> */ @@ -97,7 +97,7 @@ select, input[type="password"] { border: 0; font-size: 1rem; - font-family: Roboto; + font-family: "Roboto"; font-style: italic; padding: .5em; background: #fff; @@ -110,7 +110,7 @@ input[type="password"] { select.form-control { padding: 5px 8px 5px 5px; - font-family: Roboto; + font-family: "Roboto"; font-style: normal; -webkit-appearance: none; -moz-appearance: none; @@ -128,7 +128,7 @@ select.form-control >option { } input.form-control { - font-family: Roboto; + font-family: "Roboto"; font-size: 1rem; color: #ababab; } @@ -227,7 +227,7 @@ input.submit:hover, input#submit:hover, input.form-button:hover { color: #fff; - background-color: #b2d15a; + background-color: #DD9F00; } input.delete:hover, input#delete:hover { @@ -315,7 +315,7 @@ a.return:active { } .database_header { background-color: #f1f2ee; - color: #2485ae; + color: #DD9F00; font-size: 1em; } .database_upperleftcorner { @@ -433,7 +433,7 @@ a.ingestMenu:visited, a.account-menu:link, a.account-menu:visited { text-decoration: none; - color: #2485AE; + color: #DD9F00; } a.ingestMenu:hover, a.ingestMenu:active, @@ -478,11 +478,11 @@ tr.editformcell td textarea.matchingInput { width: 95%; height:10ex; margin-top:0.7em; - font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; + font-family: "IPH Serif","Roboto","Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; font-size:0.95em; } hr.formDivider { - background-color: #3196C4; + background-color: #DD9F00; border: 0 none; height: 1px; margin-bottom: 20px; @@ -855,6 +855,8 @@ ul#main-nav { } #main-nav li a { padding-left: 20px; + font-family: Roboto; + font-style: normal; padding-right: 20px; display: block; color: #ffffff; @@ -899,7 +901,7 @@ ul#main-nav { color: #8B4513; font-size: 1.4rem; padding: 0 0px 10px 25px; - font-family: Roboto; + /*font-family: Roboto;*/ background-image: url(../images/circle.png); background-repeat: no-repeat; background-position: left center; @@ -1660,9 +1662,11 @@ ul#individual-tools-people li a { margin: 0.7em auto; } #menupage-intro h2 { - font-size: 1.375em; + font-size: 1.4em; color: #000000; font-weight: normal; + padding: 0 25px 10px 20px; + font-family: Roboto; } #menupage-intro.people h2 { float: left; @@ -2311,7 +2315,7 @@ button.collapsible.active:focus { margin-bottom: 10px; text-align: right; padding-top: 10px; - font-family: PT Serif; + font-family: IPH Serif; font-style: italic; } .works { @@ -2350,6 +2354,59 @@ button.collapsible.active:focus { justify-content: center; } +/* -------------------------------------------------> */ +/* FONTS --------------------------------> */ +/* -------------------------------------------------> */ +@font-face { + font-family: "IPH Serif"; + font-weight: normal; + src: url("../fonts/IPHSerif-Regular.woff2") format("woff2"), + url("../fonts/IPHSerif-Regular.ttf") format("truetype"); +} +@font-face { + font-family: "IPH Serif"; + font-weight: bold; + src: url("../fonts/IPHSerif-Bold.woff2") format("woff2"), + url("../fonts/IPHSerif-Bold.ttf") format("truetype"); +} +@font-face { + font-family: "IPH Serif"; + font-style: italic; + src: url("../fonts/IPHSerif-Italic.woff2") format("woff2"), + url("../fonts/IPHSerif-Italic.ttf") format("truetype"); +} +@font-face { + font-family: "IPH Serif"; + font-style: italic; + font-weight: bold; + src: url("../fonts/IPHSerif-BoldItalic.woff2") format("woff2"), + url("../fonts/IPHSerif-BoldItalic.ttf") format("truetype"); +} +@font-face { + font-family: "Roboto"; + font-weight: normal; + src: url("../fonts/Roboto-Regular.woff2") format("woff2"), + url("../fonts/Roboto-Regular.ttf") format("truetype"); +} +@font-face { + font-family: "Roboto"; + font-weight: bold; + src: url("../fonts/Roboto-Bold.woff2") format("woff2"), + url("../fonts/Roboto-Bold.ttf") format("truetype"); +} +@font-face { + font-family: "Roboto"; + font-weight: italic; + src: url("../fonts/Roboto-Italic.woff2") format("woff2"), + url("../fonts/Roboto-Italic.ttf") format("truetype"); +} +@font-face { + font-family: "Roboto"; + font-style: italic; + font-weight: bold; + src: url("../fonts/Roboto-BoldItalic.woff2") format("woff2"), + url("../fonts/Roboto-BoldItalic.ttf") format("truetype"); +} /* -------------------------------------------------> */ /* SCREEN RESOLUTION --------------------------------> */ /* -------------------------------------------------> */ diff --git a/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Bold.ttf b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Bold.ttf new file mode 100644 index 00000000..10b87aec Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Bold.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Bold.woff2 b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Bold.woff2 new file mode 100644 index 00000000..6bf967ca Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Bold.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-BoldItalic.ttf b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-BoldItalic.ttf new file mode 100644 index 00000000..f74c308e Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-BoldItalic.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-BoldItalic.woff2 b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-BoldItalic.woff2 new file mode 100644 index 00000000..96ca83f2 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-BoldItalic.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Italic.ttf b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Italic.ttf new file mode 100644 index 00000000..c1660aa7 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Italic.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Italic.woff2 b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Italic.woff2 new file mode 100644 index 00000000..7d307b16 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Italic.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Regular.ttf b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Regular.ttf new file mode 100644 index 00000000..e8045e37 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Regular.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Regular.woff2 b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Regular.woff2 new file mode 100644 index 00000000..2f216440 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/IPHSerif-Regular.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Black.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Black.ttf new file mode 100644 index 00000000..2d452383 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Black.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Black.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Black.woff2 new file mode 100644 index 00000000..fd744582 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Black.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-BlackItalic.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-BlackItalic.ttf new file mode 100644 index 00000000..29a4359e Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-BlackItalic.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-BlackItalic.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-BlackItalic.woff2 new file mode 100644 index 00000000..572b6f79 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-BlackItalic.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Bold.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Bold.ttf new file mode 100644 index 00000000..d998cf5b Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Bold.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Bold.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Bold.woff2 new file mode 100644 index 00000000..6f0180e5 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Bold.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-BoldItalic.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-BoldItalic.ttf new file mode 100644 index 00000000..b4e22103 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-BoldItalic.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-BoldItalic.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-BoldItalic.woff2 new file mode 100644 index 00000000..7876f81b Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-BoldItalic.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Italic.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Italic.ttf new file mode 100644 index 00000000..5b390ff9 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Italic.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Italic.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Italic.woff2 new file mode 100644 index 00000000..dabad09a Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Italic.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Light.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Light.ttf new file mode 100644 index 00000000..35267989 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Light.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Light.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Light.woff2 new file mode 100644 index 00000000..eb4b36a0 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Light.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-LightItalic.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-LightItalic.ttf new file mode 100644 index 00000000..46e9bf7c Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-LightItalic.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-LightItalic.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-LightItalic.woff2 new file mode 100644 index 00000000..0bfba543 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-LightItalic.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Medium.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Medium.ttf new file mode 100644 index 00000000..f714a514 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Medium.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Medium.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Medium.woff2 new file mode 100644 index 00000000..abcfd77c Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Medium.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-MediumItalic.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-MediumItalic.ttf new file mode 100644 index 00000000..5dc6a2dc Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-MediumItalic.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-MediumItalic.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-MediumItalic.woff2 new file mode 100644 index 00000000..05411264 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-MediumItalic.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Regular.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Regular.ttf new file mode 100644 index 00000000..2b6392ff Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Regular.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Regular.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Regular.woff2 new file mode 100644 index 00000000..3b78bd51 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Regular.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Thin.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Thin.ttf new file mode 100644 index 00000000..4e797cf7 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Thin.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-Thin.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Thin.woff2 new file mode 100644 index 00000000..f4d250f7 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-Thin.woff2 differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-ThinItalic.ttf b/webapp/src/main/webapp/themes/iph/fonts/Roboto-ThinItalic.ttf new file mode 100644 index 00000000..eea836f4 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-ThinItalic.ttf differ diff --git a/webapp/src/main/webapp/themes/iph/fonts/Roboto-ThinItalic.woff2 b/webapp/src/main/webapp/themes/iph/fonts/Roboto-ThinItalic.woff2 new file mode 100644 index 00000000..6b5de918 Binary files /dev/null and b/webapp/src/main/webapp/themes/iph/fonts/Roboto-ThinItalic.woff2 differ