Skip to content

Commit d9faadd

Browse files
committed
cambios para que funcione 7.6.3 y cambios para acomodar estilos
1 parent 2952750 commit d9faadd

9 files changed

Lines changed: 39 additions & 11 deletions

File tree

src/app/cicba-menu.resolver.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
ScriptDataService
1818
} from './core/data/processes/script-data.service';
1919
import { MenuResolver } from './menu.resolver';
20+
import { AuthService } from './core/auth/auth.service';
2021

2122
/**
2223
* Creates all of the app's menus
@@ -35,8 +36,9 @@ export class CICBAMenuResolver extends MenuResolver {
3536
protected authorizationService: AuthorizationDataService,
3637
protected modalService: NgbModal,
3738
protected scriptDataService: ScriptDataService,
39+
protected authService: AuthService,
3840
) {
39-
super(menuService, browseService, authorizationService, modalService, scriptDataService);
41+
super(menuService, browseService, authorizationService, modalService, scriptDataService, authService);
4042
this.router = _router.url;
4143
}
4244

src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
border-top-right-radius: 0;
1515
background-color: var(--ds-navbar-dropdown-bg);
1616
}
17+
.text-nowrap {
18+
padding: .5rem;
19+
}
1720
}
1821

1922
.toggle-menu-icon {

src/app/shared/dso-selector/dso-selector/dso-selector.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
{{'dso-selector.no-results' | translate: { type: typesString } }}
2222
</button>
2323
<div class="d-flex justify-content-between mb-2" *ngFor="let listEntry of (listEntries$ | async)">
24-
<ds-listable-object-component-loader class="w-auto" [object]="listEntry" [viewMode]="viewMode"
24+
<ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
2525
[linkType]=linkTypes.None [context]="getContext(listEntry.indexableObject.id)"></ds-listable-object-component-loader>
2626
<div>
2727
<a class="btn coll-handle submit-button list-group-item list-group-item-action border-0 list-entry m-2" href="{{ listEntry.indexableObject.handle }}" target="_blank">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
:host {
2-
width: 100%;
2+
width: 64%;
33
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<div [ngClass]="{'open': !(isNavBarCollapsed | async)}">
1+
<div [ngClass]="{'open': !(isNavBarCollapsed$ | async)}">
22
<ds-themed-header></ds-themed-header>
33
</div>

src/themes/cicba/app/navbar/navbar.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ nav.navbar {
4242
}
4343
padding: 0;
4444
}
45-
height: 80px;
45+
height: auto;
4646
}
4747

4848
a.navbar-brand img {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="order-result-by" class="setting-option mb-3">
22
<span>{{label | translate}}</span>
3-
<select id="{{id}}" class="form-control" (change)="change.emit($event)">
3+
<select id="{{id}}" class="form-control" (change)="changed.emit($event)">
44
<ng-content></ng-content>
55
</select>
66
</div>

src/themes/cicba/styles/_global-styles.scss

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,29 @@ header {
1313
}
1414
}
1515

16+
.header {
17+
.ds-menu-item-wrapper {
18+
display: flex;
19+
flex-direction: column;
20+
justify-content: center;
21+
height: 100%;
22+
}
23+
24+
ds-link-menu-item .ds-menu-item,
25+
.ds-menu-toggler-wrapper {
26+
@media (min-width: 768px) {
27+
padding-right: .5rem;
28+
padding-left: .5rem;
29+
}
30+
31+
@media (max-width: 767px) {
32+
padding: .5rem 1rem;
33+
padding-right: 0;
34+
padding-left: 0;
35+
}
36+
}
37+
}
38+
1639
.jumbotron{
1740
input{
1841
border-radius: 10px;

src/themes/cicba/styles/_theme_sass_variable_overrides.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ $font-family-sans-serif: 'Roboto', -apple-system, BlinkMacSystemFont, "Segoe UI"
1010
$navbar-dark-color: #FFFFFF;
1111

1212
/* Reassign color vars to semantic color scheme */
13-
$blue: #43515f !default;
14-
$green: #92C642 !default;
15-
$cyan: #207698 !default;
16-
$yellow: #ec9433 !default;
17-
$red: #CF4444 !default;
13+
$primary: #43515f !default;
14+
$success: #92C642 !default;
15+
$info: #207698 !default;
16+
$warning: #ec9433 !default;
17+
$danger: #CF4444 !default;
1818
$dark: #43515f !default;
1919
$cic-blue: steelblue !default;
2020
$cic-skyblue: skyblue !default;

0 commit comments

Comments
 (0)