Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Site Branding - Theme colors and logo config #4040

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Site Branding - Theme colors and logo config #4040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f5bc4c
Added logo upload and theme color settings in site settings
milospp Jan 14, 2025
bef0c43
Added styles for Vitro theme
milospp Jan 18, 2025
9cb15ef
Implemented styles for Tenderfoot
milospp Jan 19, 2025
12cdb2e
Added color config support for nemo theme
milospp Jan 19, 2025
6418a44
Added support for small version of logo
milospp Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/css/individual/individual-2column-view.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ span#quickViewLink img {
padding-top:18px;
}
#individual-info div#contactContainer h3{
color:#8aa149;
color: var(--secondary-color, #8aa149);
}
ul#individual-personInPosition li {
padding-bottom:12px;
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: var(--accent-color, #8BAB2E);
// background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#446791), to(#164682));
// background-image: -moz-linear-gradient(top, #446791, #164682);
width: auto;
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/themes/nemo/css/homepage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Customise the meet faculty/expert section
Customise the about our research section
----------------------------------------------*/
.research-count {
background-color: #064d68;
background-color: var(--primary-color, #064d68);
padding: 60px;
color: #fff;
border: 1px solid #023447;
Expand Down
12 changes: 6 additions & 6 deletions webapp/src/main/webapp/themes/nemo/css/individual.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Homepage colours
}
.person-content .user-nav {
margin: 20px 0 17px 0;
color: #337ab7;
color: var(--primary-color-lighter, #337ab7);
/* Hide the contact button for demo purposes */
}
.person-content .user-nav > li + li {
Expand Down Expand Up @@ -69,7 +69,7 @@ Styling for the left hand side contact info column on the individual person page
}
.share-contact a.email {
word-break: break-word;
color: #222222;
color: var(--text-color, #222222);
font-size: 15px;
}
.share-contact .individual-urls .list-group-item {
Expand All @@ -92,7 +92,7 @@ Styling for the left hand side contact info column on the individual person page
.share-contact #coinvestigator_link_container .collaboratorship-link a {
min-width: 165px;
background-image: none;
background-color: #064d68;
background-color: var(--primary-color, #064d68);
color: white;
text-shadow: none;
}
Expand All @@ -109,13 +109,13 @@ Styling for the left hand side contact info column on the individual person page
#individual-info #individual-hasResearchArea a.label {
font-size: 13px;
background: transparent;
border: 1px solid #337ab7;
color: #337ab7;
border: 1px solid var(--primary-color-lighter, #337ab7);
color: var(--primary-color-lighter, #337ab7);
font-weight: 400;
transition: all 0.5s;
}
#individual-info #individual-hasResearchArea a.label:hover {
background: #337ab7;
background: var(--primary-color-lighter, #337ab7);
color: #fff;
}
/* Remove borders from all items in nav tab content panes */
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/themes/nemo/css/reset.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ td {
font-size: 100%;
font-family: inherit;
vertical-align: baseline;
color: #595b5b;
color: var(--text-color, #595b5b);
font-weight: normal;
}
body {
Expand Down
37 changes: 32 additions & 5 deletions webapp/src/main/webapp/themes/nemo/css/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,22 @@ body {
height: 100%;
font-size: 14px;
-webkit-font-smoothing: antialiased;
color: var(--text-color, #333);
}
a,
a:hover,
a:focus {
text-decoration: none;
/* color: #1E6B53; */
color: #064d68;
color: var(--link-color, #064d68);
;
}
/*---------------------------------------------
Styling identity.ftl header
----------------------------------------------*/
.header {
/* background: #1e6b52; */
background: #064d68;
background: var(--banner-color, #064d68);
padding: 20px 0;
/* border-bottom: 1px solid #16503d; */
border-bottom: 1px solid #023447;
Expand All @@ -45,8 +46,9 @@ Styling identity.ftl header
}
----------------------------------------------*/
.header img {
width: 263px;
/* width: 263px; */
max-width: 500px;
object-fit: contain;
}
.header h1 {
margin: 0;
Expand Down Expand Up @@ -78,11 +80,11 @@ Styling identity.ftl header
}
}
button.btn.sympl-search {
background: #064d68;
background: var(--primary-color, #064d68);
text-shadow: 0 0 0 transparent;
color: #fff;
/* border: 2px solid #c9c9c9; */
border: 2px solid #023447;
border: 2px solid var(--primary-color-darker, #023447);
}
.theme-dropdown .dropdown-menu {
position: static;
Expand Down Expand Up @@ -268,3 +270,28 @@ These are helper classes to add margin gaps where needed
.input-group-header-search {

}

/* ADMIN PANEL */

.advancedThemeColor {
display: none;
}

.themeColorReset > span {
color: #888;
}

.themeColorResetButton {
background: #ff3737;
color: white;
border-radius: 4px;
padding: 3px 8px;
border: 1px solid red;
cursor: pointer;
}

.themeColorPickerWrapper{
display: flex;
align-items: center;
gap: 5px;
}
15 changes: 15 additions & 0 deletions webapp/src/main/webapp/themes/nemo/templates/head.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,19 @@
an individual profile page. -->
${headContent!}

<style>
:root {
<#if themePrimaryColorLighter?? && themePrimaryColorLighter != "null">--primary-color-lighter: ${themePrimaryColorLighter};</#if>
<#if themePrimaryColor?? && themePrimaryColor != "null">--primary-color: ${themePrimaryColor};</#if>
<#if themePrimaryColorDarker?? && themePrimaryColorDarker != "null">--primary-color-darker: ${themePrimaryColorDarker};</#if>
<#if themeBannerColor?? && themeBannerColor != "null">--banner-color: ${themeBannerColor};</#if>
<#if themeSecondaryColor?? && themeSecondaryColor != "null">--secondary-color: ${themeSecondaryColor};</#if>
<#if themeAccentColor?? && themeAccentColor != "null">--accent-color: ${themeAccentColor};</#if>
<#if themeLinkColor?? && themeLinkColor != "null">--link-color: ${themeLinkColor};</#if>
<#if themeTextColor?? && themeTextColor != "null">--text-color: ${themeTextColor};</#if>
<#if logoUrl?? && logoUrl != "null">--logo-url: url('${logoUrl}');</#if>
<#if logoSmallUrl?? && logoSmallUrl != "null">--logo-small-url: url('${logoSmallUrl}');</#if>
}
</style>

<link rel="shortcut icon" type="image/x-icon" href="${urls.base}/favicon.ico">
16 changes: 14 additions & 2 deletions webapp/src/main/webapp/themes/nemo/templates/identity.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,22 @@
<div class="container">
<div class="row">
<div class="col-md-12 col-sm-12 hidden-xs logo-sm">
<a href="${urls.home}"><img height="66" src="${urls.theme}/images/vivo_logo.png" alt="VIVO Logo" /></a>
<#if logoUrl?? && logoUrl != "null">
<a href="${urls.home}"><img height="66" src="${logoUrl}" alt="VIVO Logo" /></a>
<#elseif logoSmallUrl?? && logoSmallUrl != "null">
<a href="${urls.home}"><img height="66" src="${logoSmallUrl}" alt="VIVO Logo" /></a>
<#else>
<a href="${urls.home}"><img height="66" src="${urls.theme}/images/vivo_logo.png" alt="VIVO Logo" /></a>
</#if>
</div>
<div class="col-xs-12 visible-xs-block">
<a href="${urls.home}"><img height="66" src="${urls.theme}/images/vivo_logo.png" alt="VIVO Logo" /></a>
<#if logoSmallUrl?? && logoSmallUrl != "null">
<a href="${urls.home}"><img height="66" src="${logoSmallUrl}" alt="VIVO Logo" /></a>
<#elseif logoUrl?? && logoUrl != "null">
<a href="${urls.home}"><img height="66" src="${logoUrl}" alt="VIVO Logo" /></a>
<#else>
<a href="${urls.home}"><img height="66" src="${urls.theme}/images/vivo_logo.png" alt="VIVO Logo" /></a>
</#if>
</div>
</div>
</div>
Expand Down
32 changes: 16 additions & 16 deletions webapp/src/main/webapp/themes/tenderfoot/css/edit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ input.form-button:visited {
border: 0;
margin: 0;
/* background-color: #749a02; */
background-color: #3446A0;
background-color: var(--accent-color, #3446A0);
color: #fff;
font-size: 14px;
font-weight: normal;
Expand All @@ -65,7 +65,7 @@ input.form-button:visited {
color: #fff;
}
#verbose-mode b {
color: #595B5B;
color: var(--text-color, #595B5B);
}
#verbose-mode .verbose-off{
background: #706a66;
Expand All @@ -87,7 +87,7 @@ input#delete:visited {
border: 0;
margin: 0;
/* background-color: #398aac; */
background-color: #0c0cb5;
background-color: var(--secondary-color, #0c0cb5);
color: #fff;
font-size: 14px;
font-weight: normal;
Expand All @@ -100,12 +100,12 @@ input.submit:hover,
input#submit:hover,
input.form-button:hover {
color: #fff;
background-color: #3E8BAA;
background-color: var(--primary-color, #3E8BAA);
}
input.delete:hover,
input#delete:hover {
color: #fff;
background-color: #93c3d4;
background-color: var(--secondary-color, #93c3d4);
}
.verbose-toggle,
.verbose-toggle:active,
Expand Down Expand Up @@ -177,7 +177,7 @@ p.submit {
border-color: #e0dfdf;
font-size: .8em;
border-width: 1px;
color: #595B5B;
color: var(--text-color, #595B5B);
padding: .3em;
}
a.return:hover,
Expand All @@ -187,27 +187,27 @@ a.return:active {
background: none;
}
.database_header {
background-color: #f1f2ee;
background-color: var(--primary-color, #f1f2ee);
color: #2485ae;
font-size: 1em;
}
.database_upperleftcorner {
color: #5F6464;
color: var(--text-color, #5f6464);
font-size: 1em;
}
.database_upperleftcenter {
background-color: #B0C4DE;
color: #5F6464;
color: var(--text-color, #5f6464);
font-size: 1em;
}
.rownumheader,
.rownum {
background-color: #F1F2EE;
color: #5F6464;
color: var(--text-color, #5f6464);
font-size: 1em;
}
.headercenter {
color: #5F6464;
color: var(--text-color, #5f6464);
font-size: 10pt;
font-style: normal;
text-align: center;
Expand All @@ -226,14 +226,14 @@ a.return:active {
font-size: 1em;
}
.verticalfieldlabel {
color: #5E6363; /*#5F6464;*/
color: var(--text-color, #5E6363); /*#5F6464;*/
font-style: normal !important;
font-size: 10pt !important;
line-height: 2em !important;
}
td.row, .rowvert {
background-color: #f7f9f9;
color: #5F6464;
color: var(--text-color, #5f6464);
}
.row, .rowvert {
font-size: 10pt;
Expand All @@ -243,15 +243,15 @@ td.row, .rowvert {
}
td.rowalternate {
background-color: #fff;
color: #5F6464;
color: var(--text-color, #5f6464);
}
.rowalternate {
font-size: 1em;
line-height: 2em;
}
.rowbold {
background-color: #FFFAFA;
color: #5F6464;
color: var(--text-color, #5f6464);
font-size: 10pt; /*1em;*/
line-height: 2em;
}
Expand Down Expand Up @@ -321,7 +321,7 @@ ul#browse-classes a,
ul#find-filters a,
ul#vgraph-classes a {
text-decoration: none;
color: #5E6363;
color: var(--text-color, #5E6363);
}
ul.ingestMenu {
margin-bottom: 1.5em;
Expand Down
8 changes: 4 additions & 4 deletions webapp/src/main/webapp/themes/tenderfoot/css/page-browse.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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;
color: var(--primary-color, #2ea0cf);
}
ul#browse-classes .count-classes {
font-size: 12px;
Expand All @@ -27,7 +27,7 @@ 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;
color: var(--primary-color, #2ea0cf);
}
ul#alpha-browse-individuals .count-classes,
ul#vgraph-classes .count-classes {
Expand Down Expand Up @@ -60,11 +60,11 @@ nav#alpha-browse-container {
#individuals-in-class li h1,
#property-group-menu ul,
article.property ul.property-list {
color: #5e6363;
color: var(--text-color, #5e6363);
font-size: 1em;
}
.pagination.menupage li a:hover {
background: #5e6363;
background: var(--text-color, #5e6363);
}
.pagination>li {
display: inline-block;
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/webapp/themes/tenderfoot/css/page-home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
border-top: 1px solid rgba(220,228,227,.42); /* stroke */
border-bottom: 1px solid rgba(220,228,227,.42); /* stroke */
/* background-color: #395d7f; /* layer fill content */
background-color: #338caf;
border-bottom: 2px solid #62b6d7;
background-color: var(--primary-color-darker, #395d7f);;
border-bottom: 2px solid var(--primary-color, #62b6d7);
color: #fff;
}
#home-stats {
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ article.property li h3 {

#individual-intro h1 {
font-size: 1.375em;
color: #2485ae;
color: var(--primary-color, #2485ae);
float: left;
}

Expand Down Expand Up @@ -131,7 +131,7 @@ a.edit-mainImage img.edit-individual {
margin-top: 15px;
}
#admin h3 {
background-color: #398AAC;
background-color: var(--primary-color, #398AAC);
color: #fff;
}

Expand Down
Loading
Loading