Project

General

Profile

« Previous | Next » 

Revision 58574

[Trunk | Connect]:
1. app-routing.module.ts: Add route '/subjects'.
2. app.component.ts: Group subscribe and invite buttons under id="subscribeAndInviteBtn" (keep distance between them alwayes the same) | uncomment menu item 'Subjects' in About.
3. app.module.ts: import 'SubscribeService' (singleton service to update everywhere subscriber status).
4. libUser.module.ts & subscribe.module.ts: remove import of 'SubscribeService' (singleton service to update everywhere subscriber status).
5. community.component.html:
a. Improve some checks
b. In main tabs of the page (class main-tabs) add class 'uk-text-truncate' and remove class 'uk-width-3-4' (each tab has max-width)
c. Add icon in 'Analytics' tab
d. [Bug fix] In description, fix overflow and max height of box
6. community.component.ts: Add field '@ViewChild(SubscribeComponent) subscribeComponent: SubscribeComponent' to add some checks in html.
7. curators.component.html: Remove div with class 'image-front-topbar' | Update css for title | Add <breadcrumbs> | Add user icon for each curator.
8. curators.component.ts: Initialize breadcrumb | [Bug fix] In methods 'getPageContents()' and 'getDivContents()' use communityId (instead of 'connect').
9. curators.module.ts & organizationsPage.module.ts & inviteBasic.module.ts: import 'BreadcrumbsModule'.
10. organizationsPage.component.ts: Update css for title | Add <breadcrumbs> | Initialize breadcrumb.
11. subjects.component.ts, subjects.module.ts, subjects-routing.module.ts: Add page for Subjects.
12. invite.component.html: Add <breadcrumbs> in longView | Add icon in button 'Invite users'.
13. invite.component.ts: Initialize breadcrumb.
14. subscribe.component.ts:
a. Add icon in button "Subscribe"/ "Subscribed"
b. Add class 'uk-display-inline-block' in showNumbers (members)
c. Initialize and get subscriber status with new methods of service (initIsSubscribedToCommunity() & isSubscribed - BehaviorSubject instead of isSubscribedToCommunity())
15. connect-custom.css: Group css for #subscribeBtn, #inviteBtn into #subscribeAndInviteBtn | Add css for class 'user-circle-background' (background of user icon in curators).

View differences:

connect-custom.css
238 238

  
239 239
/*CONNECT REDESIGN*/
240 240

  
241
#subscribeBtn, #inviteBtn {
241
#subscribeAndInviteBtn {
242
/*#subscribeBtn, #inviteBtn {*/
242 243
    float: left;
243 244
    position: fixed;
244 245
    right: 0;
245 246
    z-index: 100;
246 247
    display: block;
247
    width: 110px;
248
    top: calc(30% - 47px);
248 249
}
249 250

  
250
#subscribeBtn {
251
    top: calc(35% - 47px);
252
}
253

  
254
#inviteBtn {
255
    top: calc(40% - 47px);
256
}
257

  
258
#subscribeBtn > * > button, #inviteBtn > * > button {
251
#subscribeAndInviteBtn button {
252
    width: 125px;
253
    height: 35px;
259 254
    border-right: none;
260 255
    /*border-top-right-radius: 0;*/
261 256
    /*border-bottom-right-radius: 0;*/
262 257
    border-radius: 4px 0px 0px 4px;
263 258
    box-shadow: 0px 2px 6px #00000038;
264
    /*background-color: var(--portal-main-color);*/
265 259
}
266 260

  
267
/*#subscribeBtn > * > button:hover, #inviteBtn > * > button:hover {*/
268
/*    background-color: white;*/
269
/*}*/
270

  
271 261
.subscribed-button {
272 262
    background-color: #8AD15E !important;
273 263
    color: white !important;
......
287 277
    z-index: 10000;
288 278
}
289 279

  
280
.user-circle-background {
281
    background-color: var(--portal-main-color);
282
    border-radius: 50%;
283
    height: 10px;
284
    width: 10px;
285
    display: inline-flex;
286
    padding: 2px;
287
    fill: white;
288
}
289

  
290
a:hover .user-circle-background {
291
    background-color: var(--portal-dark-color);
292
}
293

  
290 294
/*END OF CONNECT REDESIGN*/
291 295

  
292 296
.communityApp .uk-logo{

Also available in: Unified diff