Skip to content

Commit e1dd531

Browse files
Spiderpig86Spiderpig86
committed
⬆️ chore: Fix imports, update Gulp scripts, clean up dist dir
1 parent 8eb7c74 commit e1dd531

Some content is hidden

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

55 files changed

+40125
-33026
lines changed

‎dist/cirrus-all.css

-24,223
This file was deleted.

‎dist/cirrus-all.min.css

-6
This file was deleted.

‎dist/cirrus-core.css

+19,974-4,291
Large diffs are not rendered by default.

‎dist/cirrus-core.min.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cirrus.css

+20,074-4,423
Large diffs are not rendered by default.

‎dist/cirrus.min.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gulpfile.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ const environment = {
2020

2121
generateGulpBuild(`ext`, `src/cirrus-ext.scss`, `cirrus`, `./dist/`);
2222
generateGulpBuild(`core`, `src/cirrus-core.scss`, `cirrus-core`, `./dist/`);
23-
generateGulpBuild(`all`, `src/cirrus-all.scss`, `cirrus-all`, `./dist/`);
24-
25-
// 0.8.0 beta builds
26-
generateGulpBuild(`next-ext`, `next/src/cirrus-ext.scss`, `cirrus`, `./next/dist/`);
27-
generateGulpBuild(`next-core`, `next/src/cirrus-core.scss`, `cirrus-core`, `./next/dist/`);
2823

2924
// source file name
3025
// file name
@@ -126,9 +121,8 @@ function generateGulpBuild(taskName, sassFilePath, outputName, distDir) {
126121
);
127122
}
128123

129-
gulp.task('watch', () => gulp.watch('./src/**/*.scss', gulp.parallel('minify-ext', 'minify-core', 'minify-all')));
124+
gulp.task('watch', () => gulp.watch('./src/**/*.scss', gulp.parallel('minify-ext', 'minify-core')));
130125

131-
gulp.task('default', gulp.parallel('minify-ext', 'minify-core', 'minify-all'));
132-
gulp.task('next', gulp.parallel('minify-next-core', 'minify-next-ext'));
126+
gulp.task('default', gulp.parallel('minify-ext', 'minify-core'));
133127

134-
gulp.task('gzip', gulp.parallel('gzip-ext', 'gzip-core', 'gzip-all'));
128+
gulp.task('gzip', gulp.parallel('gzip-ext', 'gzip-core'));

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cirrus-ui",
3-
"version": "0.7.2-patch.1",
3+
"version": "0.8.0",
44
"description": "A lightweight UI framework written in SCSS",
55
"main": "./dist/cirrus.min.css",
66
"filename": "cirrus.min.css",

‎src/base/animations.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
/* ANIMATIONS */
44

‎src/base/default.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* BASE STYLING + RESET FOR CIRRUS */
22
@use 'sass:map';
3-
@use '../../../src/internal' as *;
3+
@use '../src/internal' as *;
44

