Skip to content

Commit ca9079e

Browse files
authored
Merge pull request #4 from dcodegroup/feature/DCO-55-preset-package-optimisations
-Included missing component features to styleguide and sass
2 parents 9ee6dc6 + e717065 commit ca9079e

59 files changed

Lines changed: 1005 additions & 262 deletions

Some content is hidden

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

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22
To build the preset boilerplate, run the following command:
33
```php artisan ui dcode-preset-ui```
44

5+
## Updating Sass
6+
To update the base and component sass directories, run the following command:
7+
```php artisan ui dcode-preset-sass```
8+
59

src/DcodePreset.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,15 @@ public static function install()
4141
return str_replace("RouteServiceProvider::HOME", "route('home')", $file);
4242
});
4343
}
44-
44+
45+
public static function updateSass()
46+
{
47+
$filesystem = new Filesystem();
48+
$filesystem->deleteDirectory(resource_path('sass/base'));
49+
$filesystem->copyDirectory(__DIR__ . '/../stubs/default/resources/sass/base/', resource_path('sass/base'));
50+
$filesystem->deleteDirectory(resource_path('sass/components'));
51+
$filesystem->copyDirectory(__DIR__ . '/../stubs/default/resources/sass/components/', resource_path('sass/components'));
52+
}
4553
// public static function installAuth()
4654
// {
4755
// $filesystem = new Filesystem();

src/DcodeServiceProvider.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,11 @@ public function boot()
2828

2929
Paginator::defaultView('pagination::default');
3030
Paginator::defaultSimpleView('pagination::simple-default');
31+
32+
UiCommand::macro('dcode-preset-sass', function ($command) {
33+
DcodePreset::updateSass();
34+
$command->info('Dcode preset Sass base and components directories have been updated.');
35+
$command->comment('Run "npm run dev" to compile your updated Sass assets.');
36+
});
3137
}
3238
}
Lines changed: 4 additions & 0 deletions
Loading

stubs/default/resources/js/lib/SelectFilter.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
// ToDo: Needs Window pall to trigger the click off event
21

32
export default class {
43
constructor(el){
54
this.selectFilterContainer = el;
6-
this.selectFilterBtn = this.selectFilterContainer.querySelector("p > button");
7-
this.selectFilterText = this.selectFilterContainer.querySelector("p > span");
5+
this.selectFilterBtn = this.selectFilterContainer.querySelector("div > button");
6+
this.selectFilterText = this.selectFilterContainer.querySelector("div > span");
87
this.selectFilterMenu = this.selectFilterContainer.querySelector("ul");
98
this.selectFilterMenuButtons = Array.from(this.selectFilterMenu.querySelectorAll('li > button'));
109
this.menuOpen = false;

stubs/default/resources/sass/app.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
21
@use 'base';
3-
42
@use 'components';
5-
63
@use 'page-layouts/app';
4+
@use 'page-layouts/styleguide';
75

8-
@use 'sections';
96

107

118

stubs/default/resources/sass/base/agnostic.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,13 @@
6262
top: 0;
6363
}
6464
}
65-
}
65+
}
66+
67+
@function shade($color, $percentage) {
68+
@return mix(#000, $color, $percentage);
69+
}
70+
71+
@function tint($color, $percentage) {
72+
@return mix(#fff, $color, $percentage);
73+
}
74+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11

22

3+
// ToDo: bring animations over from AME?

stubs/default/resources/sass/base/body.scss

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

stubs/default/resources/sass/base/breakpoints.scss

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11

2-
$breakpoints: (
3-
xs: 350px,
4-
sm: 480px,
5-
md: 764px,
6-
lg: 1024px,
7-
xl: 1170px,
8-
xxl: 1400px
9-
) !default;
10-
2+
@use '../settings/variables.scss' as *;
3+
114
// breakpoint-next
125
// =============================================================================
136
/// Gets the next breakpoint in a map.

0 commit comments

Comments
 (0)