Project

General

Profile

« Previous | Next » 

Revision 58062

[Monitor Dashboard | Trunk]: Change css for sidebar height

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.component.html
6 6
         alt="BETA">
7 7

  
8 8
    <nav class="uk-navbar uk-light">
9
      <div *ngIf="!open || !hasSidebar "  class="uk-navbar-left  uk-margin-small-left">
9
      <!--<div *ngIf="!open || !hasSidebar "  class="uk-navbar-left  uk-margin-small-left">
10 10
        <div  class="uk-light uk-margin-small-top">
11 11
          <div *ngIf="stakeHolder" class="uk-text-bold uk-h4 uk-margin-remove-bottom" >{{stakeHolder.index_name}}</div>
12 12
          <div class="uk-h5 uk-margin-remove">{{(stakeHolder?'Admin Dashboard':'Monitor Dashboard')}}</div>
13 13

  
14 14
        </div>
15
      </div>
15
      </div>-->
16 16
      <div class="uk-navbar-right">
17 17
        <ul class="uk-navbar-nav user_actions">
18 18
          <li>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/monitor/monitor.component.html
42 42
  <div class="sidebar_main_swipe  header_full" [class.sidebar_main_active]="open">
43 43
    <div id="header_main">
44 44
      <nav class="uk-light uk-navbar">
45
        <div class="main_logo_top">
45
        <!--<div class="main_logo_top">
46 46
          <div *ngIf="stakeholder && stakeholder.index_name" class=" uk-margin-small-top">
47 47
            <div class="uk-text-bold uk-h4 uk-margin-remove-bottom">{{stakeholder.index_name}}</div>
48 48
            <div class="uk-h5 uk-margin-remove">Monitor Dashboard</div>
49 49
          </div>
50
        </div>
50
        </div>-->
51 51
        <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-center">
52 52
          <ul class="uk-navbar-nav">
53 53
            <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
......
87 87
            </div>
88 88
          </div>
89 89
        </div>
90
        <div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom"
90
        <div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom uk-margin-top"
91 91
             uk-height-match="target: div.md-card">
92 92
          <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
93 93
            <h4 class="uk-width-1-1">{{number.title}}</h4>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/stakeholder/stakeholder.component.html
3 3
    <img    class="badge"
4 4
         src="assets/theme-assets/prototype_flag.svg"
5 5
         alt="BETA">
6
    <div class="uk-padding-small">
7
      <img class="uk-margin-bottom" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">
8
      <h4 class="uk-text-bold uk-margin-remove">{{stakeholder.index_name}}</h4>
9
      <span class="uk-text-large">Admin Dashboard</span>
10
    </div>
6
    <img class="logo" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">
11 7
  </div>
12 8
  <div *ngIf="stakeholder" class="menu_section">
13 9
    <ul>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/topic/topic.component.html
3 3
    <img    class="badge"
4 4
            src="assets/theme-assets/prototype_flag.svg"
5 5
            alt="BETA">
6
    <div class="uk-padding-small">
7
      <img class="uk-margin-bottom" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">
8
      <h4 class="uk-text-bold uk-margin-remove">{{stakeholder.index_name}}</h4>
9
      <span class="uk-text-large">Admin Dashboard</span>
10
    </div>
6
    <img class="logo" *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl">
11 7
  </div>
12 8
  <div *ngIf="stakeholder" class="menu_section">
13 9
    <ul>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/assets/theme-assets/dashboard-custom.css
41 41
}
42 42

  
43 43
.dashboard #sidebar_main .sidebar_main_header {
44
  height: auto;
45
  min-height: var(--header-height);
44
  height: var(--header-height);
45
  border-bottom: none;
46 46
}
47 47

  
48
.dashboard #sidebar_main .sidebar_main_header .logo {
49
  height: calc(var(--header-height) - 20px);
50
  margin-left: 25px;
51
  margin-top: 10px;
52
  margin-bottom: 10px;
53
}
54

  
48 55
.dashboard #sidebar_main .menu_section {
49 56
  overflow: auto;
50 57
  flex: 1;
......
190 197
}
191 198

  
192 199
.dashboard #header_main {
200
  -webkit-box-shadow: none;
201
  box-shadow: none;
193 202
  height: var(--header-height);
194 203
}
195 204

  
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/assets/monitor-custom.css
37 37
    transform: rotate(90deg);
38 38
}
39 39

  
40
/*monitor #header_main{*/
41
/*    height: var(--monitor-header-height);*/
42
/*}*/
43

  
44
/*.dashboard monitor  .header_full #sidebar_main {*/
45
/*    top: var(--monitor-header-height);*/
46

  
47
/*}*/
48

  
49 40
.double-header #header_menu a {
50 41
    user-select: none;
51 42
    -webkit-user-select: none;
52 43
    -moz-user-select: none;
53 44
}
54 45

  
55
.double-header  #header_main .uk-navbar-nav > li > a {
56
    font-size: 20px;
57
    font-family: 'Open Sans';
46
.dashboard .double-header  #header_main .uk-navbar-nav > li > a {
47
    font-size: 16px;
48
    font-family: "Open Sans", serif;
58 49
}
59 50

  
60
/*.double-header .uk-navbar-nav > li.uk-active > a {*/
61
/*    font-weight: bold;*/
62
/*}*/
63
/*.double-header #header_main .uk-navbar-nav > li.uk-active a span {*/
64
/*    -webkit-box-shadow: inset 0 -2px 0 #FFFFFF;*/
65
/*    box-shadow: inset 0 -2px 0 #FFFFFF;*/
66
/*}*/
67

  
68 51
.double-header #header_main .uk-navbar-nav > li.uk-active {
69 52
    position: relative;
70 53
    display: inline;
71 54
    transition:  position 0s linear 0.2s;
72 55
}
73 56

  
74
/*.double-header #header_main .uk-navbar-nav > li a:after {*/
75
/*    border-color: transparent ;*/
76
/*    border-width: 0px;*/
77
/*}*/
78 57
.double-header #header_main .uk-navbar-nav > li.uk-active a {
79 58
    font-weight: bold;
80 59
}
......
128 107
    margin-top: calc(var(--header-height) + 24px);
129 108
}
130 109

  
131
.stakeholderPage  #sidebar_main .menu_section > ul li > a {
132
    font-size: 18px;
133
}
134

  
135 110
.double-header .uk-logo img{
136
    max-height: 80px;
111
    max-height: calc(var(--header-height) - 20px);
137 112
}
138 113

  
139 114
.stakeholderPage #style_switcher {

Also available in: Unified diff