From aa78a8f3c592252861c254ebb08cc81482e85135 Mon Sep 17 00:00:00 2001 From: Angelos Chalaris Date: Thu, 10 Nov 2016 00:47:29 +0200 Subject: [PATCH] Folder restructure and file move-around --- {flavors/v2 => dist}/mini-default.css | 0 {flavors/v2 => dist}/mini-default.min.css | 0 docs/v2/DEVLOG.md | 6 +- scss/v2/_accordion.scss | 86 ------------------- {flavors/v2 => src/flavors}/mini-default.scss | 2 +- {scss/v2 => src}/mini/_button.scss | 0 {scss/v2 => src}/mini/_card.scss | 0 {scss/v2 => src}/mini/_checkbox.scss | 0 {scss/v2 => src}/mini/_contextual.scss | 0 scss/v2/_mini.scss => src/mini/_core.scss | 24 +++--- {scss/v2 => src}/mini/_form.scss | 0 {scss/v2 => src}/mini/_grid.scss | 0 {scss/v2 => src}/mini/_navigation.scss | 0 {scss/v2 => src}/mini/_progress.scss | 0 {scss/v2 => src}/mini/_spinner.scss | 0 {scss/v2 => src}/mini/_tab.scss | 0 {scss/v2 => src}/mini/_table.scss | 0 {scss/v2 => src}/mini/_utility.scss | 0 18 files changed, 18 insertions(+), 100 deletions(-) rename {flavors/v2 => dist}/mini-default.css (100%) rename {flavors/v2 => dist}/mini-default.min.css (100%) delete mode 100644 scss/v2/_accordion.scss rename {flavors/v2 => src/flavors}/mini-default.scss (99%) rename {scss/v2 => src}/mini/_button.scss (100%) rename {scss/v2 => src}/mini/_card.scss (100%) rename {scss/v2 => src}/mini/_checkbox.scss (100%) rename {scss/v2 => src}/mini/_contextual.scss (100%) rename scss/v2/_mini.scss => src/mini/_core.scss (95%) rename {scss/v2 => src}/mini/_form.scss (100%) rename {scss/v2 => src}/mini/_grid.scss (100%) rename {scss/v2 => src}/mini/_navigation.scss (100%) rename {scss/v2 => src}/mini/_progress.scss (100%) rename {scss/v2 => src}/mini/_spinner.scss (100%) rename {scss/v2 => src}/mini/_tab.scss (100%) rename {scss/v2 => src}/mini/_table.scss (100%) rename {scss/v2 => src}/mini/_utility.scss (100%) diff --git a/flavors/v2/mini-default.css b/dist/mini-default.css similarity index 100% rename from flavors/v2/mini-default.css rename to dist/mini-default.css diff --git a/flavors/v2/mini-default.min.css b/dist/mini-default.min.css similarity index 100% rename from flavors/v2/mini-default.min.css rename to dist/mini-default.min.css diff --git a/docs/v2/DEVLOG.md b/docs/v2/DEVLOG.md index 5625cd4..87ac343 100644 --- a/docs/v2/DEVLOG.md +++ b/docs/v2/DEVLOG.md @@ -369,4 +369,8 @@ - Restructured folders. `mini-shell` removed, `mini-core` renamed to `mini`. `mini` is the core folder now. - Created branch `v1-neutrino` both locally and on Github to support legacy versions in the future. `master` is now the branch for **Fermion** only. - Aggressive deletion of older files. The following folder are now gone: `scss/mini`, `scss/mini-extra`, `flavors` except for the contents of the `v2` folder and the folder itself. - \ No newline at end of file + - Renamed `_mini.scss` to `_core.scss`, moved to the `scss/v2/mini` directory. + - Deleted `accordion` module file as it was obsolete. + - Renamed `scss` directory to `src`. Renamed `flavors` directory to `dist`. + - Moved flavors from their directory to the `src` directory. CSS files produced from flavor files will go to the `dist` folder, along with the minified versions. + - *TODO* Update the `package.json` and `bower.json` files according to the new framework version. \ No newline at end of file diff --git a/scss/v2/_accordion.scss b/scss/v2/_accordion.scss deleted file mode 100644 index d65e180..0000000 --- a/scss/v2/_accordion.scss +++ /dev/null @@ -1,86 +0,0 @@ -// Definitions for vertical accordions/collapses. -// Accordion styling -$accordion-name: 'accordion' !default; // Class name for accordions/collapses -[type="checkbox"].#{$accordion-name}, [type="radio"].#{$accordion-name} { - display: none; - visibility: hidden; -// Style for the label (toggle) -+ label { - display: block; - cursor: pointer; -@if $accordion-label-back-color != $back-color { - background: $accordion-label-back-color; -} -@if $accordion-label-fore-color != $fore-color { - color: $accordion-label-fore-color; -} -@if $accordion-border-style != 0 { - border: $accordion-border-style; -} -@if $accordion-border-radius != 0 { - border-radius: $accordion-border-radius; -} - padding: $accordion-label-padding; - margin-bottom: $accordion-margin-bottom; -} -// Style for the content (not customizable) -+ label + * { - // Hide content, while allowing accessibility - height: 1px; - width: 1px; - margin: -1px; - overflow: hidden; - position: absolute; - clip: rect(0 0 0 0); - -webkit-clip-path: inset(100%); - clip-path: inset(100%); - // Presentation - -webkit-transform: scaleY(0); - transform: scaleY(0); - -webkit-transform-origin: top; - transform-origin: top; - transition: transform 0.3s ease 0s; -} -// Style for the label (toggle) when content is open -&:checked + label { - margin-bottom: 0; // Remove bottom margin -@if $accordion-separator-border-style != $accordion-border-style { - border-bottom: $accordion-separator-border-style; -} -@if $accordion-border-radius != 0 { - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} -} -// Style for the content when open -&:checked + label + * { - // Display content - box-sizing: border-box; - position: relative; - height: auto; - width: 100%; - margin: 0; - clip: auto; - -webkit-clip-path: inset(0%); - clip-path: inset(0%); - -webkit-transform: scaleY(1); - transform: scaleY(1); - // Content styling -@if $accordion-content-back-color != $back-color { - background: $accordion-content-back-color; -} -@if $accordion-content-fore-color != $fore-color { - color: $accordion-content-fore-color; -} -@if $accordion-border-style != 0 { - border: $accordion-border-style; - border-top: 0; -} -@if $accordion-border-radius != 0 { - border-bottom-right-radius: $accordion-border-radius; - border-bottom-left-radius: $accordion-border-radius; -} - padding: $accordion-content-padding; - margin-bottom: $accordion-margin-bottom; -} -} \ No newline at end of file diff --git a/flavors/v2/mini-default.scss b/src/flavors/mini-default.scss similarity index 99% rename from flavors/v2/mini-default.scss rename to src/flavors/mini-default.scss index 47154cf..096e193 100644 --- a/flavors/v2/mini-default.scss +++ b/src/flavors/mini-default.scss @@ -391,7 +391,7 @@ $spinner-donut-variant2-back-color: // Background color for donut spi $spinner-donut-variant2-fore-color: // Foreground color for donut spinner variant 2 #2e7d32; // Enable mini.css -@import '../../scss/v2/mini'; +@import '../mini/core'; // Use mixins for button elements @include make-button-alt-color ($button-variant1-name, $button-variant1-back-color, $button-variant1-back-opacity, $button-variant1-hover-back-opacity, $button-variant1-fore-color); diff --git a/scss/v2/mini/_button.scss b/src/mini/_button.scss similarity index 100% rename from scss/v2/mini/_button.scss rename to src/mini/_button.scss diff --git a/scss/v2/mini/_card.scss b/src/mini/_card.scss similarity index 100% rename from scss/v2/mini/_card.scss rename to src/mini/_card.scss diff --git a/scss/v2/mini/_checkbox.scss b/src/mini/_checkbox.scss similarity index 100% rename from scss/v2/mini/_checkbox.scss rename to src/mini/_checkbox.scss diff --git a/scss/v2/mini/_contextual.scss b/src/mini/_contextual.scss similarity index 100% rename from scss/v2/mini/_contextual.scss rename to src/mini/_contextual.scss diff --git a/scss/v2/_mini.scss b/src/mini/_core.scss similarity index 95% rename from scss/v2/_mini.scss rename to src/mini/_core.scss index be7cd5c..c3bea33 100644 --- a/scss/v2/_mini.scss +++ b/src/mini/_core.scss @@ -355,16 +355,16 @@ a{ // SECTION: External files - core //=================================================== // You can comment out modules you do not want to use. -@import 'mini/grid'; -@import 'mini/table'; -@import 'mini/form'; -@import 'mini/navigation'; -@import 'mini/button'; -@import 'mini/checkbox'; -@import 'mini/contextual'; -@import 'mini/progress'; -@import 'mini/utility'; -@import 'mini/card'; -@import 'mini/tab'; -@import 'mini/spinner'; +@import 'grid'; +@import 'table'; +@import 'form'; +@import 'navigation'; +@import 'button'; +@import 'checkbox'; +@import 'contextual'; +@import 'progress'; +@import 'utility'; +@import 'card'; +@import 'tab'; +@import 'spinner'; //=================================================== \ No newline at end of file diff --git a/scss/v2/mini/_form.scss b/src/mini/_form.scss similarity index 100% rename from scss/v2/mini/_form.scss rename to src/mini/_form.scss diff --git a/scss/v2/mini/_grid.scss b/src/mini/_grid.scss similarity index 100% rename from scss/v2/mini/_grid.scss rename to src/mini/_grid.scss diff --git a/scss/v2/mini/_navigation.scss b/src/mini/_navigation.scss similarity index 100% rename from scss/v2/mini/_navigation.scss rename to src/mini/_navigation.scss diff --git a/scss/v2/mini/_progress.scss b/src/mini/_progress.scss similarity index 100% rename from scss/v2/mini/_progress.scss rename to src/mini/_progress.scss diff --git a/scss/v2/mini/_spinner.scss b/src/mini/_spinner.scss similarity index 100% rename from scss/v2/mini/_spinner.scss rename to src/mini/_spinner.scss diff --git a/scss/v2/mini/_tab.scss b/src/mini/_tab.scss similarity index 100% rename from scss/v2/mini/_tab.scss rename to src/mini/_tab.scss diff --git a/scss/v2/mini/_table.scss b/src/mini/_table.scss similarity index 100% rename from scss/v2/mini/_table.scss rename to src/mini/_table.scss diff --git a/scss/v2/mini/_utility.scss b/src/mini/_utility.scss similarity index 100% rename from scss/v2/mini/_utility.scss rename to src/mini/_utility.scss