MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 9 Wiki Activity

[Trunk|Admin]: Fix layout after theme update. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@56698 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-07-23 09:34:34 +00:00
parent 0b0baece09
commit 6dfcb881ec
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/app.component.html
View File

@ -2,16 +2,16 @@
[homeurl] = false [userMenuItems]=userMenuItems [menuItems]=menuItems [properties]=properties [homeurl] = false [userMenuItems]=userMenuItems [menuItems]=menuItems [properties]=properties
[community]=community class="adminMenu"></navbar> [community]=community class="adminMenu"></navbar>
<div id="wrapper" class="uk-section uk-margin-top uk-padding-remove-bottom"> <div id="wrapper" >
<div class="uk-grid-collapse" uk-height-viewport="expand: true" uk-grid> <div class="uk-grid-collapse" uk-height-viewport="expand: true" uk-grid>
<sidebar *ngIf="showSidebar" [menuItems]="sideMenuItems" class="uk-width-1-5 uk-light sidebar uk-margin-top"></sidebar> <sidebar *ngIf="showSidebar" [menuItems]="sideMenuItems" class="uk-width-1-5 uk-light sidebar uk-padding uk-padding-remove-horizontal uk-padding-remove-bottom"></sidebar>
<div class="uk-width-expand uk-margin-top uk-overflow-auto" [ngClass]="(!wellcome)?'uk-container uk-container-large uk-padding':''" <div class="uk-width-expand uk-overflow-auto uk-padding uk-padding-remove-bottom" [ngClass]="(!wellcome)?'uk-container uk-container-large':'uk-padding-remove-horizontal'"
[ngStyle]="{height: (!wellcome)?'85vh':'90vh'}"> [ngStyle]="{height: (!wellcome)?'85vh':'90vh'}">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
<!-- <!--
<feedback *ngIf= "properties" portalName="Admin" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback> <feedback *ngIf= "properties" portalName="Admin" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback>
--> -->
</div> </div>
</div> </div>
<!--cookie-law *ngIf= "isClient" position="bottom"> <!--cookie-law *ngIf= "isClient" position="bottom">
@ -22,3 +22,4 @@
</span></a> </span></a>
</cookie-law--> </cookie-law-->
<!-- <bottom *ngIf= "isClient"></bottom> --> <!-- <bottom *ngIf= "isClient"></bottom> -->

9
src/assets/css/connect-custom.css
View File

@ -87,15 +87,6 @@
color: rgb(255,255,255); color: rgb(255,255,255);
} }
.sidebar .uk-nav>li>.uk-link{
text-decoration: underline;
}
.sidebar .uk-nav-sub>li>.uk-link{
text-decoration: underline;
color: rgb(255,255,255);
}
.uk-button:disabled, .uk-button:disabled:hover { .uk-button:disabled, .uk-button:disabled:hover {
background-color: #f7f7fa; background-color: #f7f7fa;
color: #cbcbcb; color: #cbcbcb;

2
src/assets/env-properties.json
View File

@ -53,7 +53,7 @@
"cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=", "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
"adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/", "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools/",
"adminToolsCommunity" :"openaire", "adminToolsCommunity" :"openaire",
"communityAPI": "https://dev-openaire.d4science.org/openaire/community/", "communityAPI": "https://dev-openaire.d4science.org/openaire/community/",

2
src/index.html
View File

@ -33,7 +33,7 @@
<link rel="stylesheet" type="text/css" href="assets/common-assets/common/theme.css" /> <link rel="stylesheet" type="text/css" href="assets/common-assets/common/theme.css" />
<link rel="stylesheet" type="text/css" href="assets/common-assets/common/custom.css" /> <link rel="stylesheet" type="text/css" href="assets/common-assets/common/custom.css" />
<link rel="stylesheet" type="text/css" href="assets/common-assets/library.css?v=3" /> <link rel="stylesheet" type="text/css" href="assets/common-assets/library.css?v=3" />
<link rel="stylesheet" type="text/css" href="assets/css/connect-custom.css?v=3" /> <link rel="stylesheet" type="text/css" href="assets/css/connect-custom.css?v=4" />