ChrisChen/ChurchAngular
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

Update libs

Browse Source
This commit is contained in:
Chris Chen
2024-04-06 10:07:36 -07:00
parent 3b37d7d798
commit cca0de9812
18 changed files with 225 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/@theme/components/footer/footer.component.scss
+3 -3
View File
@@ -1,6 +1,6 @@
@import '../../styles/themes';
@import '~@nebular/theme/styles/global/breakpoints';
@import '~bootstrap/scss/mixins/breakpoints';
@import "../../styles/themes";
@import "@nebular/theme/styles/global/breakpoints";
@import "bootstrap/scss/mixins/breakpoints";
@include nb-install-component() {
width: 100%;
src/app/@theme/components/header/header.component.scss
+4 -4
View File
@@ -1,6 +1,6 @@
@import '~bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints';
@import '../../styles/themes';
@import "bootstrap/scss/mixins/breakpoints";
@import "@nebular/theme/styles/global/breakpoints";
@import "../../styles/themes";
@include nb-install-component() {
display: flex;
@@ -24,7 +24,7 @@
}
::ng-deep nb-search button {
padding: 0!important;
padding: 0 !important;
}
.header-container {
src/app/@theme/layouts/one-column/one-column.layout.scss
+3 -3
View File
@@ -1,6 +1,6 @@
@import '../../styles/themes';
@import '~bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints';
@import "../../styles/themes";
@import "bootstrap/scss/mixins/breakpoints";
@import "@nebular/theme/styles/global/breakpoints";
@include nb-install-component() {
.menu-sidebar ::ng-deep .scrollable {
src/app/@theme/layouts/plain/plain.layout.scss
+3 -3
View File
@@ -1,6 +1,6 @@
@import '../../styles/themes';
@import '~bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints';
@import "../../styles/themes";
@import "bootstrap/scss/mixins/breakpoints";
@import "@nebular/theme/styles/global/breakpoints";
@include nb-install-component() {
.menu-sidebar ::ng-deep .scrollable {
src/app/@theme/layouts/three-columns/three-columns.layout.scss
+3 -3
View File
@@ -1,6 +1,6 @@
@import '../../styles/themes';
@import '~bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints';
@import "../../styles/themes";
@import "bootstrap/scss/mixins/breakpoints";
@import "@nebular/theme/styles/global/breakpoints";
@include nb-install-component() {
.menu-sidebar ::ng-deep .scrollable {
src/app/@theme/layouts/two-columns/two-columns.layout.scss
+3 -3
View File
@@ -1,6 +1,6 @@
@import '../../styles/themes';
@import '~bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints';
@import "../../styles/themes";
@import "bootstrap/scss/mixins/breakpoints";
@import "@nebular/theme/styles/global/breakpoints";
@include nb-install-component() {
.menu-sidebar ::ng-deep .scrollable {
src/app/@theme/styles/styles.scss
+12 -13
View File
@@ -1,26 +1,25 @@
@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&display=swap');
@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&display=swap");
// themes - our custom or/and out of the box themes
@import 'themes';
@import "themes";
// framework component themes (styles tied to theme variables)
@import '~@nebular/theme/styles/globals';
@import '~@nebular/auth/styles/globals';
@import "@nebular/theme/styles/globals";
@import "@nebular/auth/styles/globals";
@import '~bootstrap/scss/functions';
@import '~bootstrap/scss/variables';
@import '~bootstrap/scss/mixins';
@import '~bootstrap/scss/grid';
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";
@import "bootstrap/scss/grid";
// loading progress bar theme
@import './pace.theme';
@import "./pace.theme";
@import './layout';
@import './overrides';
@import "./layout";
@import "./overrides";
// install the framework and custom global styles
@include nb-install() {
// framework global styles
@include nb-theme-global();
@include nb-auth-global();
@@ -30,4 +29,4 @@
@include ngx-pace-theme();
@include nb-overrides();
};
} ;
src/app/@theme/styles/themes.scss
+82 -66
View File
@@ -1,88 +1,104 @@
// @nebular theming framework
@import '~@nebular/theme/styles/theming';
@import "@nebular/theme/styles/theming";
// @nebular out of the box themes
@import '~@nebular/theme/styles/themes';
@import "@nebular/theme/styles/themes";
$nb-themes: nb-register-theme((
layout-padding-top: 2.25rem,
$nb-themes: nb-register-theme(
(
layout-padding-top: 2.25rem,
menu-item-icon-margin: 0 0.5rem 0 0,
menu-item-icon-margin: 0 0.5rem 0 0,
card-height-tiny: 13.5rem,
card-height-small: 21.1875rem,
card-height-medium: 28.875rem,
card-height-large: 36.5625rem,
card-height-giant: 44.25rem,
card-margin-bottom: 1.875rem,
card-header-with-select-padding-top: 0.5rem,
card-header-with-select-padding-bottom: 0.5rem,
card-height-tiny: 13.5rem,
card-height-small: 21.1875rem,
card-height-medium: 28.875rem,
card-height-large: 36.5625rem,
card-height-giant: 44.25rem,
card-margin-bottom: 1.875rem,
card-header-with-select-padding-top: 0.5rem,
card-header-with-select-padding-bottom: 0.5rem,
select-min-width: 6rem,
select-min-width: 6rem,
slide-out-background: #f7f9fc,
slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
), default, default);
slide-out-background: #f7f9fc,
slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
),
default,
default
);
$nb-themes: nb-register-theme((
layout-padding-top: 2.25rem,
$nb-themes: nb-register-theme(
(
layout-padding-top: 2.25rem,
menu-item-icon-margin: 0 0.5rem 0 0,
menu-item-icon-margin: 0 0.5rem 0 0,
card-height-tiny: 13.5rem,
card-height-small: 21.1875rem,
card-height-medium: 28.875rem,
card-height-large: 36.5625rem,
card-height-giant: 44.25rem,
card-margin-bottom: 1.875rem,
card-header-with-select-padding-top: 0.5rem,
card-header-with-select-padding-bottom: 0.5rem,
card-height-tiny: 13.5rem,
card-height-small: 21.1875rem,
card-height-medium: 28.875rem,
card-height-large: 36.5625rem,
card-height-giant: 44.25rem,
card-margin-bottom: 1.875rem,
card-header-with-select-padding-top: 0.5rem,
card-header-with-select-padding-bottom: 0.5rem,
select-min-width: 6rem,
select-min-width: 6rem,
slide-out-background: #252547,
slide-out-shadow-color: 2px 0 3px #29157a,
slide-out-shadow-color-rtl: -2px 0 3px #29157a,
), cosmic, cosmic);
slide-out-background: #252547,
slide-out-shadow-color: 2px 0 3px #29157a,
slide-out-shadow-color-rtl: -2px 0 3px #29157a,
),
cosmic,
cosmic
);
$nb-themes: nb-register-theme((
layout-padding-top: 2.25rem,
$nb-themes: nb-register-theme(
(
layout-padding-top: 2.25rem,
menu-item-icon-margin: 0 0.5rem 0 0,
menu-item-icon-margin: 0 0.5rem 0 0,
card-height-tiny: 13.5rem,
card-height-small: 21.1875rem,
card-height-medium: 28.875rem,
card-height-large: 36.5625rem,
card-height-giant: 44.25rem,
card-margin-bottom: 1.875rem,
card-header-with-select-padding-top: 0.5rem,
card-header-with-select-padding-bottom: 0.5rem,
card-height-tiny: 13.5rem,
card-height-small: 21.1875rem,
card-height-medium: 28.875rem,
card-height-large: 36.5625rem,
card-height-giant: 44.25rem,
card-margin-bottom: 1.875rem,
card-header-with-select-padding-top: 0.5rem,
card-header-with-select-padding-bottom: 0.5rem,
select-min-width: 6rem,
select-min-width: 6rem,
slide-out-background: linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%),
slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
), corporate, corporate);
slide-out-background: linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%),
slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
),
corporate,
corporate
);
$nb-themes: nb-register-theme((
layout-padding-top: 2.25rem,
$nb-themes: nb-register-theme(
(
layout-padding-top: 2.25rem,
menu-item-icon-margin: 0 0.5rem 0 0,
menu-item-icon-margin: 0 0.5rem 0 0,
card-height-tiny: 13.5rem,
card-height-small: 21.1875rem,
card-height-medium: 28.875rem,
card-height-large: 36.5625rem,
card-height-giant: 44.25rem,
card-margin-bottom: 1.875rem,
card-header-with-select-padding-top: 0.5rem,
card-header-with-select-padding-bottom: 0.5rem,
card-height-tiny: 13.5rem,
card-height-small: 21.1875rem,
card-height-medium: 28.875rem,
card-height-large: 36.5625rem,
card-height-giant: 44.25rem,
card-margin-bottom: 1.875rem,
card-header-with-select-padding-top: 0.5rem,
card-header-with-select-padding-bottom: 0.5rem,
select-min-width: 6rem,
select-min-width: 6rem,
slide-out-background: linear-gradient(270deg, #222b45 0%, #151a30 100%),
slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
), dark, dark);
slide-out-background: linear-gradient(270deg, #222b45 0%, #151a30 100%),
slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
),
dark,
dark
);
src/app/admin/admin.module.ts
-2
View File
@@ -12,7 +12,6 @@ import { FancyTableModule } from '../ui/fancy-table/fancy-table.module';
import { FamilyMembersComponent } from './family-members/family-members.component';
import { FamilyMemberEditorComponent } from './family-members/family-member-editor/family-member-editor.component';
import { DropDownListModule } from '../ui/drop-down-list/drop-down-list.module';
import { NgxMaskModule } from 'ngx-mask';
import { PastoralDomainsComponent } from './pastoral-domains/pastoral-domains.component';
import { PastoralDomainEditorComponent } from './pastoral-domains/pastoral-domain-editor/pastoral-domain-editor.component';
import { AssignMemberCellGroupComponent } from './family-members/assign-member-cell-group/assign-member-cell-group.component';
@@ -61,7 +60,6 @@ import { LineMessagingAccountEditorComponent } from './lines/line-messaging-acco
AlertDlgModule,
FancyTableModule,
DropDownListModule,
NgxMaskModule,
CurrencyInputModule,
MaskDirectiveModule,
DateInputModule
src/app/admin/family-members/assign-member-cell-group/assign-member-cell-group.component.ts
-1
View File
@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
import { NbDialogRef } from '@nebular/theme';
import { DropDownOption } from '../../../entity/dropDownOption';
import { DomainMemberRelationship, PastoralDomain } from '../../../entity/PastoralDomain';
import { DialogComponent } from '../../../pages/modal-overlays/dialog/dialog.component';
import { ArrayUtils } from '../../../utilities/array-utils';
import { first } from "rxjs/operators"
import { FamilyMember } from '../../../entity/Member';
src/app/app.module.ts
-1
View File
@@ -74,7 +74,6 @@ const socialLinks = [
closeOnBackdropClick: false,
closeOnEsc: false
}),
NgxMaskModule.forRoot(maskConfig),
NbDateFnsDateModule.forRoot({ format: 'MM/dd/yyyy' }),
CoreModule.forRoot(),
ThemeModule.forRoot(),
src/app/games/games.module.ts
-2
View File
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { QRCodeModule } from 'angular2-qrcode';
import { GamesRoutingModule } from './games-routing.module';
import { GamesComponent } from './games.component';
import { FormsModule } from '@angular/forms';
@@ -90,7 +89,6 @@ import { MobStandInfoComponent } from './massive-darkness2/mobs/mob-stand-info/m
CurrencyInputModule,
NbDialogModule.forRoot(),
AlertDlgModule,
QRCodeModule,
DropDownListModule
]
})
src/app/happiness/happiness.module.ts
-1
View File
@@ -54,7 +54,6 @@ import { AddNewCostDlgComponent } from './week-task-editor/add-new-cost-dlg/add-
AlertDlgModule,
FancyTableModule,
DropDownListModule,
NgxMaskModule,
CurrencyInputModule,
MaskDirectiveModule,
DateInputModule,
src/assets/styles/form-controls/_rbj-inputs.scss
+1 -1
View File
@@ -1,4 +1,4 @@
@use '../../themes' as *;
@import "../../../app/@theme/styles/themes";
input.rbj-CbField,
textarea.rbj-CbField {
src/assets/styles/form-controls/_scrollbars.scss
+13 -15
View File
@@ -1,19 +1,17 @@
@use '../../themes' as *;
@use "../../../app/@theme/styles/themes";
::-webkit-scrollbar {
width: 1rem!important;
}
::-webkit-scrollbar {
width: 1rem !important;
}
::-webkit-scrollbar-thumb {
background-color: nb-theme(color-primary-300)!important;
}
::-webkit-scrollbar-track {
background: nb-theme(color-primary-200)!important;
}
.label {
color: #736f6f;
}
::-webkit-scrollbar-thumb {
background-color: nb-theme(color-primary-300) !important;
}
::-webkit-scrollbar-track {
background: nb-theme(color-primary-200) !important;
}
.label {
color: #736f6f;
}
src/assets/styles/globals/_heights.scss
+3 -3
View File
@@ -33,14 +33,14 @@ $i: 200;
$i: 50;
@while $i < 100 {
.g-height-#{$i}x#{$infix} {
height: #{$i} * 1%;
height: #{$i}#{"%"};
}
.g-max-height-#{$i}x#{$infix} {
max-height: #{$i} * 1%;
max-height: #{$i}#{"%"};
}
.g-min-height-#{$i}x#{$infix} {
min-height: #{$i} * 1%;
min-height: #{$i}#{"%"};
}
$i: $i + 10;