From 07aa46b20d84a2db7d6d0f02b6ad82521e1f1263 Mon Sep 17 00:00:00 2001 From: Milos Popovic Date: Tue, 2 Dec 2025 02:28:02 +0100 Subject: [PATCH 1/4] Update CSS contrast to meet WCAG AA minimum accessibility standards --- .../individual/individual-2column-view.css | 8 +- .../css/individual/individual-quick-view.css | 6 +- .../webapp/css/individual/individual-vivo.css | 2 +- .../css/visualization/capabilitymap/graph.css | 16 ++- .../visualization/entitycomparison/layout.css | 14 +- .../css/visualization/mapofscience/layout.css | 16 +-- .../css/visualization/personlevel/page.css | 8 +- .../css/visualization/visualization.css | 2 +- .../images/individual/uriIcon_darkened.gif | Bin 0 -> 1002 bytes .../visualization/capabilitymap/graph_new.js | 6 +- .../jquery_plugins/datatable/demo_table.css | 10 +- .../js/visualization/entitycomparison/util.js | 2 +- .../individual/propStatement-orcidId.ftl | 4 +- .../freemarker/edit/forms/css/addConcept.css | 2 +- .../main/webapp/themes/nemo/css/layout.css | 16 +-- .../themes/nemo/css/openSocial/gadgets.css | 4 +- .../src/main/webapp/themes/nemo/css/wilma.css | 129 +++++++++-------- .../nemo/images/arrowSmall-darkened.gif | Bin 0 -> 851 bytes .../themes/nemo/images/arrow_darkened.gif | Bin 0 -> 864 bytes .../search-field-and-button-darkened.gif | Bin 0 -> 1384 bytes .../images/search-interior-pages-darkened.png | Bin 0 -> 1116 bytes .../webapp/themes/nemo/js/homePageUtils.js | 8 +- .../individual--foaf-academic-article.ftl | 2 +- .../templates/individual--foaf-person.ftl | 2 +- ...ividual-custom-visualizationFoafPerson.ftl | 2 +- .../individual-property-group-tabs.ftl | 2 +- .../nemo/templates/mapOfScienceSetup.ftl | 2 +- .../nemo/templates/mapOfScienceStandalone.ftl | 8 +- .../webapp/themes/tenderfoot/css/edit.css | 26 ++-- .../themes/tenderfoot/css/page-browse.css | 10 +- .../themes/tenderfoot/css/page-individual.css | 2 +- .../themes/tenderfoot/css/page-login.css | 6 +- .../themes/tenderfoot/css/tenderfoot.css | 4 +- .../tenderfoot/images/arrowSmall-darkened.gif | Bin 0 -> 851 bytes .../tenderfoot/images/arrow_darkened.gif | Bin 0 -> 864 bytes .../images/search-interior-pages-darkened.png | Bin 0 -> 1116 bytes .../individual/individual--foaf-person.ftl | 2 +- .../templates/body/individual/scratch.ftl | 2 +- .../themes/wilma/css/openSocial/gadgets.css | 4 +- .../main/webapp/themes/wilma/css/wilma.css | 132 +++++++++--------- .../wilma/images/arrowSmall-darkened.gif | Bin 0 -> 851 bytes .../themes/wilma/images/arrow_darkened.gif | Bin 0 -> 864 bytes .../search-field-and-button-darkened.gif | Bin 0 -> 1384 bytes .../images/search-interior-pages-darkened.png | Bin 0 -> 1116 bytes .../themes/wilma/images/selected-main-nav.png | Bin 0 -> 358 bytes .../templates/individual--foaf-person.ftl | 2 +- 46 files changed, 235 insertions(+), 226 deletions(-) create mode 100644 webapp/src/main/webapp/images/individual/uriIcon_darkened.gif create mode 100644 webapp/src/main/webapp/themes/nemo/images/arrowSmall-darkened.gif create mode 100644 webapp/src/main/webapp/themes/nemo/images/arrow_darkened.gif create mode 100644 webapp/src/main/webapp/themes/nemo/images/search-field-and-button-darkened.gif create mode 100644 webapp/src/main/webapp/themes/nemo/images/search-interior-pages-darkened.png create mode 100644 webapp/src/main/webapp/themes/tenderfoot/images/arrowSmall-darkened.gif create mode 100644 webapp/src/main/webapp/themes/tenderfoot/images/arrow_darkened.gif create mode 100644 webapp/src/main/webapp/themes/tenderfoot/images/search-interior-pages-darkened.png create mode 100644 webapp/src/main/webapp/themes/wilma/images/arrowSmall-darkened.gif create mode 100644 webapp/src/main/webapp/themes/wilma/images/arrow_darkened.gif create mode 100644 webapp/src/main/webapp/themes/wilma/images/search-field-and-button-darkened.gif create mode 100644 webapp/src/main/webapp/themes/wilma/images/search-interior-pages-darkened.png create mode 100644 webapp/src/main/webapp/themes/wilma/images/selected-main-nav.png diff --git a/webapp/src/main/webapp/css/individual/individual-2column-view.css b/webapp/src/main/webapp/css/individual/individual-2column-view.css index e1c35dcb33..0b5ee925b1 100644 --- a/webapp/src/main/webapp/css/individual/individual-2column-view.css +++ b/webapp/src/main/webapp/css/individual/individual-2column-view.css @@ -93,7 +93,7 @@ div#profileTypeContainer select { display:inline-block; padding: .5em; background: none repeat scroll 0 0 #FFFFFF; - border: 1px solid #E0DFDF; + border: 1px solid #898989; border-radius: 5px 5px 5px 5px; font-size: 14px; margin-bottom: 0.8em; @@ -231,7 +231,7 @@ div#contactPhoneDiv { text-align:right; } /* <------ RESEARCH AREA */ -ul#individual-hasResearchArea li { +ul.individual-hasResearchArea li { float: left; padding-right: 10px; margin-right: 10px; @@ -269,7 +269,7 @@ span#quickViewLink img { padding-top:18px; } #individual-info div#contactContainer h3{ - color:#8aa149; + color:#536520; } ul#individual-personInPosition li { padding-bottom:12px; @@ -280,5 +280,5 @@ ul#individual-personInPosition li:last-child { padding-bottom: 0; } td#totalPubs { - color: #2485AE; + color: #12739D; } diff --git a/webapp/src/main/webapp/css/individual/individual-quick-view.css b/webapp/src/main/webapp/css/individual/individual-quick-view.css index fb3e132f0b..75deca5322 100644 --- a/webapp/src/main/webapp/css/individual/individual-quick-view.css +++ b/webapp/src/main/webapp/css/individual/individual-quick-view.css @@ -166,7 +166,7 @@ div#profileTypeContainer select { display:inline-block; padding: .5em; background: none repeat scroll 0 0 #FFFFFF; - border: 1px solid #E0DFDF; + border: 1px solid #898989; border-radius: 5px 5px 5px 5px; font-size: 14px; margin-bottom: 0.8em; @@ -193,7 +193,7 @@ ul#individual-personInPosition { padding-left: 10px; margin: 10px 0 0 0; } -ul#individual-hasResearchArea li { +ul.individual-hasResearchArea li { float: left; padding-right: 10px; margin-right: 10px; @@ -201,7 +201,7 @@ ul#individual-hasResearchArea li { border-right: 1px solid #5e6363 ; white-space:nowrap !important; } -ul#individual-hasResearchArea li:last-child { +ul.individual-hasResearchArea li:last-child { white-space:nowrap !important; } diff --git a/webapp/src/main/webapp/css/individual/individual-vivo.css b/webapp/src/main/webapp/css/individual/individual-vivo.css index 3881dbcd24..976ee03ea7 100644 --- a/webapp/src/main/webapp/css/individual/individual-vivo.css +++ b/webapp/src/main/webapp/css/individual/individual-vivo.css @@ -197,7 +197,7 @@ ul#individual-personInPosition li:last-child { } /* <------ RESEARCH AREA */ -ul#individual-hasResearchArea li, +ul.individual-hasResearchArea li, ul#individual-facultyMemberships li { float: left; padding-right: 10px; diff --git a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css index 51cb46c9b1..a09f9ca738 100755 --- a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css +++ b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css @@ -23,7 +23,7 @@ body { -webkit-text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3); -moz-text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3); -o-text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3); - background-color: #8BAB2E; + background-color: #536520; // background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#446791), to(#164682)); // background-image: -moz-linear-gradient(top, #446791, #164682); width: auto; @@ -58,7 +58,7 @@ body { top:0; } -ul#log_printout { +#log_printout { display: block; height: 330px; overflow: scroll @@ -309,8 +309,18 @@ hr { .tabs ul.titles li.activeTab a, .tabs ul.titles li.activeTab a:hover { - background-color: #fff; + background-color: #13739D; + color: white; } + +/* Focus styles for tab links */ +.tabs ul.titles li a:focus { + outline: 2px solid #0078d7; /* 2px box around focused element */ + font-weight: bold; /* Make text bold */ + position: relative; + z-index: 1; +} + .smalllogo { margin-left:-5px; vertical-align:middle; diff --git a/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css index 073fa0468e..a8e91bb164 100644 --- a/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css +++ b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css @@ -44,7 +44,7 @@ for the message is getting set to 50%, hence we need to override it here. } .filter-option { - color: #2485AE; + color: #12739D; cursor: pointer; /*padding-right: 5px;*/ text-decoration: underline; @@ -118,7 +118,7 @@ img#copy-vis-viewlink-icon { } a.temporalGraphLinks { - background-color: #2485AE; + background-color: #12739D; color: white; cursor: pointer; font-weight: bold; @@ -146,7 +146,7 @@ a.clear-selected-entities, vertical-align: sub; } #reset-search { - color: #2485AE; + color: #12739D; cursor: pointer; margin-left: 10px; } @@ -215,7 +215,7 @@ a.clear-selected-entities, font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; font-size: 1.5275em; - color: #2485ae; + color: #12739D; line-height: 1.3em; padding-top:15px; padding-bottom:10px; @@ -230,7 +230,7 @@ sans-serif; margin-left: 10px; display: inline-block; text-decoration: underline; - color: #2485AE; + color: #12739D; } .ellipsis.multiline { white-space: normal; @@ -301,14 +301,14 @@ p.displayCounter{ #entitylevelheading, #comparisonParameter, #headerText { - color: #2485ae; + color: #12739D; } /* --------------------------------------------------------------> */ /* SPECIAL STYLES FOR THE entityComparisonErrorCommonBody.ftl FILE */ /* --------------------------------------------------------------> */ #noPubsOrGrants-header { font-size: 1.375em; - color: #2485ae; + color: #12739D; line-height: 1.3em; padding-top:15px; padding-bottom:10px; diff --git a/webapp/src/main/webapp/css/visualization/mapofscience/layout.css b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css index 7267f874de..30431e59f2 100644 --- a/webapp/src/main/webapp/css/visualization/mapofscience/layout.css +++ b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css @@ -50,7 +50,7 @@ #header-entity-label { font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; font-size: 1.5275em; - color: #2485ae; + color: #12739D; line-height: 1.3em; padding-top:15px; padding-bottom:10px; @@ -108,7 +108,7 @@ a.clear-selected-entities { /* filter */ .filter-option, .comparison-filter-option { - color: #2485AE; + color: #12739D; cursor: pointer; /*padding-right: 5px;*/ text-decoration: underline; @@ -161,7 +161,7 @@ a.clear-selected-entities { } #reset-search, #comparison-reset-search { - color: #2485AE; + color: #12739D; cursor: pointer; margin-left: 10px; } @@ -178,7 +178,7 @@ th#percentage-activity-column { .corner-triangle { border-left: 10px solid #F6F6F6; - border-top: 10px solid #2485AE; + border-top: 10px solid #12739D; float: right; font-size: 0; line-height: 0; @@ -228,13 +228,13 @@ a.map-of-science-links { text-align: center; height: 25px; max-width: 260px; - background-color: #2485AE; + background-color: #12739D; height: 20px; padding: 4px 5px 3px; } #download-unlocated-journal-info { - background-color: #2485AE; + background-color: #12739D; height: 20px; margin-top: 10px; max-width: 260px; @@ -268,7 +268,7 @@ a.map-of-science-links { .subpaginatedtabs span { padding-right: 5px; cursor: pointer; - color: #2485AE; + color: #12739D; } .visCommonControllTooltip { @@ -286,7 +286,7 @@ a.map-of-science-links { #noPublications-header { font-size: 1.375em; - color: #2485ae; + color: #12739D; line-height: 1.3em; padding-top:15px; padding-bottom:10px; diff --git a/webapp/src/main/webapp/css/visualization/personlevel/page.css b/webapp/src/main/webapp/css/visualization/personlevel/page.css index 857983d207..62c3790da4 100644 --- a/webapp/src/main/webapp/css/visualization/personlevel/page.css +++ b/webapp/src/main/webapp/css/visualization/personlevel/page.css @@ -75,12 +75,12 @@ p.datatable { .author_name, .neutral_investigator_name, .neutral_author_name { - color: #2485AE; + color: #12739D; font-weight: bold; } .investigator_moniker, .author_moniker { - color: #9C9C9C; + color: #656565; } .sub_headings { color: #121b3c; @@ -216,7 +216,7 @@ table.sparkline_wrapper_table td, th { } #dataPanel .bold { font-weight: bold; - color: #2485AE; + color: #12739D; font-size: 14px; } #dataPanel .investigator_stats .numbers, @@ -249,7 +249,7 @@ table.sparkline_wrapper_table td, th { font-size: .9em; } #profileTitle { - background-color: #2485AE; + background-color: #12739D; color: white; font-weight: bold; line-height: 1em !important; diff --git a/webapp/src/main/webapp/css/visualization/visualization.css b/webapp/src/main/webapp/css/visualization/visualization.css index 23a1010043..791b7062ff 100644 --- a/webapp/src/main/webapp/css/visualization/visualization.css +++ b/webapp/src/main/webapp/css/visualization/visualization.css @@ -40,7 +40,7 @@ span.incomplete-data-holder, padding-bottom: 0 !important; } .collaboratorship-link h3 a { - color: #2485AE; + color: #12739D; font-size: .9em !important; text-decoration: underline; } diff --git a/webapp/src/main/webapp/images/individual/uriIcon_darkened.gif b/webapp/src/main/webapp/images/individual/uriIcon_darkened.gif new file mode 100644 index 0000000000000000000000000000000000000000..a4e3d6d1273d7b01c7a6be8489fc43c30ec46611 GIT binary patch literal 1002 zcmZ?wbhEHb6krf!XlDQc-$th2zrW1h>zXiuYuZlR>rYpoy*K05%T2$3f3I7vRJu?i zZ5r=~?~k6mIlTN>NZ~xu@4w$fcC)2U=AOCN@xr6o_g-#`?c-Q@!1wq6?@5!nzyJQQ z?Lzj4FSqtysi|BdE*jiPY1XLatFf{P-vA88HD0Nt^8dA9ZC#L%h(vEoH_8wsX>q-EkbmG(}KgoO!gWR1R0$gxLBBbL}n~pex1RP zovp#KfZ2C7m+G1Z?gVDW_DE5?f)@vmoM#YI;VSqY;GA^QP)x@|&}q?u1_o;YZ=9fn literal 0 HcmV?d00001 diff --git a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js index fd68b331fe..11925401bf 100755 --- a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js +++ b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js @@ -45,10 +45,10 @@ if (typeof i18nStringsCap == 'undefined') var schemes = { "white" : { "backgroundcolor" : "#FFFFFF", - "capabilitycolor" : "#FFA500", + "capabilitycolor" : "#A46A00", "nodestroke" : "#FFFFFF", "fontcolor" : "#555", - "linkcolor" : "#B8B8B8", + "linkcolor" : "#676767", "gradient" : function(percent) { return percent } @@ -58,7 +58,7 @@ var schemes = { "capabilitycolor" : "#FFA500", "nodestroke" : "#333333", "fontcolor" : "#FFF", - "linkcolor" : "#777", + "linkcolor" : "#9b9b9b", "gradient" : function(percent) { return -percent + 125; } diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css index 487a054918..280933333f 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css @@ -27,7 +27,7 @@ .paginatedtabs span { padding-right: 5px; cursor: pointer; - color: #2485AE; + color: #12739D; } .paginate-nav-text { @@ -35,9 +35,9 @@ } .datatablewrapper td, th { - border-bottom: 1px #F1F2EE solid; - border-right: 1px #F1F2EE solid; - border-left: 1px #F1F2EE solid; + border-bottom: 1px #F5F5F5 solid; + border-right: 1px #F5F5F5 solid; + border-left: 1px #F5F5F5 solid; text-align: left; padding: 5px; font-size: 12px; @@ -59,7 +59,7 @@ .datatablewrapper th { border-top: 1px #3D454E solid; - background:#F1F2ee; + background:#F5F5F5; font-weight:bold; font-size:12px; padding-bottom: 3px; diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js index 6e67fbe576..7b9e3d0d81 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js @@ -1294,7 +1294,7 @@ function removeStopWords(val) { function setEntityLevel(entityLevel){ $('#entityleveltext').text(' ' + entityLevel.toLowerCase()).css('font-style', 'italic'); $('#entityHeader').text(entityLevel).css('font-weight', 'bold'); - $('#headerText').css("color", "#2485ae"); + $('#headerText').css("color", "#12739D"); } function toCamelCase(string){ diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl index 677706c7fe..2cee630e53 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl @@ -11,9 +11,9 @@ ${statement.value!"ORCID iD not found"} <#if orcidInfo??> <#if (orcidInfo.orcids[statement.value])!false> - (confirmed) + (confirmed) <#else> - (pending confirmation) + (pending confirmation) diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css index 82227de9ec..ae43b8ccd8 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css @@ -84,5 +84,5 @@ a.more-less { } a:hover.more-less { color: #fff; - background: #888; + background: #656565; } diff --git a/webapp/src/main/webapp/themes/nemo/css/layout.css b/webapp/src/main/webapp/themes/nemo/css/layout.css index bc5d3d9d12..46901d1df1 100644 --- a/webapp/src/main/webapp/themes/nemo/css/layout.css +++ b/webapp/src/main/webapp/themes/nemo/css/layout.css @@ -50,7 +50,7 @@ #header-entity-label { font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; font-size: 1.5275em; - color: #2485ae; + color: #12739D; line-height: 1.3em; padding-top:15px; padding-bottom:10px; @@ -108,7 +108,7 @@ a.clear-selected-entities { /* filter */ .filter-option, .comparison-filter-option { - color: #2485AE; + color: #12739D; cursor: pointer; /*padding-right: 5px;*/ text-decoration: underline; @@ -161,7 +161,7 @@ a.clear-selected-entities { } #reset-search, #comparison-reset-search { - color: #2485AE; + color: #12739D; cursor: pointer; margin-left: 10px; } @@ -178,7 +178,7 @@ th#percentage-activity-column { .corner-triangle { border-left: 10px solid #F6F6F6; - border-top: 10px solid #2485AE; + border-top: 10px solid #12739D; float: right; font-size: 0; line-height: 0; @@ -228,13 +228,13 @@ a.map-of-science-links { text-align: center; height: 25px; max-width: 260px; - background-color: #2485AE; + background-color: #12739D; height: 20px; padding: 4px 5px 3px; } #download-unlocated-journal-info { - background-color: #2485AE; + background-color: #12739D; height: 20px; margin-top: 10px; max-width: 260px; @@ -268,7 +268,7 @@ a.map-of-science-links { .subpaginatedtabs span { padding-right: 5px; cursor: pointer; - color: #2485AE; + color: #12739D; } .visCommonControllTooltip { @@ -286,7 +286,7 @@ a.map-of-science-links { #noPublications-header { font-size: 1.375em; - color: #2485ae; + color: #12739D; line-height: 1.3em; padding-top:15px; padding-bottom:10px; diff --git a/webapp/src/main/webapp/themes/nemo/css/openSocial/gadgets.css b/webapp/src/main/webapp/themes/nemo/css/openSocial/gadgets.css index 719230fafe..ec71b040a4 100644 --- a/webapp/src/main/webapp/themes/nemo/css/openSocial/gadgets.css +++ b/webapp/src/main/webapp/themes/nemo/css/openSocial/gadgets.css @@ -37,7 +37,7 @@ .gadgets-gadget-title-bar { padding: 4px 4px 2px; background-color: #EEEBE5; - background-color: #f1f2ee; /* #e5ecf9; */ + background-color: #F5F5F5; /* #e5ecf9; */ } /*.gadgets-gadget-title-bar:hover { background-color: #e7e3db; } */ .gadgets-gadget-title-bar img, @@ -49,7 +49,7 @@ .gadgets-gadget-title a, .gadgets-gadget-title a:hover, .gadgets-gadget-title a:visited { /* font-weight: bold; */ font-size: 16px; /*14px*/ - color: #2485AE; /*#CA7C29*/ + color: #12739D; /*#CA7C29*/ padding-left:8px; /*tlw72*/ text-decoration: none; /*tlw72*/ } diff --git a/webapp/src/main/webapp/themes/nemo/css/wilma.css b/webapp/src/main/webapp/themes/nemo/css/wilma.css index 3612a0cb81..d38c33aca1 100644 --- a/webapp/src/main/webapp/themes/nemo/css/wilma.css +++ b/webapp/src/main/webapp/themes/nemo/css/wilma.css @@ -30,7 +30,7 @@ body { background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat; } a { - color: #2485AE; + color: #12739D; } a:hover, h2 a:hover, @@ -52,7 +52,7 @@ h2 { line-height: 1.5em; } h2 a { - color: #2485ae; + color: #12739D; } h2 a:link, h2 a:visited { @@ -86,7 +86,7 @@ input[type="password"] { font-size: 14px; padding: .5em; background: #fff; - border: 1px solid #e0dfdf; + border: 1px solid #898989; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -128,7 +128,7 @@ input.form-button:visited { position: relative; border: 0; margin: 0; - background-color: #749a02; + background-color: #405503; color: #fff; font-size: 14px; font-weight: normal; @@ -176,7 +176,7 @@ input.submit:hover, input#submit:hover, input.form-button:hover { color: #fff; - background-color: #b2d15a; + background-color: #435A00; } input.delete:hover, input#delete:hover { @@ -197,7 +197,7 @@ section.accounts input.delete:active { top: 1px; } form textarea { - border: 1px solid #e0dfdf; + border: 1px solid #898989; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -214,7 +214,7 @@ form a:visited.cancel, a.return:link, a.return:visited { text-decoration: underline; - color: #f70; + color: #B50; border-color: none; padding-left: 3px; } @@ -225,7 +225,7 @@ a.return:visited { form a:hover.cancel, form a:active.cancel { text-decoration: none; - color: #f70; + color: #B50; background: none; } .validationError { @@ -244,13 +244,13 @@ p.submit { padding: 3px; } .editingForm .entryFormHead { - background-color: #f1f2ee; + background-color: #F5F5F5; border-color: #dfe6e6; } .form-item { margin-top:.3em; background-color: #fff; - border-color: #e0dfdf; + border-color: #898989; font-size: .8em; border-width: 1px; color: #595B5B; @@ -259,12 +259,12 @@ p.submit { a.return:hover, a.return:active { text-decoration: none; - color: #f70; + color: #B50; background: none; } .database_header { - background-color: #f1f2ee; - color: #2485ae; + background-color: #F5F5F5; + color: #12739D; font-size: 1em; } .database_upperleftcorner { @@ -278,7 +278,7 @@ a.return:active { } .rownumheader, .rownum { - background-color: #F1F2EE; + background-color: #F5F5F5; color: #5F6464; font-size: 1em; } @@ -365,7 +365,7 @@ form select { font-size: 14px; padding: .5em; background: #fff; - border: 1px solid #e0dfdf; + border: 1px solid #898989; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -382,7 +382,7 @@ a.ingestMenu:visited, a.account-menu:link, a.account-menu:visited { text-decoration: none; - color: #2485AE; + color: #12739D; } a.ingestMenu:hover, a.ingestMenu:active, @@ -451,7 +451,7 @@ hr.formDivider { margin: 0 auto; } /* BRANDING ------> */ -h1.vivo-logo { +.vivo-logo { position: absolute; width: 442px; height: 59px; @@ -459,7 +459,7 @@ h1.vivo-logo { left: 0; background: url(../images/VIVO-logo.png) 0 0 no-repeat; } -h1.vivo-logo a { +.vivo-logo a { display: block; width: 386px; height: 59px; @@ -489,7 +489,7 @@ ul#header-nav li:last-child { ul#header-nav a:hover, ul#header-nav a:active { text-decoration: none; - color: #999; + color: #656565; } ul#header-nav a.log-out { padding-left: 10px; @@ -506,7 +506,7 @@ ul#header-nav a.log-out { #search-field { width: 396px; height: 38px; - background: url(../images/search-interior-pages.png) 0 0 no-repeat; + background: url(../images/search-interior-pages-darkened.png) 0 0 no-repeat; } #search-field input.search { text-decoration: none; @@ -561,7 +561,7 @@ ul#main-nav { } #main-nav li a.selected { color: #002b44; - background: url(../images/selected-main-nav.jpg) left -1px no-repeat; + background: url(../images/selected-main-nav.png) left -1px no-repeat; margin-left: 18px; } /* WRAPPER CONTENT------> */ @@ -585,7 +585,7 @@ body.loggedIn #intro { #intro h2 { padding: 35px 0 12px 24px; border-bottom: none; - color: #2485AE; + color: #12739D; } #intro p { font-size: 16px; @@ -603,7 +603,7 @@ p.forgot-password a, ul#individual-personInPosition li a, ul.individual-urls li a, ul.individual-urls-people li a { - color: #2485ae + color: #12739D } /* LOG IN------> */ #login { @@ -621,13 +621,13 @@ body.login #login { } #login h2 { font-size: 22px; - color: #2485ae; + color: #12739D; padding-left: 15px; padding-top: 18px; border-bottom: none; } h3.internal-auth:hover { - color: #47B6D0; + color: #267C90; } #error-alert { margin-left: 0; @@ -664,7 +664,7 @@ h3.internal-auth:hover { height: 24px; margin-left: 38px; background: #fff; - border: 1px solid #e0dfdf; + border: 1px solid #898989; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -768,13 +768,13 @@ p.external-auth a.blue:hover { padding: 0; font-size: 22px; margin-bottom: 15px; - color: #2485AE; + color: #12739D; padding-left: 24px; } #search-home-field { width: 483px; height: 44px; - background: url(../images/search-field-and-button.gif) 0 0 no-repeat; + background: url(../images/search-field-and-button-darkened.gif) 0 0 no-repeat; } #search-home-field input.search { text-decoration: none; @@ -801,7 +801,7 @@ input.search-home-vivo { /* SEARCH HOME------> */ #search-home-field { - background: url(../images/search-field-and-button.gif) 0 0 no-repeat; + background: url(../images/search-field-and-button-darkened.gif) 0 0 no-repeat; width: 520px; } #search-home-field input.search { @@ -816,7 +816,6 @@ input.search-homepage { border: 0; background-color: #f9fafa; background-position: right; - opacity: .5; text-align:right; } @@ -860,11 +859,11 @@ ul#classes-in-classgroup a:hover, ul#classes-in-classgroup a.selected, ul#vgraph-classes a:hover, ul#vgraph-classes a.selected { - background: url(../images/arrow.gif) 0 10px no-repeat; - color: #2ea0cf; + background: url(../images/arrow_darkened.gif) 0 10px no-repeat; + color: #0C5E7F; } svg text:hover { - color: #2EA0CF; + color: #0C5E7F; } p.view-all { clear: both; @@ -1101,7 +1100,7 @@ p { .green, ul#individual-tools li a, ul#individual-tools-people li a { - color: #b2d15a; + color: #435A00; } .small.button, .small.button:visited { @@ -1115,11 +1114,11 @@ ul#individual-tools-people li a { } .green.button, .green.button:visited { - background-color: #749a02; + background-color: #405503; color: #fff; } .green.button:hover { - background-color: #b2d15a; + background-color: #435A00; } .blue.button, .blue.button:visited { @@ -1147,11 +1146,11 @@ ul#individual-tools-people li a { } .individualList li, .individualList li span { - color: #9c9c9c; + color: #656565; } .individualList li a { font-weight: normal; - color: #2485AE; + color: #12739D; } /* -------------------------------------------------> */ @@ -1190,13 +1189,13 @@ ul#individual-tools-people li a { } #find-by h3 { font-size: 1.125em; - color: #2485ae; + color: #12739D; font-weight: normal; } ul#find-filters a:hover, ul#find-filters a.selected { - background: url(../images/arrow.gif) 0 6px no-repeat; - color: #2ea0cf; + background: url(../images/arrow_darkened.gif) 0 6px no-repeat; + color: #0C5E7F; } /* RESEARCHERS ------> */ #researchers { @@ -1206,9 +1205,9 @@ ul#find-filters a.selected { } #researchers h3 { font-size: 1.25em; - color: #2485ae; + color: #12739D; font-weight: normal; - background: url(../images/arrow.gif) 140px 27px no-repeat; + background: url(../images/arrow_darkened.gif) 140px 27px no-repeat; } #researchers p { font-size: 1.125em; @@ -1222,7 +1221,7 @@ ul#find-filters a.selected { font-size: 4.375em; text-align: center; float: left; - color: #2485ae; + color: #12739D; border-right: 1px dotted #dde4e3; font-weight: bold; } @@ -1234,7 +1233,7 @@ ul#find-filters a.selected { } #nav-display p { font-size: 26px; - color: #2485ae; + color: #12739D; } #nav-display img { border-left: 1px solid #e8e8e8; @@ -1252,7 +1251,7 @@ ul#find-filters a.selected { ul#browse-classes { border: 1px solid #dde4e3; border-right: 0; - background-color: #f1f2ee; + background-color: #F5F5F5; } ul#browse-classes li, ul#vgraph-classes li { @@ -1261,8 +1260,8 @@ ul#vgraph-classes li { } ul#browse-classes a:hover, ul#browse-classes a.selected { - background: url(../images/arrow.gif) 4px 5px no-repeat; - color: #2ea0cf; + background: url(../images/arrow_darkened.gif) 4px 5px no-repeat; + color: #0C5E7F; } ul#browse-classes .count-classes { font-size: 12px; @@ -1273,8 +1272,8 @@ ul#alpha-browse-individuals { } ul#alpha-browse-individuals a:hover, ul#alpha-browse-individuals a.selected { - background: url(../images/arrowSmall.gif) -3px 7px no-repeat; - color: #2ea0cf; + background: url(../images/arrowSmall-darkened.gif) -3px 7px no-repeat; + color: #0C5E7F; } ul#alpha-browse-individuals .count-classes, ul#vgraph-classes .count-classes { @@ -1352,7 +1351,7 @@ article.property ul.property-list { background-color: #f2f9fb; } #admin h3 { - background: #2485AE; + background: #12739D; color: #fff; } #admin .uri-link, @@ -1360,7 +1359,7 @@ article.property ul.property-list { color: #888c8c; } #admin a { - color: #2a98bc; + color: #12739D; } /* INDIVIDUAL INTRO FOR ANY CLASS ------> */ .preferred { @@ -1368,7 +1367,7 @@ article.property ul.property-list { } #individual-intro h1 { font-size: 1.375em; - color: #2485ae; + color: #12739D; } #individual-intro span.display-title, h1.fn .display-title { @@ -1377,7 +1376,7 @@ h1.fn .display-title { border-left: 1px solid #a6b1b0; } ul#individual-tools { - color: #8AA149; + color: #536520; } h2#webpage { font-weight: bold; @@ -1391,7 +1390,7 @@ img.individual-photo { display: block; } ul#individual-tools { - color: #8AA149 + color: #536520 } #share-contact a.email, #share-contact a.tel, @@ -1465,7 +1464,7 @@ a.all-vivo-publications { /* <------ TEMPORAL GRAPH and MAP O' SCIENCE */ #temporal-graph h3 a, #map-of-science h3 a { - color: #2485AE; + color: #12739D; font-size: .8em !important; text-decoration: underline; vertical-align:text-top; @@ -1477,12 +1476,12 @@ img.co-author { #co-authors h3, #right-hand-column h3 { font-size: 1.25em; - color: #2485ae; + color: #12739D; } /* PROPERTY GROUP MENU ------> */ #property-group-menu { width: 920px; - background: #f1f2ee; + background: #F5F5F5; } #property-group-menu li { background: url(../../../images/individual/separator-property-group-nav.jpg) right 10px no-repeat; @@ -1497,7 +1496,7 @@ img.co-author { section.property-group h2, #menupage-content h4 { font-size: 1.25em; - color: #2485ae; + color: #12739D; font-weight: normal; } article.property { @@ -1506,7 +1505,7 @@ article.property { article.property h3 { background: #fafaf9; font-size: 1.063em; - color: #8aa149; + color: #536520; } article.property ul.property-list li.subclass h3 { font-size: 1.063em; @@ -1518,7 +1517,7 @@ article.property .data-property-statement { color: #5e6363; } article.property ul.property-list li a { - /*color: #2485ae;*/ /* cappadona: seems unnecessarily specific and is overriding .more-less from individual.css so I'm commenting out for now */ + /*color: #12739D;*/ /* cappadona: seems unnecessarily specific and is overriding .more-less from individual.css so I'm commenting out for now */ line-height: 1.6em; } /* MISCELLANEOUS ------> */ @@ -1543,7 +1542,7 @@ p.address-line { } /* EDITING DISPLAY------> */ .edit-individual { - border-left: 1px dotted #B2D15A; + border-left: 1px dotted #435A00; } /* -------------------------------------------------> */ /* SITE ADMIN DASHBOARD ----------------------------> */ @@ -1587,7 +1586,7 @@ p.address-line { } #revision-levels caption { font-size: 18px; - color: #2485ae; + color: #12739D; } #revision-levels th { font-weight: bold; @@ -1640,7 +1639,7 @@ form.customForm p { section.accounts input.delete, section.accounts input.delete:visited { background-color: #FFF; - color: #2485AE; + color: #12739D; border: 1px solid #96c5da; } section.accounts input.delete:hover { @@ -1661,7 +1660,7 @@ input.add-account:hover { } .disabledSubmit { color: #ede ! important; - background-color: #b2d15a ! important; + background-color: #435A00 ! important; cursor: default ! important; } /* -------------------------------------------------> */ diff --git a/webapp/src/main/webapp/themes/nemo/images/arrowSmall-darkened.gif b/webapp/src/main/webapp/themes/nemo/images/arrowSmall-darkened.gif new file mode 100644 index 0000000000000000000000000000000000000000..2ed7e47d128afa8ae857bf8ebd135f141e2b19b0 GIT binary patch literal 851 zcmZ?wbhEHbWM|-HXlG!EsgPtC1*0J_QbR!TKewN2NU*bGfUA+70W%{o929@Dure_) uGU$N91e8q}IAj@^Sr`}`7C1Dq@GALK6fAUV;Z@Yru@HFV+|0D;+nKLIfD{JxM#m}EVU$J6EPfyQ;2@{qtU%qC|8ir9Y z8UjNq1Qh>s`?-b$J39ur8tEA@GXfp2_>+Z&2}tXJJOaul3>^O%7#RvC9B620<`CA3 zIk92k;dTLKuQ?tY7ai@EFwVMjV&mfD{R+-(5}uouoSdu?yej78rlqH+aC6x(G$=T+ zaj~}Xwye0g*kiI*?5Qm)FE0;R>^0Tu!P2X%BQ|HrMlv)su>~LQ zlJ(xU=H}*%%d28fZ+>-cd%@#b^G@I{_b&kHUD|JeSd%dczS++oc#X(|DU|v9$);IG2=nwNluFe z1*}Rh9yD*(-0>in*D2#+>l{xD#ca`}7Z2OJGIuCu$Tnp>>a6IrSd^`??S)dj);fvE zPW@{ci-QeMSxEGne|w=EX!%M*yx(3dbBUiL7pM3{ce9(xle~nUKbaEpjwN+Uq+#UK zY4UNMPeY@MG}T(->V66_CNHZ@o|(3-W!bEPZ70%ZYwwkOJ~#G~=A5||-#nMi+wt+` z^95|@IA3@+39Wij+a?zkw5Z$dR@~ygK9-eBW>mRnE)_d7<>hk5FsWHg?TuNl%4S<} zIkGO_rWL!Yy~>Dn+UhM*?5pQ-Ul3_z(cQISgo=P( SxXqrhVv=XT0Y*kf25SI8M`3pW literal 0 HcmV?d00001 diff --git a/webapp/src/main/webapp/themes/nemo/images/search-interior-pages-darkened.png b/webapp/src/main/webapp/themes/nemo/images/search-interior-pages-darkened.png new file mode 100644 index 0000000000000000000000000000000000000000..40e55fe29e51b9630d885e8a16bcd681c7bbdf66 GIT binary patch literal 1116 zcmeAS@N?(olHy`uVBq!ia0y~yVC)34RXLb}WW%bb>wpwvage(cf^i;|T5G`v3oqPaV5Y0|!v?ozK&J8rb*VNm+2p(YublZJWAh4ZC*@d)acy zlolA-JzTyG>>d?tZWU~<6|8PmKnANz1?#QPlU&PKUCLN@+=`!b z%*LgJ#i@kFrG&Lwbz=E|X<0)2w5bR@qFJ*-Q=V6)iKF zvgZj~WHN>KaG7T?nPo6}*0GwUF`1?@8K*EBr!f8h{}AZ4Tc2kb0l8_64kgS$?&8D# zMoEl@NsRtotU&I^A0L5a)cS(Wz(C9{3GxeOkTVXAv9VkP3^^bu|Ns9Fkn#p|s6Z?Q zn(@m9NCYWb3O#VXznp=A$=1`wF{EP7+u6R}%!UGO#?iMgHETGr27XX@;pp<=(Q#J+ z7C}drk4hCE6Y3`}uy_1FPyFrlytOxPo_$kh?5ln2`@#z)o9F6%R-2qMX_8^v2?l$o z-95M3e0mqOn8)jJzupqjQYCWbNlt*|o_#OXra!--Tf6*PUGr*-J!f4+t}@#_SaV^) zly25F*Joa~&ePrObauNyzghB`a&PT}yH4(oK7Gc4lb8GL2eXAOZLW`WZFmBl4hzlv zRIIMp6MDxxz{z#k;wbqqf(wo+*0oAz8 z*}j5H)FwleRdwZJ2Ts=6g(684H9Yu4y)4&0G9( z%Ia33e{=Y5ZQPRdO!?=AeI->gUO$Sbm1=(S+kfPzi{E-D&U(E|UO)2BcRB!BQ)`{h zlqrZ?v$1PW-oT~$XXhz5bwv%)HXR}TM{9QIUqAYM+Lj4BtLJt+{C~Q4cAysf?Vo-^ z;aeYCPu!Wm|AD=$-JPnP-KyN#o)"; + var imgHtml = ""; $(this).prepend(imgHtml); } else { @@ -115,7 +115,7 @@ $(document).ready(function(){ + urlsBase + "/people#http://vivoweb.org/ontology/core#FacultyMember' alt='" + i18nStrings.viewAllFaculty + "'>" - + i18nStrings.viewAllString + ""; + + i18nStrings.i18nStrings.viewAllFaculty.charAt(0).toUpperCase() + i18nStrings.viewAllFaculty.slice(1) + "..."; //var viewMore = "
  • " - + i18nStrings.viewAllString + "" - + "" + + i18nStrings.viewAllDepartments.charAt(0).toUpperCase() + i18nStrings.viewAllDepartments.slice(1) + "..." + + ""; //${i18n().view_all} } $('div#academic-depts').html(html); diff --git a/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-academic-article.ftl b/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-academic-article.ftl index 8251f59a54..d65467df6e 100644 --- a/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-academic-article.ftl +++ b/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-academic-article.ftl @@ -87,7 +87,7 @@ <#-- Most-specific types --> <@p.mostSpecificTypes individual /> - uri icon + uri icon diff --git a/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl index b7288b535b..65a6c5207c 100644 --- a/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl +++ b/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl @@ -98,7 +98,7 @@ Add divs and wrapper to create funnelback basket controls. MUST BE REMOVED BEFOR
    - ${i18n().uri_icon} + ${i18n().uri_icon} <#if checkNamesResult?has_content > ${i18n().qr_icon}
    @@ -50,15 +50,15 @@ corresponding changes in the included Templates. --> <#-- VIEW TYPE FILTER -->
    ${i18n().explore_capitalized} ${entityLabel} - ${i18n().info_icon}
    + ${i18n().info_icon}
    ${i18n().compare_organizations} <#--/ people --> - ${i18n().info_icon}

    + ${i18n().info_icon}

    ${i18n().mapped} % ${i18n().of} ${i18n().publications} - ${i18n().info_icon} + ${i18n().info_icon}
    diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/edit.css b/webapp/src/main/webapp/themes/tenderfoot/css/edit.css index 578766caa9..8ed29c4e87 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/edit.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/edit.css @@ -8,7 +8,7 @@ input[type="password"] { font-size: 14px; padding: .5em; background: #fff; - border: 1px solid #e0dfdf; + border: 1px solid #898989; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -50,7 +50,7 @@ input.form-button:visited { position: relative; border: 0; margin: 0; - /* background-color: #749a02; */ + /* background-color: #405503; */ background-color: #3446A0; color: #fff; font-size: 14px; @@ -121,7 +121,7 @@ section.accounts input.delete:active { top: 1px; } form textarea { - border: 1px solid #e0dfdf; + border: 1px solid #898989; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -138,7 +138,7 @@ form a:visited.cancel, a.return:link, a.return:visited { text-decoration: underline; - color: #f70; + color: #B50; border-color: none; padding-left: 3px; } @@ -149,7 +149,7 @@ a.return:visited { form a:hover.cancel, form a:active.cancel { text-decoration: none; - color: #f70; + color: #B50; background: none; } .validationError { @@ -168,13 +168,13 @@ p.submit { padding: 3px; } .editingForm .entryFormHead { - background-color: #f1f2ee; + background-color: #F5F5F5; border-color: #dfe6e6; } .form-item { margin-top:.3em; background-color: #fff; - border-color: #e0dfdf; + border-color: #898989; font-size: .8em; border-width: 1px; color: #595B5B; @@ -183,12 +183,12 @@ p.submit { a.return:hover, a.return:active { text-decoration: none; - color: #f70; + color: #B50; background: none; } .database_header { - background-color: #f1f2ee; - color: #2485ae; + background-color: #F5F5F5; + color: #12739D; font-size: 1em; } .database_upperleftcorner { @@ -202,7 +202,7 @@ a.return:active { } .rownumheader, .rownum { - background-color: #F1F2EE; + background-color: #F5F5F5; color: #5F6464; font-size: 1em; } @@ -293,7 +293,7 @@ form select { font-size: 14px; padding: .5em; background: #fff; - border: 1px solid #e0dfdf; + border: 1px solid #898989; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -310,7 +310,7 @@ a.ingestMenu:visited, a.account-menu:link, a.account-menu:visited { text-decoration: none; - color: #2485AE; + color: #12739D; } a.ingestMenu:hover, a.ingestMenu:active, diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css index 737b6331f3..2c22bcf0a3 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css @@ -2,7 +2,7 @@ ul#browse-classes { border: 1px solid #dde4e3; border-right: 0; - background-color: #f1f2ee; + background-color: #F5F5F5; } ul#browse-classes li, ul#vgraph-classes li { @@ -11,8 +11,8 @@ ul#vgraph-classes li { } ul#browse-classes a:hover, ul#browse-classes a.selected { - background: url(../images/arrow.gif) 4px 5px no-repeat; - color: #2ea0cf; + background: url(../images/arrow_darkened.gif) 4px 5px no-repeat; + color: #0C5E7F; } ul#browse-classes .count-classes { font-size: 12px; @@ -26,8 +26,8 @@ ul#alpha-browse-individuals { } ul#alpha-browse-individuals a:hover, ul#alpha-browse-individuals a.selected { - background: url(../images/arrowSmall.gif) -3px 7px no-repeat; - color: #2ea0cf; + background: url(../images/arrowSmall-darkened.gif) -3px 7px no-repeat; + color: #0C5E7F; } ul#alpha-browse-individuals .count-classes, ul#vgraph-classes .count-classes { diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css index 001ebb6f79..82dd968f8a 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css @@ -63,7 +63,7 @@ article.property li h3 { #individual-intro h1 { font-size: 1.375em; - color: #2485ae; + color: #12739D; float: left; } diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-login.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-login.css index 9cf12731e3..be8d7a9909 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/page-login.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-login.css @@ -14,13 +14,13 @@ body.login #login { } #login h2 { font-size: 22px; - color: #2485ae; + color: #12739D; padding-left: 15px; padding-top: 18px; border-bottom: none; } h3.internal-auth:hover { - color: #47B6D0; + color: #267C90; } #error-alert { margin-left: 0; @@ -57,7 +57,7 @@ h3.internal-auth:hover { height: 24px; margin-left: 38px; background: #fff; - border: 1px solid #e0dfdf; + border: 1px solid #898989; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css index 9021b2afee..454ea148b7 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css @@ -178,7 +178,7 @@ ul#header-nav a.log-out { #search-field { width: 396px; height: 38px; - background: url(../images/search-interior-pages.png) 0 0 no-repeat; + background: url(../images/search-interior-pages-darkened.png) 0 0 no-repeat; } #search-field input.search { text-decoration: none; @@ -292,7 +292,7 @@ h2 { line-height: 1.5em; } h2 a { - color: #2485ae; + color: #12739D; } h2 a:link, h2 a:visited { diff --git a/webapp/src/main/webapp/themes/tenderfoot/images/arrowSmall-darkened.gif b/webapp/src/main/webapp/themes/tenderfoot/images/arrowSmall-darkened.gif new file mode 100644 index 0000000000000000000000000000000000000000..2ed7e47d128afa8ae857bf8ebd135f141e2b19b0 GIT binary patch literal 851 zcmZ?wbhEHbWM|-HXlG!EsgPtC1*0J_QbR!TKewN2NU*bGfUA+70W%{o929@Dure_) uGU$N91e8q}IAj@^Sr`}`7C1Dq@GALK6fAUV;Z@Yru@HFV+|0wpwvage(cf^i;|T5G`v3oqPaV5Y0|!v?ozK&J8rb*VNm+2p(YublZJWAh4ZC*@d)acy zlolA-JzTyG>>d?tZWU~<6|8PmKnANz1?#QPlU&PKUCLN@+=`!b z%*LgJ#i@kFrG&Lwbz=E|X<0)2w5bR@qFJ*-Q=V6)iKF zvgZj~WHN>KaG7T?nPo6}*0GwUF`1?@8K*EBr!f8h{}AZ4Tc2kb0l8_64kgS$?&8D# zMoEl@NsRtotU&I^A0L5a)cS(Wz(C9{3GxeOkTVXAv9VkP3^^bu|Ns9Fkn#p|s6Z?Q zn(@m9NCYWb3O#VXznp=A$=1`wF{EP7+u6R}%!UGO#?iMgHETGr27XX@;pp<=(Q#J+ z7C}drk4hCE6Y3`}uy_1FPyFrlytOxPo_$kh?5ln2`@#z)o9F6%R-2qMX_8^v2?l$o z-95M3e0mqOn8)jJzupqjQYCWbNlt*|o_#OXra!--Tf6*PUGr*-J!f4+t}@#_SaV^) zly25F*Joa~&ePrObauNyzghB`a&PT}yH4(oK7Gc4lb8GL2eXAOZLW`WZFmBl4hzlv zRIIMp6MDxxz{z#k;wbqqf(wo+*0oAz8 z*}j5H)FwleRdwZJ2Ts=6g(684H9Yu4y)4&0G9( z%Ia33e{=Y5ZQPRdO!?=AeI->gUO$Sbm1=(S+kfPzi{E-D&U(E|UO)2BcRB!BQ)`{h zlqrZ?v$1PW-oT~$XXhz5bwv%)HXR}TM{9QIUqAYM+Lj4BtLJt+{C~Q4cAysf?Vo-^ z;aeYCPu!Wm|AD=$-JPnP-KyN#o)
    - ${i18n().uri_icon} + ${i18n().uri_icon} <#if checkNamesResult?has_content > ${i18n().qr_icon}
    diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/scratch.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/scratch.ftl index ee579ae7dc..9dc04d7aad 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/scratch.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/scratch.ftl @@ -17,7 +17,7 @@
    - ${i18n().uri_icon} + ${i18n().uri_icon} <#if checkNamesResult?has_content > ${i18n().qr_icon}
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl index 4217546432..dd3434f2e0 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl @@ -74,7 +74,7 @@ ${i18n().organizations_capitalized} | ${i18n().people_capitalized} | ${i18n().view_all} - ${i18n().info_icon} @@ -104,7 +104,7 @@

  - ${i18n().info_icon}

+ ${i18n().info_icon}

${i18n().you_have_selected} 0 ${i18n().of_a_maximum} 10 ${i18n().schools}. diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl index 950ecc58cc..9f43d41570 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl @@ -47,7 +47,7 @@ var mapOfScienceImageFolderPrefix = imageFolderPrefix + "mapofscience/"; var disciplineLabelImageUrlPrefix = mapOfScienceImageFolderPrefix + "labels/"; var disciplineBlackLabelImageUrlPrefix = disciplineLabelImageUrlPrefix + "black/"; -var infoIconUrl = "${urls.images}/iconInfo.png"; +var infoIconUrl = "${urls.images}/iconInfo-darkened.png"; var drillDownIconUrl = "${urls.images}/visualization/drill_down_icon.png"; var entityLabel = '${entityLabel}'; diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl index 410ae4a28c..618d282520 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl @@ -20,7 +20,7 @@ corresponding changes in the included Templates. -->

${entityLabel}

${i18n().explore_activity} ( ${i18n().publications}) ${i18n().across_subdisciplines} - ${i18n().info_icon}
@@ -45,9 +45,9 @@ corresponding changes in the included Templates. --> <#-- VIEW TYPE FILTER -->
${i18n().explore_capitalized} ${entityLabel} - ${i18n().info_icon}
+ ${i18n().info_icon}
${i18n().compare_organizations} <#--/ people --> - ${i18n().info_icon}

+ ${i18n().info_icon}

@@ -60,7 +60,7 @@ corresponding changes in the included Templates. -->
${i18n().mapped} % ${i18n().of} ${i18n().publications} - ${i18n().info_icon} + ${i18n().info_icon}
${i18n().save_unmapped_publications} diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl index 27efe5436a..ee8ee3692d 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl @@ -324,7 +324,7 @@ $(document).ready(function(){

${i18n().tables_capitalized}

-

${i18n().grant_info_for_all_years} ${i18n().info_icon}

+

${i18n().grant_info_for_all_years} ${i18n().info_icon}

From d4906481a9f2eeb4d5d84c801f755536f19e91d6 Mon Sep 17 00:00:00 2001 From: Milos Popovic Date: Sun, 22 Mar 2026 00:26:21 +0100 Subject: [PATCH 3/4] darkened icon (copy-vis-viewlink-icon) --- .../visualization/entitycomparison/entityComparisonBody.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl index dd3434f2e0..ede70b542f 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl @@ -44,7 +44,7 @@ - ${i18n().uri_icon} + ${i18n().uri_icon}
From 4b67b35450a2a12f9ceca1b06e4d6bacb5c7ac42 Mon Sep 17 00:00:00 2001 From: Milos Popovic Date: Sun, 22 Mar 2026 10:16:48 +0100 Subject: [PATCH 4/4] Lighteneed link colors to meet AA WCAG --- .../coauthorship/coAuthorshipSparklineContent.ftl | 4 ++-- .../visualization/copi/coInvestigationSparklineContent.ftl | 4 ++-- .../visualization/grant/personGrantSparklineContent.ftl | 4 ++-- .../publication/personPublicationSparklineContent.ftl | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl index b3562895fa..f584cb5435 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl @@ -140,7 +140,7 @@ var pubDisplay = "${i18n().co_authors?js_string}"; } - $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
"); + $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
"); var sparksText = ' ${i18n().within_last_10_years?js_string}'; @@ -169,7 +169,7 @@ var pubDisplay = "${i18n().co_authors?js_string}"; } - $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
"); + $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
"); var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}' + ' - ${sparklineVO.latestRenderedPublicationYear?c}'; diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl index 5fcd564644..1e7652c7d6 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl @@ -142,7 +142,7 @@ var grantDisplay = "${i18n().co_investigators?js_string}"; } - $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); + $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); var sparksText = ' ${i18n().within_last_10_years?js_string}'; @@ -171,7 +171,7 @@ var grantDisplay = "${i18n().co_investigators?js_string}"; } - $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); + $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}' + ' through ${sparklineVO.latestRenderedGrantYear?c}'; diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl index 049adb4526..42b514c3c1 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl @@ -135,7 +135,7 @@ var grantDisplay = "${i18n().grants?js_string}"; } - $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); + $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); var sparksText = ' ${i18n().within_last_10_years?js_string}'; @@ -164,7 +164,7 @@ var grantDisplay = "${i18n().grants?js_string}"; } - $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); + $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); var sparksText = ' from ${sparklineVO.earliestYearConsidered?c}' + ' through ${sparklineVO.latestRenderedGrantYear?c}'; diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl index 950b81a6fc..1e7c344bb6 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl @@ -169,7 +169,7 @@ var pubDisplay = "${i18n().publications?js_string}"; } - $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).attr("class", "grey-text").append(" "+ pubDisplay +"
"); + $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).attr("class", "grey-text").append(" "+ pubDisplay +"
"); var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}' + ' - ${sparklineVO.latestRenderedPublicationYear?c}';