Skip to content

Commit 7512e32

Browse files
Merge pull request #16 from AndreasEngelmark/development
Code compliance
2 parents cce9285 + 6e3bdfb commit 7512e32

File tree

70 files changed

+32
-120
lines changed

Some content is hidden

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

70 files changed

+32
-120
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"drupal/core-project-message": "^9.1",
5151
"drupal/core-recommended": "^9.1",
5252
"drupal/date_popup": "^1.1",
53-
"drupal/devel": "^4.1",
5453
"drupal/diff": "^1.0",
5554
"drupal/entity_print": "^2.2",
5655
"drupal/entity_reference_integrity": "^1.0",
@@ -86,7 +85,6 @@
8685
"drupal/viewsreference": "^2.0",
8786
"drupal/xls_serialization": "^1.2",
8887
"drush/drush": "^10.4",
89-
"kint-php/kint": "^4.1",
9088
"mikehaertl/phpwkhtmltopdf": "^2.5"
9189
},
9290
"scripts": {
@@ -125,8 +123,8 @@
125123
"prefer-stable": true,
126124
"config": {
127125
"sort-packages": true,
126+
"process-timeout": 0,
128127
"allow-plugins": {
129-
"cweagans/composer-patches": true,
130128
"composer/installers": true,
131129
"cweagans/composer-patches": true,
132130
"dealerdirect/phpcodesniffer-composer-installer": true,
@@ -229,7 +227,9 @@
229227
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
230228
"drupal/coder": "^8.3",
231229
"drupal/core-dev": "^9.1",
230+
"drupal/devel": "^4.1",
232231
"friendsoftwig/twigcs": "^5.0",
232+
"kint-php/kint": "^4.1",
233233
"mglaman/drupal-check": "^1.1",
234234
"os2loop/os2loop_fixtures": "*",
235235
"phpspec/prophecy-phpunit": "^2.0"

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
label: 'Standard lang dato'
2-
pattern: 'l, F j, Y - H:i'
2+
pattern: 'l, j. F, Y - H:i'

config/sync/system.site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: OS2Loop
33
44
slogan: ''
55
page:
6-
front: /node/1
6+
front: /user/login
77
403: ''
88
404: ''
99
admin_compact_mode: false

local_install_guide.md

Lines changed: 0 additions & 75 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
},
99
"scripts": {
1010
"coding-standards-check/markdownlint": "markdownlint README.md 'docs/**/*.md' 'web/profiles/custom/os2loop/**/*.md' --ignore 'web/profiles/custom/os2loop/**/node_modules/**/*.md'",
11-
"coding-standards-check/prettier": "prettier --check web/profiles/custom/os2loop/themes/os2loop_theme/assets/**/*.{js,scss}",
11+
"coding-standards-check/prettier": "prettier --check \"web/profiles/custom/os2loop/themes/os2loop_theme/assets/**/*.{js,scss}\"",
1212
"coding-standards-check": "yarn coding-standards-check/markdownlint && yarn coding-standards-check/prettier",
1313
"coding-standards-apply/markdownlint": "markdownlint --fix README.md 'docs/**/*.md' 'web/profiles/custom/os2loop/**/*.md' --ignore 'web/profiles/custom/os2loop/**/node_modules/**/*.md'",
14-
"coding-standards-apply/prettier": "prettier --write web/profiles/custom/os2loop/themes/os2loop_theme/assets/**/*.{js,scss}",
14+
"coding-standards-apply/prettier": "prettier --write \"web/profiles/custom/os2loop/themes/os2loop_theme/assets/**/*.{js,scss}\"",
1515
"coding-standards-apply": "yarn coding-standards-apply/markdownlint && yarn coding-standards-apply/prettier"
1616
}
1717
}

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 {

0 commit comments

Comments
 (0)