Project

General

Profile

« Previous | Next » 

Revision 58648

[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).

View differences:

modules/uoa-connect-portal/trunk/src/app/subjects/subjects.component.ts
17 17
  template: `
18 18
    <schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
19 19

  
20
    <div style=" min-height: 650px;" class="communityBackground">
20
    <div style=" min-height: 650px;" class="">
21 21
      <div class="uk-section uk-padding-remove-top uk-padding-remove-bottom">
22 22
        <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
23 23
        <!--          <div *ngIf="communityId != null && communityId != ''" -->
modules/uoa-connect-portal/trunk/src/app/community/community.component.html
3 3
               [name]="community.title">
4 4
</schema2jsonld>
5 5

  
6
<div class="communityBackground">
6
<div class="">
7 7
<div id="stickhere">
8 8
</div>
9 9

  
......
185 185

  
186 186
</ng-template>
187 187

  
188
  <div *ngIf="communityInfo && community" class="publicationsSearchForm ">
188
  <div *ngIf="communityInfo && community" class="generalSearchForm ">
189 189
    <div class="uk-container uk-container-large">
190 190
      <div class="uk-margin-large-top">
191 191
        <h1 *ngIf="community.title" class="title uk-margin-remove">
modules/uoa-connect-portal/trunk/src/app/htmlPages/nationalBulletins/nationalBulletinsPage.component.ts
4 4
@Component({
5 5
  selector: 'national-bulletin',
6 6
  template: `
7
    <div class="communityBackground">
7
    <div class="">
8 8
      <div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
9 9
        <breadcrumbs  addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"  [breadcrumbs]="breadcrumbs"></breadcrumbs>
10 10
      </div>
