finished webpack config for switching themes

This commit is contained in:
lotte
2019-04-19 16:44:57 +02:00
committed by Art Lowel
parent 22928c3f23
commit 8a32777802
111 changed files with 249 additions and 455 deletions

View File

@@ -122,6 +122,7 @@
"reflect-metadata": "0.1.12",
"rxjs": "6.2.2",
"rxjs-spy": "^7.5.1",
"sass-resources-loader": "^2.0.0",
"sortablejs": "1.7.0",
"text-mask-core": "5.0.1",
"ts-loader": "^5.2.1",

View File

@@ -1,5 +1,3 @@
@import '../../../../styles/variables.scss';
.selectable-row:hover {
cursor: pointer;
}

View File

@@ -1,5 +1,3 @@
@import '../../../../styles/variables.scss';
.selectable-row:hover {
cursor: pointer;
}

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables.scss';

View File

@@ -1,5 +1,3 @@
@import '../../../styles/variables.scss';
@import '../../../styles/mixins.scss';
$icon-z-index: 10;
:host {

View File

@@ -1,5 +1,3 @@
@import '../../../../styles/variables.scss';
::ng-deep {
.fa-chevron-right {
padding-left: $spacer/2;

View File

@@ -1 +0,0 @@
@import '../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1,16 +0,0 @@
@import '../../../styles/variables.scss';
:host {
display: block;
margin-top: -$content-spacing;
margin-bottom: -$content-spacing;
}
.display-3 {
word-break: break-word;
}
.dspace-logo {
height: 110px;
width: 110px;
}

View File

@@ -1,2 +1,14 @@
@import './home-news.component.default';
@import './themes/*.scss';
:host {
display: block;
margin-top: -$content-spacing;
margin-bottom: -$content-spacing;
}
.display-3 {
word-break: break-word;
}
.dspace-logo {
height: 110px;
width: 110px;
}

View File

@@ -2,8 +2,7 @@ import { Component } from '@angular/core';
@Component({
selector: 'ds-home-news',
styleUrls: ['./home-news.component.scss'],
// templateUrl: './home-news.component.html',
styleUrls: ['./$themePath$/home-news.component.$theme$.scss'],
templateUrl: './$themePath$/home-news.component.$theme$.html'
})

View File

@@ -1,58 +1,4 @@
@import '../../../../styles/variables.scss';
:host-context(.preview-release) {
div.background-image {
color: white;
background-color: #2e80a3;
position: relative;
background-position-y: -200px;
background-image: url('/assets/images/banner.jpg');
background-size: cover;
@media screen and (max-width: map-get($grid-breakpoints, lg)) {
background-position-y: 0;
}
.container {
position: relative;
text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
&:before, &:after {
content: '';
display: block;
width: $banner-background-gradient-width;
height: 100%;
top: 0;
position: absolute;
}
&:before {
background: linear-gradient(to left, $banner-text-background, transparent);
left: -$banner-background-gradient-width;
}
&:after {
background: linear-gradient(to right, $banner-text-background, transparent);
right: -$banner-background-gradient-width;
}
background-color: $banner-text-background;
@import '../home-news.component.scss';
.jumbotron {
background-color: transparent;
}
}
small.credits {
a {
color: inherit;
}
opacity: 0.3;
position: absolute;
right: 5px;
bottom: 0;
}
}
}

View File

@@ -1,3 +0,0 @@
:host {
//color: red;
}

View File

@@ -1,2 +1,2 @@
@import './home-page.component.default';
@import './themes/*.scss';
:host {
}

View File

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
@Component({
selector: 'ds-home-page',
styleUrls: ['./home-page.component.scss'],
styleUrls: ['./$themePath$/home-page.component.$theme$.scss'],
templateUrl: './$themePath$/home-page.component.$theme$.html'
})
export class HomePageComponent {

View File

@@ -1,6 +1,3 @@
@import '../../../styles/variables.scss';
:host-context(.mantis) {
div.background-image {
color: white;
background-color: $info;
@@ -15,6 +12,7 @@
.container {
position: relative;
text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
&:before, &:after {
content: '';
display: block;
@@ -34,6 +32,7 @@
background: linear-gradient(to right, $banner-text-background, transparent);
right: -$banner-background-gradient-width;
}
background-color: $banner-text-background;
}
@@ -42,11 +41,10 @@
a {
color: inherit;
}
opacity: 0.3;
position: absolute;
right: $spacer;
bottom: 0;
}
}
}

View File

@@ -1,5 +1,3 @@
@import '../../../styles/variables.scss';
.btn {
min-width: $edit-item-button-min-width;
}

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables.scss';

View File

@@ -1,4 +1,3 @@
@import '../../../../../styles/variables.scss';
.btn[disabled] {
color: $gray-600;
border-color: $gray-600;

View File

@@ -1,5 +1,3 @@
@import '../../../../styles/variables.scss';
.button-row {
.btn {
margin-right: 0.5 * $spacer;

View File

@@ -1,5 +1,3 @@
@import '../../../../styles/variables.scss';
:host {
.simple-view-element {
margin-bottom: 15px;

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables.scss';

View File

@@ -1,5 +1,3 @@
@import '../../../../../styles/variables';
@import '../../../../../styles/mixins';
@media screen and (min-width: map-get($grid-breakpoints, md)) {
dt {
text-align: right;

View File

@@ -1,5 +1,3 @@
@import '../../../styles/variables.scss';
:host {
div.simple-view-link {
text-align: center;

View File

@@ -1,5 +1,3 @@
@import '../../styles/variables.scss';
.login-logo {
height: $login-logo-height;
width: $login-logo-width;

View File

@@ -1,5 +1,3 @@
@import '../../../../../styles/variables.scss';
@import '../../../../../styles/mixins.scss';
.filters {
.toggle-more-filters a {

View File

@@ -1,5 +1,3 @@
@import '../../../../../../styles/variables.scss';
a {
color: $body-color;
&:hover, &focus {

View File

@@ -1,5 +1,3 @@
@import '../../../../../../styles/variables.scss';
a {
color: $link-color;
&:hover {

View File

@@ -1,5 +1,3 @@
@import '../../../../../../styles/variables.scss';
a {
color: $body-color;
&:hover, &focus {

View File

@@ -1,13 +0,0 @@
@import '../../../../styles/variables.scss';
@import '../../../../styles/mixins.scss';
:host .facet-filter {
border: 1px solid map-get($theme-colors, light);
cursor: pointer;
.search-filter-wrapper.closed {
overflow: hidden;
}
.filter-toggle {
line-height: $line-height-base;
}
}

View File

@@ -1,2 +1,10 @@
@import './search-filter.component.default';
@import './themes/*.scss';
:host .facet-filter {
border: 1px solid map-get($theme-colors, light);
cursor: pointer;
.search-filter-wrapper.closed {
overflow: hidden;
}
.filter-toggle {
line-height: $line-height-base;
}
}

View File

@@ -13,8 +13,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.c
@Component({
selector: 'ds-search-filter',
styleUrls: ['./search-filter.component.scss'],
// templateUrl: './search-filter.component.html',
styleUrls: ['./$themePath$/search-filter.component.$theme$.scss'],
templateUrl: './$themePath$/search-filter.component.$theme$.html',
animations: [slide],
})

View File

@@ -1,6 +1,3 @@
@import '../../../../../styles/variables.scss';
@import '../../../../../styles/mixins.scss';
.filters {
.toggle-more-filters a {
color: $link-color;

View File

@@ -1,31 +0,0 @@
@import '../../../../../styles/variables.scss';
@import '../../../../../styles/mixins.scss';
.filters {
.toggle-more-filters a {
color: $link-color;
text-decoration: underline;
cursor: pointer;
}
}
$slider-handle-width: 18px;
::ng-deep
{
html:not([dir=rtl]) .noUi-horizontal .noUi-handle {
right: -$slider-handle-width/2;
}
.noUi-horizontal .noUi-handle {
width: $slider-handle-width;
&:before {
left: ($slider-handle-width - 2)/2 - 2;
}
&:after {
left: ($slider-handle-width - 2)/2 + 2;
}
&:focus {
outline: none;
}
}
}

View File

@@ -1,2 +1,27 @@
@import './search-range-filter.component.default';
@import './themes/*.scss';
.filters {
.toggle-more-filters a {
color: $link-color;
text-decoration: underline;
cursor: pointer;
}
}
$slider-handle-width: 18px;
::ng-deep
{
html:not([dir=rtl]) .noUi-horizontal .noUi-handle {
right: -$slider-handle-width/2;
}
.noUi-horizontal .noUi-handle {
width: $slider-handle-width;
&:before {
left: ($slider-handle-width - 2)/2 - 2;
}
&:after {
left: ($slider-handle-width - 2)/2 + 2;
}
&:focus {
outline: none;
}
}
}

View File

@@ -41,7 +41,7 @@ const dateFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD'];
*/
@Component({
selector: 'ds-search-range-filter',
styleUrls: ['./search-range-filter.component.scss'],
styleUrls: ['./$themePath$/search-range-filter.component.$theme$.scss'],
templateUrl: './search-range-filter.component.html',
animations: [facetLoad]
})

View File

@@ -1,7 +1,5 @@
@import '../../../../../../styles/variables.scss';
@import '../search-range-filter.component';
:host-context(.mantis) {
::ng-deep .noUi-connect {
background: $info;
}
}

View File

@@ -1,5 +1,3 @@
@import '../../../../../styles/variables.scss';
@import '../../../../../styles/mixins.scss';
.filters {
.toggle-more-filters a {

View File

@@ -1,7 +1,6 @@
@import '../../../../../styles/variables.scss';
@import '../../../../../styles/mixins.scss';
@import '../search-filter.component';
:host-context(.mantis) .facet-filter {
.facet-filter {
background-color: map-get($theme-colors, light);
border-radius: $border-radius;

View File

@@ -1,2 +0,0 @@
@import '../../../styles/variables.scss';
@import '../../../styles/mixins.scss';

View File

@@ -1,5 +1,3 @@
@import '../../styles/variables.scss';
@import '../../styles/mixins.scss';
@include media-breakpoint-down(md) {
.container {

View File

@@ -1,5 +0,0 @@
@import '../../../styles/variables.scss';
.setting-option {
border: 1px solid map-get($theme-colors, light);
}

View File

@@ -1,2 +1,3 @@
@import './search-settings.component.default';
@import './themes/*.scss';
.setting-option {
border: 1px solid map-get($theme-colors, light);
}

View File

@@ -9,8 +9,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.comp
@Component({
selector: 'ds-search-settings',
styleUrls: ['./search-settings.component.scss'],
// templateUrl: './search-settings.component.html'
styleUrls: ['./$themePath$/search-settings.component.$theme$.scss'],
templateUrl: './$themePath$/search-settings.component.$theme$.html'
})

View File

@@ -1,10 +1,10 @@
@import '../../../../styles/variables.scss';
@import '../search-settings.component';
:host-context(.mantis) .setting-option {
.setting-option {
background-color: map-get($theme-colors, light);
border-radius: $border-radius;
h5 {
font-size: 1.1rem
}
}

View File

@@ -1,6 +1,3 @@
@import '../../../styles/variables.scss';
@import '../../../styles/mixins.scss';
:host {
.results {
line-height: $button-height;

View File

@@ -1,4 +1,3 @@
@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';

View File

@@ -24,14 +24,12 @@ import { isAuthenticated } from './core/auth/selectors';
import { AuthService } from './core/auth/auth.service';
import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
import { RouteService } from './shared/services/route.service';
import global from '../styles/_variables.scss';
import variables from '../styles/_exposed_variables.scss';
import { CSSVariableService } from './shared/sass-helper/sass-helper.service';
import { MenuService } from './shared/menu/menu.service';
import { MenuID } from './shared/menu/initial-menus-state';
import { Observable } from 'rxjs/internal/Observable';
import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
import { slideSidebarPadding } from './shared/animations/slide';
import { combineLatest as combineLatestObservable, of } from 'rxjs';
import { HostWindowService } from './shared/host-window.service';
import { Theme } from '../config/theme.inferface';
@@ -65,7 +63,6 @@ export class AppComponent implements OnInit, AfterViewInit {
private menuService: MenuService,
private windowService: HostWindowService,
) {
console.log(global);
// Load all the languages that are defined as active from the config file
translate.addLangs(config.languages.filter((LangConfig) => LangConfig.active === true).map((a) => a.code));

View File

@@ -1,4 +1,3 @@
@import '../../styles/variables.scss';
$footer-bg: $gray-100;
$footer-border: 1px solid darken($footer-bg, 10%);
$footer-padding: $spacer * 1.5;

View File

@@ -1,5 +1,3 @@
@import '../../styles/variables.scss';
@media screen and (max-width: map-get($grid-breakpoints, md)) {
:host.open {
background-color: $white;

View File

@@ -1,12 +0,0 @@
@import '../../styles/variables.scss';
.navbar-brand img {
height: $header-logo-height;
@media screen and (max-width: map-get($grid-breakpoints, sm)) {
height: $header-logo-height-xs;
}
}
.navbar-toggler .navbar-toggler-icon {
background-image: none !important;
line-height: 1.5;
}

View File

@@ -1,2 +1,10 @@
@import './header.component.default';
@import './themes/*.scss';
.navbar-brand img {
height: $header-logo-height;
@media screen and (max-width: map-get($grid-breakpoints, sm)) {
height: $header-logo-height-xs;
}
}
.navbar-toggler .navbar-toggler-icon {
background-image: none !important;
line-height: 1.5;
}

View File

@@ -1,7 +0,0 @@
@import '../../../styles/variables.scss';
:host-context(.mantis) {
::ng-deep a {
//color: $dark;
}
}

View File

@@ -1,5 +1,3 @@
@import '../../../styles/variables.scss';
.dropdown-menu {
overflow: hidden;
min-width: 100%;

View File

@@ -1,39 +0,0 @@
@import '../../styles/variables.scss';
nav.navbar {
border-bottom: 1px $gray-400 solid;
align-items: baseline;
}
/** Mobile menu styling **/
@media screen and (max-width: map-get($grid-breakpoints, md)) {
.navbar {
width: 100%;
background-color: $white;
position: absolute;
overflow: hidden;
height: 0;
&.open {
height: 100vh; //doesn't matter because wrapper is sticky
}
}
}
@media screen and (min-width: map-get($grid-breakpoints, md)) {
.reset-padding-md {
margin-left: -$spacer/2;
margin-right: -$spacer/2;
}
}
/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
.navbar-expand-md.navbar-container {
@media screen and (max-width: map-get($grid-breakpoints, md)) {
> .container {
padding: 0 $spacer;
}
padding: 0;
}
}

View File

@@ -1,3 +1,35 @@
@import './navbar.component.default';
@import './themes/*.scss';
nav.navbar {
border-bottom: 1px $gray-400 solid;
align-items: baseline;
}
/** Mobile menu styling **/
@media screen and (max-width: map-get($grid-breakpoints, md)) {
.navbar {
width: 100%;
background-color: $white;
position: absolute;
overflow: hidden;
height: 0;
&.open {
height: 100vh; //doesn't matter because wrapper is sticky
}
}
}
@media screen and (min-width: map-get($grid-breakpoints, md)) {
.reset-padding-md {
margin-left: -$spacer/2;
margin-right: -$spacer/2;
}
}
/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
.navbar-expand-md.navbar-container {
@media screen and (max-width: map-get($grid-breakpoints, md)) {
> .container {
padding: 0 $spacer;
}
padding: 0;
}
}

View File

@@ -12,8 +12,7 @@ import { HostWindowService } from '../shared/host-window.service';
*/
@Component({
selector: 'ds-navbar',
styleUrls: ['navbar.component.scss'],
// templateUrl: './navbar.component.html',
styleUrls: ['./$themePath$/navbar.component.$theme$.scss'],
templateUrl: './$themePath$/navbar.component.$theme$.html',
animations: [slideMobileNav]
})

View File

@@ -1,9 +1,7 @@
@import '../../../styles/variables.scss';
@import '../navbar.component.scss';
:host-context(.mantis) {
nav.navbar {
border-bottom: 5px $green solid;
}
}

View File

@@ -1 +0,0 @@
@import '../../styles/variables.scss';

View File

@@ -1,5 +1,3 @@
@import "../../../styles/variables";
.chip-selected {
background-color: map-get($theme-colors, info) !important;
}

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables.scss';

View File

@@ -1,5 +1,3 @@
@import "../../../../../../../styles/variables";
.dropdown-toggle::after {
display:none
}

View File

@@ -1,5 +1,3 @@
@import "../../../../../../../styles/variables";
/* style fa-spin */
.fa-spin {
pointer-events: none;

View File

@@ -1,5 +1,3 @@
@import "../../../../../../../styles/variables";
:host /deep/ .dropdown-menu {
width: 100% !important;
max-height: $dropdown-menu-max-height;

View File

@@ -1,5 +1,3 @@
@import "../../../styles/_variables.scss";
.ds-form-input-addon {
border-top-right-radius: 0 !important;
border-bottom-right-radius: 0 !important;

View File

@@ -1,5 +1,3 @@
@import "../../../styles/_variables.scss";
.autocomplete {
width: 100%;
.dropdown-item {

View File

@@ -1,5 +1,3 @@
@import '../../../styles/variables.scss';
.form-login .form-control:focus {
z-index: 2;
}

View File

@@ -1,5 +1,3 @@
@import '../../../../styles/variables.scss';
.alert {
display: inline-block;
min-width: $modal-sm;

View File

@@ -1,6 +1,3 @@
@import '../../../../styles/variables';
@import '../../../../styles/mixins';
.notifications-wrapper {
z-index: $zindex-popover;
text-align: right;

View File

@@ -1 +0,0 @@
@import '../../../styles/variables';

View File

@@ -1,2 +1 @@
@import '../../../../styles/variables';

View File

@@ -1,2 +1 @@
@import '../../../../styles/variables';

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables';

View File

@@ -1,2 +1 @@
@import '../../../../styles/variables';

View File

@@ -1,6 +1,3 @@
@import '../../../styles/variables';
@import '../../../styles/mixins';
$ds-wrapper-grid-spacing: $spacer/2;
ds-wrapper-grid-element ::ng-deep {

View File

@@ -1,5 +1,3 @@
@import '../../../../../styles/variables';
.card {
a > div {
position: relative;

View File

@@ -1,4 +1,3 @@
@import '../../../../styles/variables';
:host {
/deep/ em {
font-weight: bold;

View File

@@ -1,2 +1 @@
@import '../../../../styles/variables';

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables';

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables';

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables';

View File

@@ -1 +0,0 @@
@import '../../../../styles/variables';

View File

@@ -1 +0,0 @@
@import '../../../styles/variables';

View File

@@ -1,4 +1,3 @@
@import '../../../../styles/variables';
:host {
::ng-deep em {
font-weight: bold;

View File

@@ -1,2 +1 @@
@import '../../../../styles/variables';

View File

@@ -1,5 +1,3 @@
@import '../../../styles/variables.scss';
// temporary fix for bootstrap 4 beta btn color issue
.btn-secondary {
background-color: $input-bg;

View File

@@ -1,5 +1,3 @@
@import '../../../../styles/variables.scss';
// temporary fix for bootstrap 4 beta btn color issue
.btn-secondary {
background-color: $input-bg;

View File

@@ -1,5 +1,3 @@
@import '../../../../styles/variables.scss';
// temporary fix for bootstrap 4 beta btn color issue
.btn-secondary {
background-color: $input-bg;

View File

@@ -1,6 +1,3 @@
@import '../../../../styles/variables';
@import '../../../../styles/mixins';
@mixin clamp($lines, $size-factor: 1, $line-height: $line-height-base) {
$height: $line-height * $font-size-base * $size-factor;
&.fixedHeight {

View File

@@ -1,5 +1,3 @@
@import '../../../styles/_variables.scss';
.ds-base-drop-zone {
border: 2px dashed $gray-600;
}

Some files were not shown because too many files have changed in this diff Show More