MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 13 Wiki Activity

[Trunk | Connect]: 

1. community.component.html: Remove 'communityBackground' class | Use class 'generalSearchForm' instead of 'publicationsSearchForm'.
2. contentPage.component.ts & curators.component.html & nationalBulletinsPage.component.ts & organizationsPage.component.ts & projectsPage.component.ts & subjects.component.ts & invite.component.html: 
	Remove 'communityBackground' class. 
3. shareInZenodo.component.html: Remove 'communityBackground' class | Remove 'uk-margin-top' from tag with class 'communityPanelBackground'.
4. user.component.ts: Remove 'communityBackground' class | Move 'uk-margin-small-top' after section tag.
5. connect-custom.css: Add background css for '.communityApp .custom-main-content', '.generalSearchForm .subtitle' and '.generalSearchForm .title'.
6. customization.css: Remove css for '.communityBackground' (was added during connect redesign).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@58648 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2020-05-07 17:09:08 +00:00
parent e7efb64ae9
commit 38216318f2
12 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/community/community.component.html
View File

@ -3,7 +3,7 @@
[name]="community.title">
</schema2jsonld>
<div class="communityBackground">
<div class="">
<div id="stickhere">
</div>
@ -185,7 +185,7 @@
</ng-template>
<div *ngIf="communityInfo && community" class="publicationsSearchForm ">
<div *ngIf="communityInfo && community" class="generalSearchForm ">
<div class="uk-container uk-container-large">
<div class="uk-margin-large-top">
<h1 *ngIf="community.title" class="title uk-margin-remove">

2
src/app/content/contentPage.component.ts
View File