modules/uoa-connect-portal/trunk/src/app/htmlPages/organizations/organizationsPage.component.ts
4 4
@Component({
5 5
    selector: 'organizations',
6 6
    template: `
7
      <div class="communityBackground uk-section tm-middle uk-padding-remove-top" id="tm-main">
7
      <div class="uk-section tm-middle uk-padding-remove-top" id="tm-main">
8 8
        <breadcrumbs [addClass]="'uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top'" [breadcrumbs]="breadcrumbs"></breadcrumbs>
9 9

  
10 10
        <div class="uk-container uk-container-large uk-margin-bottom">
modules/uoa-connect-portal/trunk/src/app/htmlPages/projects/projectsPage.component.ts
4 4
@Component({
5 5
  selector: 'projects',
6 6
  template: `
7
    <div class="communityBackground">
7
    <div class="">
8 8
      <div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
9 9
        <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
10 10
                     [breadcrumbs]="breadcrumbs"></breadcrumbs>
modules/uoa-connect-portal/trunk/src/app/utils/subscribe/invite/invite.component.html
1 1
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
2 2

  
3
<div *ngIf="longView == true" class="communityBackground">
3
<div *ngIf="longView == true" class="">
4 4
  <div class="uk-section uk-padding-remove-top tm-middle" id="tm-main">
5 5
    <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
6 6

  
modules/uoa-connect-portal/trunk/src/app/curators/curators.component.html
6 6
  <!--       tm-header-transparent="light">-->
7 7
  <!--    uk-flex uk-flex-middle-->
8 8
  <div style=" min-height: 650px;"
9
       class="communityBackground uk-section uk-padding-remove-top">
9
       class="uk-section uk-padding-remove-top">
10 10
    <div class="uk-align-center">
11 11
      <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
12 12
                   [breadcrumbs]="breadcrumbs"></breadcrumbs>
modules/uoa-connect-portal/trunk/src/app/deposit/zenodo/shareInZenodo.component.html
1 1
  <schema2jsonld *ngIf="url" [URL]="url" [name]="title" type="other"></schema2jsonld>
2 2
  <div class="uk-section uk-padding-remove-bottom uk-padding-remove-top">
3
      <div class="communityPanelBackground uk-margin-top uk-padding-small">
3
      <div class="communityPanelBackground uk-padding-small">
4 4
        <div class="uk-container uk-container-large uk-margin-top uk-margin-bottom">
5 5
         <!-- <ul class="uk-breadcrumb">
6 6
            <li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="{{depositLearnHowPage}}"
......
13 13
        </div>
14 14
      </div>
15 15
    </div>
16
  <div class="communityBackground">
16
  <div class="">
17 17
    <div class=" uk-section  uk-margin-small-top tm-middle uk-container uk-container-large " id="tm-main">
18 18
      <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
19 19
      <div class="uk-container uk-container-large uk-margin-bottom">
modules/uoa-connect-portal/trunk/src/app/login/user.component.ts
15 15
@Component({
16 16
  selector: 'openaire-user',
17 17
  template: `
18
<div id="tm-main" class="uk-section  uk-margin-small-top tm-middle">
19

  
20
  <user [mainComponent]=false></user>
21
  <div *ngIf="!server" class=" uk-container uk-container-small uk-position-relative">
22

  
23
    <div *ngIf="usercomponent.errorCode == '6' && !isSubscribed" class="uk-alert uk-alert-warning">
24
      <span *ngIf="!isSubscribed ">For this action you have to <span *ngIf="!loggedIn">login and</span> subscribe to the research community.
25
        <span *ngIf="subscribe && !subscribeLoading "> <span *ngIf="!loggedIn">Login and </span>Subscribe <a [class]="'' + (subscribe.loading ? ' uk-disabled' : '')"  (click)="subscribeTo()"  > here</a>.</span>
26
      </span>
27
      <span *ngIf="subscribeLoading ">Subscribing to community....</span>
28
      <span *ngIf="subscribeError ">An error occured while trying to subscribe to community....</span>
29

  
18
    <div id="tm-main" class="uk-section tm-middle">
19
      <div class="uk-margin-small-top">
20
        <user [mainComponent]=false></user>
21
        <div *ngIf="!server" class=" uk-container uk-container-small uk-position-relative">
22
    
23
          <div *ngIf="usercomponent.errorCode == '6' && !isSubscribed" class="uk-alert uk-alert-warning">
24
            <span *ngIf="!isSubscribed ">For this action you have to <span *ngIf="!loggedIn">login and</span> subscribe to the research community.
25
              <span *ngIf="subscribe && !subscribeLoading "> <span *ngIf="!loggedIn">Login and </span>Subscribe <a [class]="'' + (subscribe.loading ? ' uk-disabled' : '')"  (click)="subscribeTo()"  > here</a>.</span>
26
            </span>
27
            <span *ngIf="subscribeLoading ">Subscribing to community....</span>
28
            <span *ngIf="subscribeError ">An error occured while trying to subscribe to community....</span>
29
      
30
          </div>
31
          <div *ngIf="usercomponent.errorCode == '7'" class="uk-alert uk-alert-warning">
32
            This action requires authentication.
33
            <span  *ngIf="!loggedIn">
34
              Please  <a  class=""  (click)="login()"  > sign in</a> to continue.
35
             </span>
36
          </div>
37
        </div>
38
      </div>
30 39
    </div>
31
    <div *ngIf="usercomponent.errorCode == '7'" class="uk-alert uk-alert-warning">
32
      This action requires authentication.
33
      <span  *ngIf="!loggedIn">
34
        Please  <a  class=""  (click)="login()"  > sign in</a> to continue.
35
       </span>
36
    </div>
37

  
38

  
39
  </div>
40
</div>
41 40
    <subscribe  [communityId]="communityId" [showTemplate]= false class="" (subscribeEvent)="afterSubscibeEvent($event)"></subscribe>
42 41
    `
43 42
})
modules/uoa-connect-portal/trunk/src/app/content/contentPage.component.ts
4 4
@Component({
5 5
  selector: 'content',
6 6
  template: `
7
    <div class="communityBackground">
7
    <div class="">
8 8
      <div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
9 9
          <breadcrumbs  addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"  [breadcrumbs]="breadcrumbs"></breadcrumbs>
10 10
      </div>
modules/uoa-connect-portal/trunk/src/assets/connect-custom.css
246 246
    background-color: var(--portal-dark-color);
247 247
}
248 248

  
249
.communityApp .custom-main-content {
250
    background-color: #F7FCFF;
251
    /*background-color: lightpink;*/
252
    color: #000000 !important;
253
    font-size: 14px !important;
254
    min-height: 60vh;
255
}
256

  
257
.generalSearchForm .subtitle{
258
    color: #000000 !important;
259
    opacity: 0.6;
260
}
261

  
262
.generalSearchForm .title{
263
    color: #000000 !important;
264
    font-size: 28px;
265
    font-weight: 400;
266
    font-family: 'Open Sans', sans-serif !important;
267
}
268

  
249 269
/*END OF CONNECT REDESIGN*/
250 270

  
251 271
.communityApp .uk-logo{
modules/uoa-connect-portal/trunk/src/assets/customization.css
168 168
    border-color: var(--portal-dark-color);
169 169
}
170 170

  
171

  
172
/*CONNECT REDESIGN*/
173
.communityBackground {
174
    background-color: #F7FCFF;
175
    color: #000000 !important;
176
    font-size: 14px !important;
177
    min-height: 60vh;
178
    /*font-weight: 400!important;*/
179
}
180

  
181
.communityBackground .title{
182
    color: #000000 !important;
183
    font-size: 28px;
184
    font-weight: 400;
185
    font-family: 'Open Sans', sans-serif !important;
186
}
187

  
188
.communityBackground .subtitle{
189
    color: #000000 !important;
190
    opacity: 0.6;
191
    /*font-weight: 400!important;*/
192
}
193

  
194
/*CONNECT REDESIGN*/
195 171
.uk-text-muted {
196 172
    color: #666 !important;
197 173
}

Also available in: Unified diff