mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-16 14:33:03 +00:00
Merge remote-tracking branch 'originGithub/main' into coar-notify-7
# Conflicts: # src/app/shared/shared.module.ts # src/assets/i18n/en.json5 # src/modules/app/browser-init.service.ts # src/themes/custom/lazy-theme.module.ts
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
:root {
|
||||
--ds-content-spacing: #{$spacer * 1.5};
|
||||
--ds-content-spacing: #{$spacer}; // equivalent to Bootstrap spaces of size 3
|
||||
|
||||
--ds-button-height: #{$input-btn-padding-y * 2 + $input-btn-line-height + calculateRem($input-btn-border-width*2)};
|
||||
|
||||
@@ -24,10 +24,14 @@
|
||||
--ds-header-logo-height-xs: 50px;
|
||||
--ds-header-icon-color: #{$link-color};
|
||||
--ds-header-icon-color-hover: #{$link-hover-color};
|
||||
--ds-navbar-bg: var(--ds-header-bg);
|
||||
--ds-header-navbar-border-top-color: #{$white};
|
||||
--ds-header-navbar-border-bottom-color: #{$gray-400};
|
||||
--ds-navbar-link-color: #{$cyan};
|
||||
--ds-navbar-link-color-hover: #{darken($cyan, 15%)};
|
||||
--ds-expandable-navbar-bg: var(--ds-navbar-bg);
|
||||
--ds-expandable-navbar-link-color: var(--ds-navbar-link-color);
|
||||
--ds-expandable-navbar-link-color-hover: var(--ds-navbar-link-color-hover);
|
||||
|
||||
$admin-sidebar-bg: darken(#2B4E72, 17%);
|
||||
$admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%);
|
||||
|
Reference in New Issue
Block a user