Skip to content

Commit 2e17ba4

Browse files
Merged in feature/BKL-101 (pull request #72)
feature/BKL-101
2 parents 3f6193d + 7901a95 commit 2e17ba4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+24
-37
lines changed

web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
// Colors
66
@import "colors.scss";
7-
@import "signifly-variables/colors.scss";
7+
@import "variables/colors.scss";
88

99
// Variables
10-
@import "signifly-variables/variables.scss";
10+
@import "variables/sizes.scss";
1111

1212
// Components
1313
@import "mixins.scss";
@@ -18,9 +18,9 @@
1818
@import "navbar.scss";
1919
@import "member-view.scss";
2020
@import "media-library.scss";
21-
@import "paragraphs/highlighted-content.scss";
22-
@import "paragraphs/text-and-image.scss";
23-
@import "paragraphs/info-block.scss";
21+
@import "components/paragraphs/highlighted-content.scss";
22+
@import "components/paragraphs/text-and-image.scss";
23+
@import "components/paragraphs/info-block.scss";
2424
@import "collapse.scss";
2525
@import "_user.scss";
2626

@@ -60,9 +60,9 @@ img {
6060
height: auto;
6161
}
6262

63-
// Novataris components from Signifly redesign
63+
// redesign using boostrap overriding and a component-based approach
6464
@import "bootstrap-custom/bootstrap-custom-index.scss";
65-
@import "signifly-custom/custom-index.scss";
65+
@import "components/components-index.scss";
6666

6767
// moved to end to load correctly
6868
@import "search.scss";

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/alert/alert.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../signifly-variables/colors.scss";
1+
@import "../../variables/colors.scss";
22

33
div.alert {
44
> h3,

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/badge/badge.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../signifly-variables/colors.scss";
1+
@import "../../variables/colors.scss";
22

33
$content-types-colors: (
44
"collection": $tag-blue,

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/button-group/button-group.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../signifly-variables/colors.scss";
1+
@import "../../variables/colors.scss";
22

33
.btn-group,
44
.btn-group-sm {

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/button/button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../signifly-variables/colors.scss";
1+
@import "../../variables/colors.scss";
22

33
.btn,
44
.btn-lg {

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/dropdown/dropdown.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import "../../signifly-variables/colors.scss";
2-
@import "../../signifly-variables/variables.scss";
1+
@import "../../variables/colors.scss";
2+
@import "../../variables/sizes.scss";
33

44
.navbar-nav .dropdown-menu {
55
margin-top: 0;

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/form-check/form-check-custom.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../..//signifly-variables/colors.scss";
1+
@import "../../variables/colors.scss";
22

33
// extending custom checkbox containers
44
// source: https://www.w3schools.com/bootstrap4/bootstrap_forms_custom.asp

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/form-control/form-control.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../signifly-variables/colors.scss";
1+
@import "../../variables/colors.scss";
22

33
// This "component" will contain all that has to do with inputfields, textareas and selectors.
44
// This is due to all these fields being a sub-components of the form-group.

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/navbar/nav.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../signifly-variables/colors.scss";
1+
@import "../../variables/colors.scss";
22

33
.nav-item,
44
li.nav-item {

web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/navbar/navbar.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import "../..//signifly-variables/colors.scss";
2-
@import "../../signifly-variables/variables.scss";
1+
@import "../../variables/colors.scss";
2+
@import "../../variables/sizes.scss";
33

44
.navbar {
55
.brand-logo {

0 commit comments

Comments
 (0)