Project

General

Profile

« Previous | Next » 

Revision 56737

[Connect|Trunk]

Deposit:
theme/customization related issues (margins, titles)
update routes inside the components

Organizations: remove margins

Invite: theme/customization related issues (margins, titles)
get back drop down

Customization:
apply some css changes according to the above

View differences:

modules/uoa-connect-portal/trunk/src/app/htmlPages/organizations/organizationsPage.component.ts
8 8
@Component({
9 9
    selector: 'organizations',
10 10
    template: `
11
      <div class=" uk-section  uk-margin-large-top tm-middle uk-container" id="tm-main">
11
      <div class=" uk-section tm-middle uk-container uk-padding-remove-top uk-margin-top" id="tm-main">
12 12
        <div class="uk-container  uk-margin-bottom">
13 13
          <div class="uk-article-title custom-article-title uk-margin-bottom"> Organizations related to the community</div>
14 14
          <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
modules/uoa-connect-portal/trunk/src/app/utils/subscribe/invite/invite.component.html
1 1
<div *ngIf="longView == true">
2
  <div class=" uk-section  uk-margin-small-top tm-middle uk-container" id="tm-main">
2
  <div class="uk-section uk-padding-remove-top tm-middle uk-container" id="tm-main">
3 3

  
4 4
    <div class="uk-container  uk-margin-bottom">
5 5
      <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
......
154 154
<button *ngIf="!longView" [class]=" ((buttonSizeSmall)?'uk-button-small':'') + ' uk-button  uk-button-primary'">
155 155
  Invite users
156 156
</button>
157
<!--<div uk-dropdown="mode: click" class="uk-form uk-margin-small uk-alert uk-background-default" id="toggle-usage">
157
<div uk-dropdown="mode: click" class="uk-form uk-margin-small uk-alert uk-background-default" id="toggle-usage">
158 158
  <div class="uk-margin-top">
159 159
    <errorMessages [status]="[status]" [type]="'community'"></errorMessages>
160 160
  </div>
......
178 178
         required>
179 179
  <div class="uk-width-medium uk-text-muted uk-text-small">separate with commas</div>
180 180
  <div class="uk-margin-small-top uk-text-center ">
181
    <button class=" uk-button uk-button-primary uk-button-small " (click)="invite()">Invite</button>
181
    <button class=" uk-button portal-button ignoreCommunityPanelBackground uk-button-small " (click)="invite()">Invite</button>
182 182
    {{" "}}
183
    <a class=" uk-button uk-button-default uk-button-small " [queryParams]="communityIdParam"
183
    <a class=" uk-button uk-button-default uk-button-small ignoreCommunityPanelBackground " [queryParams]="communityIdParam"
184 184
       routerLinkActive="router-link-active" routerLink="/invite">
185 185
                      <span class="uk-margin-xsmall-left uk-icon">
186 186
                          <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="cog"
......
192 192
      Customize
193 193
    </a>
194 194
  </div>
195
</div>-->
195
</div>
modules/uoa-connect-portal/trunk/src/app/utils/customization/customization.component.ts
63 63
    document.documentElement.style.setProperty('--portal-dark-color', this.layout.secondaryColor);
64 64
    let css = `
65 65
            /*Panel background*/
66
.communityPanelBackground:not(bottom)  {   
67
    border-style: ` + (this.layout.panel.background.borderStyle != null ? this.layout.panel.background.borderStyle : 'solid') + `;
68
    border-color:` + (this.layout.panel.background.borderColor != null ? this.layout.panel.background.borderColor : 'transparent') + `;
69
    border-width: ` + (this.layout.panel.background.borderWidth != null ? this.layout.panel.background.borderWidth : '1px') + `;`+`
70
}
66 71
.communityPanelBackground, .communityPanelBackground .uk-section-primary {
67 72
    background-image: linear-gradient(` +
68 73
      (this.layout.panel.background.gradientDirection != null ? this.layout.panel.background.gradientDirection : 'to right') + `,` +
69 74
      this.layout.mainColor + `,` +
70
      this.layout.secondaryColor + `);` +
71
      `
72
    border-style: ` + (this.layout.panel.background.borderStyle != null ? this.layout.panel.background.borderStyle : 'solid') + `;
73
    border-color:` + (this.layout.panel.background.borderColor != null ? this.layout.panel.background.borderColor : 'transparent') + `;
74
    border-width: ` + (this.layout.panel.background.borderWidth != null ? this.layout.panel.background.borderWidth : '1px') + `;
75
      this.layout.secondaryColor + `);
75 76
}
76 77

  
77 78
/*Panel fonts*/
......
84 85
      `
85 86
}
86 87

  
87
.communityPanelBackground .uk-h5:not(.ignoreCommunityPanelBackground) {
88
.communityPanelBackground .uk-h6:not(.ignoreCommunityPanelBackground),.communityPanelBackground .uk-h5:not(.ignoreCommunityPanelBackground),.communityPanelBackground .uk-h4:not(.ignoreCommunityPanelBackground),.communityPanelBackground .uk-h3:not(.ignoreCommunityPanelBackground), .communityPanelBackground .uk-h2:not(.ignoreCommunityPanelBackground),.communityPanelBackground .uk-h1:not(.ignoreCommunityPanelBackground) {
88 89
    color: ` + (this.layout.panel.title.color != null ? this.layout.panel.title.color : 'white') + ` !important;` +
90

  
91
      `
92
}
93
.communityPanelBackground .uk-h5:not(.ignoreCommunityPanelBackground){
94
`+
89 95
      (this.layout.panel.title.family != null ? ('font-family: ' + this.layout.panel.title.family + ' !important;') : '') +
90 96
      (this.layout.panel.title.size != null ? ('font-size: ' + this.layout.panel.title.size + ' !important;') : '') +
91

  
92 97
      `
93 98
}
94 99

  
......
135 140
}
136 141

  
137 142

  
138
.uk-button:not(.uk-button-text), .portal-button {
143
.uk-button:not(.uk-button-text){
144
  border-radius:` + (this.layout.buttons.borderRadius != null ? this.layout.buttons.borderRadius : `4px`) + `;
145
}
146
.uk-button:not(.uk-button-text):not(.uk-button-default):not(.uk-button-primary), .portal-button {
139 147
    background-color:` + (this.layout.buttons.backgroundColor != null ? this.layout.buttons.backgroundColor : `var(--portal-main-color)`) + `;
140 148
    color: ` + (this.layout.buttons.color != null ? this.layout.buttons.color : `white`) + `;
141 149
    border-color: ` + (this.layout.buttons.borderColor != null ? this.layout.buttons.borderColor : `transparent`) + `;
142 150
    border-style: ` + (this.layout.buttons.borderStyle != null ? this.layout.buttons.borderStyle : `solid`) + `;
143 151
    border-width: ` + (this.layout.buttons.borderWidth != null ? this.layout.buttons.borderWidth : `1px`) + `;
144
    border-radius:` + (this.layout.buttons.borderRadius != null ? this.layout.buttons.borderRadius : `4px`) + `;
152
  
145 153

  
146 154
}
147 155

  
148
.uk-button:not(.uk-button-text):hover, .portal-button:hover {
156
.uk-button:not(.uk-button-text):not(.uk-button-default):not(.uk-button-primary):hover, .portal-button:hover {
149 157
    background-color: ` + (this.layout.buttons.onHover.backgroundColor != null ? this.layout.buttons.onHover.backgroundColor : `var(--portal-dark-color)`) + `;
150 158
    color: ` + (this.layout.buttons.onHover.color != null ? this.layout.buttons.onHover.color : `white`) + `;
151 159
    border-color: ` + (this.layout.buttons.onHover.color != null ? this.layout.buttons.onHover.color : `white`) + `;
modules/uoa-connect-portal/trunk/src/app/deposit/zenodo/shareInZenodo.component.html
2 2
      <div class="communityPanelBackground uk-margin-top uk-padding-small">
3 3
        <div class="uk-container uk-container-large uk-margin-top uk-margin-bottom">
4 4
          <ul class="uk-breadcrumb">
5
            <li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="/deposit">Deposit</a></li>
5
            <li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="/participate/deposit/learn-how">Deposit</a></li>
6 6
            <li><span class="active">Deposit in Zenodo</span></li>
7 7
          </ul>
8 8
        </div>
modules/uoa-connect-portal/trunk/src/assets/env-properties.json
56 56

  
57 57
  "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
58 58

  
59
  "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools",
59
  "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools",
60 60

  
61 61
  "adminToolsCommunity" :"connect",
62 62
  "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",

Also available in: Unified diff