55
:root {
66
/* v1 Colors */

‎src/base/font.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use 'sass:map';
22

3-
@use '../../../src/internal/generator_v2';
4-
@use '../../../src/internal' as *;
3+
@use '../src/internal/generator_v2';
4+
@use '../src/internal' as *;
55

66
/* FONT */
77

‎src/base/grid.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use 'sass:map';
22

3-
@use '../../../src/internal/generator_v2';
4-
@use '../../../src/internal' as *;
3+
@use '../src/internal/generator_v2';
4+
@use '../src/internal' as *;
55

66
/* GRID */
77

‎src/base/layout.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use 'sass:math';
22
@use 'sass:map';
3-
@use '../../../src/internal/generator_v2';
4-
@use '../../../src/internal' as *;
3+
@use '../src/internal/generator_v2';
4+
@use '../src/internal' as *;
55

66
@function get-column-map($num-columns, $width) {
77
$result: ();

‎src/base/modifiers.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use 'sass:map';
2-
@use '../../../src/internal/generator_v2';
3-
@use '../../../src/internal' as *;
2+
@use '../src/internal/generator_v2';
3+
@use '../src/internal' as *;
44

55
/* A collection of modifiers that extend control styling */
66
#{$button-selectors} {

‎src/base/spacing.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use 'sass:map';
2-
@use '../../../src/internal/generator_v2';
3-
@use '../../../src/internal' as *;
2+
@use '../src/internal/generator_v2';
3+
@use '../src/internal' as *;
44

55
@include generator_v2.utility-with-body($variants: ($RESPONSIVE), $override: '!important') using ($props...) {
66
@each $class, $size in $spacing-system {

‎src/cirrus-core.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
@forward "../../src/internal";
1+
@forward "../src/internal";
22

33
@forward "builds/core.scss";

‎src/cirrus-ext.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@forward "../../src/internal";
1+
@forward "../src/internal";
22

33
// Uses default config in _config.scss
44

‎src/components/accordion.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
/* Accordion */
44
/* Use with <detail> and <summary> HTML tags */

‎src/components/avatar.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
/* Avatar */
44
@if should-generate-classes($AVATAR) {

‎src/components/breadcrumb.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($BREADCRUMB) {
44
$separators: (

‎src/components/button.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../../src/internal' as *;
2+
@use '../src/internal' as *;
33

44
/* Render the x in the close button */
55
@mixin btn-close-x($height, $width) {

‎src/components/card.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($CARD) {
44
/* CARDS */

‎src/components/code.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($CODE) {
44
/* CODE */

‎src/components/footer.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($FOOTER) {
44
/* FOOTER */

‎src/components/form-ext.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../../src/internal' as *;
2+
@use '../src/internal' as *;
33

44
/* Mixins */
55
@if should-generate-classes($FORMS-EXT) {

‎src/components/forms.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../../src/internal' as *;
2+
@use '../src/internal' as *;
33

44
/*
55
Mixins

‎src/components/frames.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($FRAMES) {
44
/* Separate CSS file, but same part as Layout */

‎src/components/header.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@mixin mobile-dropdown-menu-show {
44
border-radius: 0;

‎src/components/link-ext.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($LINKS-EXT) {
44
/* EXTENDED LINKS */

‎src/components/links.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($LINKS) {
44
/* LINKS */

‎src/components/lists.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($LISTS) {
44
/* LISTS */

‎src/components/modal.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($MODAL) {
44
.modal-container {

‎src/components/pagination.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($PAGINATION) {
44
/* PAGINATION */

‎src/components/progress.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../../src/internal' as *;
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($PROGRESS) {
55
$progress-primary: fill('primary');

‎src/components/table.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($TABLE) {
44
/* TABLE */

‎src/components/tabs.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22
@use '../base/spacing.scss';
33

44
@if should-generate-classes($TABS) {

‎src/components/tags.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../../src/internal' as *;
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($TAGS) {
55

‎src/components/tiles.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($TILES) {
44
/* TILES */

‎src/components/toast.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@use 'sass:map';
2-
@use '../../../src/internal' as *;
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($TOAST) {
55
.toast {

‎src/components/tooltips.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use '../../../src/internal' as *;
1+
@use '../src/internal' as *;
22

33
@if should-generate-classes($TOOLTIPS) {
44
/* TOOLTIPS */

‎src/utils/absolute.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($ABSOLUTES) {
55
$directions: top, left, right, bottom;

‎src/utils/blur.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Utility classes for shadows
22
@use 'sass:map';
33

4-
@use '../../../src/internal/generator_v2';
5-
@use '../../../src/internal' as *;
4+
@use '../src/internal/generator_v2';
5+
@use '../src/internal' as *;
66

77
@function _transformed() {
88
$transformed: ();

‎src/utils/border.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
// Border Widths
55
@if should-generate-classes($BORDER-WIDTH) {

‎src/utils/clearfix.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($CLEARFIX) {
55
$clears: left, right, both;

‎src/utils/cursor.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($CURSOR) {
55
$cursor-utils-config: auto, pointer, wait, text, move, help, not-allowed, none, cell, crosshair, grab, grabbing,

‎src/utils/display.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($DISPLAY) {
55
$display-utils-config: none, inline, inline-block, block, flex, inline-flex, table, table-row, table-column,

‎src/utils/flex.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use 'sass:map';
22

3-
@use '../../../src/internal/generator_v2';
4-
@use '../../../src/internal' as *;
3+
@use '../src/internal/generator_v2';
4+
@use '../src/internal' as *;
55

66
@if should-generate-classes($FLEX) {
77
$flex-directions: row, row-reverse, column, column-reverse;

‎src/utils/misc.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
/* UTILS */
55
/* Utility classes to help solve some very annoying issues */

‎src/utils/opacity.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($OPACITY) {
55
@include generator_v2.utility(

‎src/utils/overflow.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($OVERFLOW) {
55
$overflow: (auto, hidden, visible, scroll);

‎src/utils/position.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($POSITION) {
55
$positions: static, fixed, absolute, relative, sticky;

‎src/utils/shadows.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Utility classes for shadows
22
@use 'sass:map';
3-
@use '../../../src/internal/generator_v2';
4-
@use '../../../src/internal' as *;
3+
@use '../src/internal/generator_v2';
4+
@use '../src/internal' as *;
55

66
@function _transformed() {
77
$transformed: ();

‎src/utils/transitions.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Utility classes for transitions
2-
@use '../../../src/internal/generator_v2';
3-
@use '../../../src/internal' as *;
2+
@use '../src/internal/generator_v2';
3+
@use '../src/internal' as *;
44

55
/* TRANSITION DURATION */
66
@if should-generate-classes($TRANSITION-DURATION) {

‎src/utils/vertical-align.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($VERTICAL-ALIGN) {
55
@include generator_v2.utility(

‎src/utils/zindex.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '../../../src/internal/generator_v2';
2-
@use '../../../src/internal' as *;
1+
@use '../src/internal/generator_v2';
2+
@use '../src/internal' as *;
33

44
@if should-generate-classes($ZINDEX) {
55
@include generator_v2.utility(

0 commit comments

Comments
 (0)