hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into submission

Browse Source 
# Conflicts:
#	resources/i18n/en.json
#	src/app/app.component.scss
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/shared/chips/chips.component.spec.ts
#	src/app/shared/chips/models/chips-item.model.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
#	src/app/shared/shared.module.ts
#	yarn.lock
This commit is contained in:
Giuseppe Digilio
2018-12-20 17:02:46 +01:00
parent 5068f160de 2055f3216d
commit eda0ebb21c
139 changed files with 5385 additions and 1975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/app.component.scss
View File

@@ -1,7 +1,7 @@
@import '../styles/variables.scss';
@import '../styles/helpers/font_awesome_imports.scss';
@import '../../node_modules/bootstrap/scss/bootstrap.scss';
@import '../../node_modules/nouislider/distribute/nouislider.min.css';
@import "../../node_modules/font-awesome/scss/font-awesome.scss";
@import '../../node_modules/nouislider/distribute/nouislider.min';
html {
position: relative;
@@ -11,8 +11,8 @@ html {
body {
overflow-x: hidden;
}
// Sticky Footer
// Sticky Footer
.outer-wrapper {
display: flex;
margin: 0;
@@ -25,14 +25,27 @@ body {
min-height: 100vh;
flex-direction: column;
width: 100%;
position: relative;
}
.main-content {
z-index: $main-z-index;
flex: 1 1 100%;
margin-top: $content-spacing;
margin-bottom: $content-spacing;
}
.alert.hide {
padding: 0;
margin: 0;
}
ds-header-navbar-wrapper {
z-index: $nav-z-index;
}
ds-admin-sidebar {
position: fixed;
z-index: $sidebar-z-index;
}