@ -4,7 +4,7 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
@Component({
selector: 'content',
template: `
<div class="communityBackground">
<div class="">
<div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>

2
src/app/curators/curators.component.html
View File

@ -6,7 +6,7 @@
<!-- tm-header-transparent="light">-->
<!-- uk-flex uk-flex-middle-->
<div style=" min-height: 650px;"
class="communityBackground uk-section uk-padding-remove-top">
class="uk-section uk-padding-remove-top">
<div class="uk-align-center">
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
[breadcrumbs]="breadcrumbs"></breadcrumbs>

4
src/app/deposit/zenodo/shareInZenodo.component.html
View File

@ -1,6 +1,6 @@
<schema2jsonld *ngIf="url" [URL]="url" [name]="title" type="other"></schema2jsonld>
<div class="uk-section uk-padding-remove-bottom uk-padding-remove-top">
<div class="communityPanelBackground uk-margin-top uk-padding-small">
<div class="communityPanelBackground uk-padding-small">
<div class="uk-container uk-container-large uk-margin-top uk-margin-bottom">
<!-- <ul class="uk-breadcrumb">
<li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="{{depositLearnHowPage}}"
@ -13,7 +13,7 @@
</div>
</div>
</div>
<div class="communityBackground">
<div class="">
<div class=" uk-section uk-margin-small-top tm-middle uk-container uk-container-large " id="tm-main">
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
<div class="uk-container uk-container-large uk-margin-bottom">

2
src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts
View File

@ -4,7 +4,7 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co
@Component({
selector: 'national-bulletin',
template: `
<div class="communityBackground">
<div class="">
<div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>

2
src/app/htmlPages/organizations/organizationsPage.component.ts
View File

@ -4,7 +4,7 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co
@Component({
selector: 'organizations',
template: `
<div class="communityBackground uk-section tm-middle uk-padding-remove-top" id="tm-main">
<div class="uk-section tm-middle uk-padding-remove-top" id="tm-main">
<breadcrumbs [addClass]="'uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top'" [breadcrumbs]="breadcrumbs"></breadcrumbs>
<div class="uk-container uk-container-large uk-margin-bottom">

2
src/app/htmlPages/projects/projectsPage.component.ts
View File

@ -4,7 +4,7 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co
@Component({
selector: 'projects',
template: `
<div class="communityBackground">
<div class="">
<div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
[breadcrumbs]="breadcrumbs"></breadcrumbs>

43
src/app/login/user.component.ts
View File

@ -15,29 +15,28 @@ import {ConnectHelper} from '../openaireLibrary/connect/connectHelper';
@Component({
selector: 'openaire-user',
template: `
<div id="tm-main" class="uk-section uk-margin-small-top tm-middle">
<user [mainComponent]=false></user>
<div *ngIf="!server" class=" uk-container uk-container-small uk-position-relative">
<div *ngIf="usercomponent.errorCode == '6' && !isSubscribed" class="uk-alert uk-alert-warning">
<span *ngIf="!isSubscribed ">For this action you have to <span *ngIf="!loggedIn">login and</span> subscribe to the research community.
<span *ngIf="subscribe && !subscribeLoading "> <span *ngIf="!loggedIn">Login and </span>Subscribe <a [class]="'' + (subscribe.loading ? ' uk-disabled' : '')" (click)="subscribeTo()" > here</a>.</span>
</span>
<span *ngIf="subscribeLoading ">Subscribing to community....</span>
<span *ngIf="subscribeError ">An error occured while trying to subscribe to community....</span>
<div id="tm-main" class="uk-section tm-middle">
<div class="uk-margin-small-top">
<user [mainComponent]=false></user>
<div *ngIf="!server" class=" uk-container uk-container-small uk-position-relative">
<div *ngIf="usercomponent.errorCode == '6' && !isSubscribed" class="uk-alert uk-alert-warning">
<span *ngIf="!isSubscribed ">For this action you have to <span *ngIf="!loggedIn">login and</span> subscribe to the research community.
<span *ngIf="subscribe && !subscribeLoading "> <span *ngIf="!loggedIn">Login and </span>Subscribe <a [class]="'' + (subscribe.loading ? ' uk-disabled' : '')" (click)="subscribeTo()" > here</a>.</span>
</span>
<span *ngIf="subscribeLoading ">Subscribing to community....</span>
<span *ngIf="subscribeError ">An error occured while trying to subscribe to community....</span>
</div>
<div *ngIf="usercomponent.errorCode == '7'" class="uk-alert uk-alert-warning">
This action requires authentication.
<span *ngIf="!loggedIn">
Please <a class="" (click)="login()" > sign in</a> to continue.
</span>
</div>
</div>
</div>
</div>
<div *ngIf="usercomponent.errorCode == '7'" class="uk-alert uk-alert-warning">
This action requires authentication.
<span *ngIf="!loggedIn">
Please <a class="" (click)="login()" > sign in</a> to continue.
</span>
</div>
</div>
</div>
<subscribe [communityId]="communityId" [showTemplate]= false class="" (subscribeEvent)="afterSubscibeEvent($event)"></subscribe>
`
})

2
src/app/subjects/subjects.component.ts
View File

@ -17,7 +17,7 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
template: `
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
<div style=" min-height: 650px;" class="communityBackground">
<div style=" min-height: 650px;" class="">
<div class="uk-section uk-padding-remove-top uk-padding-remove-bottom">
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
<!-- <div *ngIf="communityId != null && communityId != ''" -->

2
src/app/utils/subscribe/invite/invite.component.html
View File

@ -1,6 +1,6 @@
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
<div *ngIf="longView == true" class="communityBackground">
<div *ngIf="longView == true" class="">
<div class="uk-section uk-padding-remove-top tm-middle" id="tm-main">
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>

20
src/assets/connect-custom.css
View File

@ -246,6 +246,26 @@ a:hover .user-circle-background {
background-color: var(--portal-dark-color);
}
.communityApp .custom-main-content {
background-color: #F7FCFF;
/*background-color: lightpink;*/
color: #000000 !important;
font-size: 14px !important;
min-height: 60vh;
}
.generalSearchForm .subtitle{
color: #000000 !important;
opacity: 0.6;
}
.generalSearchForm .title{
color: #000000 !important;
font-size: 28px;
font-weight: 400;
font-family: 'Open Sans', sans-serif !important;
}
/*END OF CONNECT REDESIGN*/
.communityApp .uk-logo{

24
src/assets/customization.css
View File

@ -168,30 +168,6 @@ a:not(.uk-button):hover,
border-color: var(--portal-dark-color);
}
/*CONNECT REDESIGN*/
.communityBackground {
background-color: #F7FCFF;
color: #000000 !important;
font-size: 14px !important;
min-height: 60vh;
/*font-weight: 400!important;*/
}
.communityBackground .title{
color: #000000 !important;
font-size: 28px;
font-weight: 400;
font-family: 'Open Sans', sans-serif !important;
}
.communityBackground .subtitle{
color: #000000 !important;
opacity: 0.6;
/*font-weight: 400!important;*/
}
/*CONNECT REDESIGN*/
.uk-text-muted {
color: #666 !important;
}