diff --git a/common/cinnamon/.nvmrc b/.nvmrc similarity index 100% rename from common/cinnamon/.nvmrc rename to .nvmrc diff --git a/HACKING.md b/HACKING.md new file mode 100644 index 0000000..9c8eb17 --- /dev/null +++ b/HACKING.md @@ -0,0 +1,45 @@ +This theme uses node-sass/libsass to process the various .scss files. Never edit any of the .css files manually. + +#### Editing the CSS based themes in the `common` directory (cinnamon, gnome-shell, gtk-3.0) + +* Install `nvm` (https://github.com/creationix/nvm) + +* Close and reopen your terminal + +* Run `nvm i` and `npm i` from this directory + +* Install `gulp` with `npm i -g gulp` + +* Edit the `common/*/sass/*.scss` files + +* Regenerate all .css files by executing `gulp` from the directory containing `gulpfile.js`. Alternatively execute `gulp --cwd` from any subdirectory containing a folder called `sass` to regenerate the .css files within that specific subdirectory only. + +-- + +#### Editing the GTK 2 themes + +* Go to `common/gtk-2.0` + +* The colors and includes are defined in `gtkrc`, `gtkrc-dark` and `gtkrc-darker` for each theme variant + +* `main.rc` contains the major part of the theme + +* `panel.rc` contains the panel styling for XFCE and Mate + +* `apps.rc` contains some application specific rules + +Because this theme is heavily based on the pixmap engine, a lot of the styling comes from the images in the `assets` and `assets-dark` folders. Don't edit these images directly. See the next section. + +-- + +#### Editing the images for the GTK 2 and GTK 3 themes + +* Go to the `common/gtk-2.0` or `common/gtk-3.0/$gtk-version` directory + +* Open the `assets.svg` or `assets-dark.svg` file in inkscape. Each object in the .svg file corresponds to an image in the `assets` or `assets-dark` folder + +* Find the object you want to edit and make your changes. Important: Don't change the obejct id! + +* Save `assets.svg` and delete the images corresponding to the edited .svg objects from the `assets` folder (or just delete everything in the `assets` folder) + +* Run `./render-assets.sh` or `./render-dark-assets.sh` from a terminal diff --git a/Makefile.am b/Makefile.am index 0cf86c1..3ac2276 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,11 @@ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = autogen.sh -SUBDIRS = common extra +EXTRA_DIST = \ + README.md \ + HACKING.md \ + autogen.sh \ + gulpfile.js \ + package.json \ + .nvmrc + +SUBDIRS = common extra diff --git a/common/cinnamon/README.md b/common/cinnamon/README.md deleted file mode 100644 index 9d62498..0000000 --- a/common/cinnamon/README.md +++ /dev/null @@ -1,16 +0,0 @@ -This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. - -#### Editing the theme - -* Install `nvm` (https://github.com/creationix/nvm) - -* Run `nvm i` from the directory containing `.nvmrc` - -* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case. - -* Install `gulp` with `npm i -g gulp` - -* Edit the sass/*.scss files - -* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js` - diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index 44b3bc2..21402ae 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -264,7 +264,7 @@ StScrollBar { .popup-menu .popup-menu-content { padding: 1em 0em 1em 0em; } .popup-menu .popup-menu-item { - padding: 0.4em 1.75em; + padding: .4em 1.75em; spacing: 1em; } .popup-menu .popup-menu-item:active { color: #D3DAE3; @@ -514,7 +514,7 @@ StScrollBar { color: #888; } .calendar { - padding: 0.4em 1.75em; + padding: .4em 1.75em; spacing-rows: 0px; spacing-columns: 0px; } @@ -555,7 +555,7 @@ StScrollBar { background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .datemenu-date-label { - padding: 0.4em 1.75em; + padding: .4em 1.75em; font-weight: bold; text-align: center; color: #D3DAE3; @@ -900,8 +900,7 @@ StScrollBar { .menu-categories-box { padding: 10px 30px 10px 30px; } -.menu-applications-inner-box, -.menu-applications-outer-box { +.menu-applications-inner-box, .menu-applications-outer-box { padding: 10px 10px 0 10px; } .menu-application-button { @@ -1019,17 +1018,11 @@ StScrollBar { color: rgba(255, 255, 255, 0.6); } .window-list-item-box:hover { color: #ffffff; } - .window-list-item-box:active, - .window-list-item-box:checked, - .window-list-item-box:focus { + .window-list-item-box:active, .window-list-item-box:checked, .window-list-item-box:focus { color: #ffffff; } - .panel-bottom .window-list-item-box:active, - .panel-bottom .window-list-item-box:checked, - .panel-bottom .window-list-item-box:focus { + .panel-bottom .window-list-item-box:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; } - .panel-top .window-list-item-box:active, - .panel-top .window-list-item-box:checked, - .panel-top .window-list-item-box:focus { + .panel-top .window-list-item-box:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus { border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; } .window-list-item-demands-attention { @@ -1074,7 +1067,7 @@ StScrollBar { width: 140px; } .sound-volume-menu-item { - padding: 0.4em 1.75em; } + padding: .4em 1.75em; } .sound-volume-menu-item StIcon { icon-size: 1.14em; padding-left: 8px; @@ -1289,7 +1282,7 @@ StScrollBar { font-size: 48pt; } .notification-applet-padding { - padding: 0.5em 1em; } + padding: .5em 1em; } .notification-applet-container { max-height: 100px; } diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index daa4423..439d410 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -264,7 +264,7 @@ StScrollBar { .popup-menu .popup-menu-content { padding: 1em 0em 1em 0em; } .popup-menu .popup-menu-item { - padding: 0.4em 1.75em; + padding: .4em 1.75em; spacing: 1em; } .popup-menu .popup-menu-item:active { color: #5c616c; @@ -494,7 +494,7 @@ StScrollBar { padding-bottom: 14px; } .about-scrollBox { - border: 1px solid #dbdfe3; + border: 1px solid #dcdfe3; border-radius: 2px; background-color: #ffffff; padding: 4px; @@ -514,7 +514,7 @@ StScrollBar { color: #888; } .calendar { - padding: 0.4em 1.75em; + padding: .4em 1.75em; spacing-rows: 0px; spacing-columns: 0px; } @@ -555,7 +555,7 @@ StScrollBar { background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .datemenu-date-label { - padding: 0.4em 1.75em; + padding: .4em 1.75em; font-weight: bold; text-align: center; color: #5c616c; @@ -883,7 +883,7 @@ StScrollBar { padding: 10px; transition-duration: 300; background-color: #F5F6F7; - border: 1px solid #dbdfe3; } + border: 1px solid #dcdfe3; } .menu-favorites-button { padding: 10px; @@ -900,8 +900,7 @@ StScrollBar { .menu-categories-box { padding: 10px 30px 10px 30px; } -.menu-applications-inner-box, -.menu-applications-outer-box { +.menu-applications-inner-box, .menu-applications-outer-box { padding: 10px 10px 0 10px; } .menu-application-button { @@ -1019,17 +1018,11 @@ StScrollBar { color: rgba(255, 255, 255, 0.6); } .window-list-item-box:hover { color: #ffffff; } - .window-list-item-box:active, - .window-list-item-box:checked, - .window-list-item-box:focus { + .window-list-item-box:active, .window-list-item-box:checked, .window-list-item-box:focus { color: #ffffff; } - .panel-bottom .window-list-item-box:active, - .panel-bottom .window-list-item-box:checked, - .panel-bottom .window-list-item-box:focus { + .panel-bottom .window-list-item-box:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; } - .panel-top .window-list-item-box:active, - .panel-top .window-list-item-box:checked, - .panel-top .window-list-item-box:focus { + .panel-top .window-list-item-box:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus { border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; } .window-list-item-demands-attention { @@ -1074,7 +1067,7 @@ StScrollBar { width: 140px; } .sound-volume-menu-item { - padding: 0.4em 1.75em; } + padding: .4em 1.75em; } .sound-volume-menu-item StIcon { icon-size: 1.14em; padding-left: 8px; @@ -1289,7 +1282,7 @@ StScrollBar { font-size: 48pt; } .notification-applet-padding { - padding: 0.5em 1em; } + padding: .5em 1em; } .notification-applet-container { max-height: 100px; } diff --git a/common/cinnamon/gulpfile.js b/common/cinnamon/gulpfile.js deleted file mode 100644 index 230ac9d..0000000 --- a/common/cinnamon/gulpfile.js +++ /dev/null @@ -1,18 +0,0 @@ -var gulp = require("gulp"); -var sass = require("gulp-sass"); -var filter = require('gulp-filter'); - -gulp.task('sass', function () { - return gulp.src('sass/*.scss') - .pipe(sass({ - outputStyle: 'nested', - precision: 5, - onError: function (err) { - notify().write(err); - } - })) - .pipe(gulp.dest('.')) -}); - - -gulp.task('default', ['sass']); diff --git a/common/cinnamon/package.json b/common/cinnamon/package.json deleted file mode 100644 index b08961b..0000000 --- a/common/cinnamon/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "devDependencies": { - "gulp": "~3.9.0", - "gulp-filter": "~2.0.2", - "gulp-sass": "~2.0.4" - } -} diff --git a/common/gnome-shell/3.14/.nvmrc b/common/gnome-shell/3.14/.nvmrc deleted file mode 100644 index 2bf5ad0..0000000 --- a/common/gnome-shell/3.14/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -stable diff --git a/common/gnome-shell/3.14/README.md b/common/gnome-shell/3.14/README.md deleted file mode 100644 index 9d62498..0000000 --- a/common/gnome-shell/3.14/README.md +++ /dev/null @@ -1,16 +0,0 @@ -This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. - -#### Editing the theme - -* Install `nvm` (https://github.com/creationix/nvm) - -* Run `nvm i` from the directory containing `.nvmrc` - -* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case. - -* Install `gulp` with `npm i -g gulp` - -* Edit the sass/*.scss files - -* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js` - diff --git a/common/gnome-shell/3.14/gulpfile.js b/common/gnome-shell/3.14/gulpfile.js deleted file mode 100644 index 230ac9d..0000000 --- a/common/gnome-shell/3.14/gulpfile.js +++ /dev/null @@ -1,18 +0,0 @@ -var gulp = require("gulp"); -var sass = require("gulp-sass"); -var filter = require('gulp-filter'); - -gulp.task('sass', function () { - return gulp.src('sass/*.scss') - .pipe(sass({ - outputStyle: 'nested', - precision: 5, - onError: function (err) { - notify().write(err); - } - })) - .pipe(gulp.dest('.')) -}); - - -gulp.task('default', ['sass']); diff --git a/common/gnome-shell/3.14/package.json b/common/gnome-shell/3.14/package.json deleted file mode 100644 index b08961b..0000000 --- a/common/gnome-shell/3.14/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "devDependencies": { - "gulp": "~3.9.0", - "gulp-filter": "~2.0.2", - "gulp-sass": "~2.0.4" - } -} diff --git a/common/gnome-shell/3.16/.nvmrc b/common/gnome-shell/3.16/.nvmrc deleted file mode 100644 index 2bf5ad0..0000000 --- a/common/gnome-shell/3.16/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -stable diff --git a/common/gnome-shell/3.16/README.md b/common/gnome-shell/3.16/README.md deleted file mode 100644 index 9d62498..0000000 --- a/common/gnome-shell/3.16/README.md +++ /dev/null @@ -1,16 +0,0 @@ -This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. - -#### Editing the theme - -* Install `nvm` (https://github.com/creationix/nvm) - -* Run `nvm i` from the directory containing `.nvmrc` - -* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case. - -* Install `gulp` with `npm i -g gulp` - -* Edit the sass/*.scss files - -* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js` - diff --git a/common/gnome-shell/3.16/package.json b/common/gnome-shell/3.16/package.json deleted file mode 100644 index b08961b..0000000 --- a/common/gnome-shell/3.16/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "devDependencies": { - "gulp": "~3.9.0", - "gulp-filter": "~2.0.2", - "gulp-sass": "~2.0.4" - } -} diff --git a/common/gnome-shell/3.18/.nvmrc b/common/gnome-shell/3.18/.nvmrc deleted file mode 100644 index 2bf5ad0..0000000 --- a/common/gnome-shell/3.18/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -stable diff --git a/common/gnome-shell/3.18/README.md b/common/gnome-shell/3.18/README.md deleted file mode 100644 index 9d62498..0000000 --- a/common/gnome-shell/3.18/README.md +++ /dev/null @@ -1,16 +0,0 @@ -This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. - -#### Editing the theme - -* Install `nvm` (https://github.com/creationix/nvm) - -* Run `nvm i` from the directory containing `.nvmrc` - -* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case. - -* Install `gulp` with `npm i -g gulp` - -* Edit the sass/*.scss files - -* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js` - diff --git a/common/gnome-shell/3.18/gulpfile.js b/common/gnome-shell/3.18/gulpfile.js deleted file mode 100644 index 230ac9d..0000000 --- a/common/gnome-shell/3.18/gulpfile.js +++ /dev/null @@ -1,18 +0,0 @@ -var gulp = require("gulp"); -var sass = require("gulp-sass"); -var filter = require('gulp-filter'); - -gulp.task('sass', function () { - return gulp.src('sass/*.scss') - .pipe(sass({ - outputStyle: 'nested', - precision: 5, - onError: function (err) { - notify().write(err); - } - })) - .pipe(gulp.dest('.')) -}); - - -gulp.task('default', ['sass']); diff --git a/common/gnome-shell/3.18/package.json b/common/gnome-shell/3.18/package.json deleted file mode 100644 index b08961b..0000000 --- a/common/gnome-shell/3.18/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "devDependencies": { - "gulp": "~3.9.0", - "gulp-filter": "~2.0.2", - "gulp-sass": "~2.0.4" - } -} diff --git a/common/gtk-2.0/README.md b/common/gtk-2.0/README.md deleted file mode 100644 index 48c45f1..0000000 --- a/common/gtk-2.0/README.md +++ /dev/null @@ -1,16 +0,0 @@ -#### Editing the theme - -* The Colors and includes are defined in `gtkrc`, `gtkrc-dark` and `gtkrc-darker` for each theme variant. -* `main.rc` contains the major part of the theme -* `panel.rc` contains the panel styling for XFCE and Mate -* `apps.rc` contains some application specific rules - -Because this theme is heavily based on the pixmap engine, a lot of the styling comes from the images in the `assets` and `assets-dark` folders. Don't edit these images directly. Instead do the following - -* Open the `assets.svg` or `assets-dark.svg` file in inkscape. Each object in the .svg file corresponds to an image in the `assets` and `assets-dark` folder. - -* Find the object you want to edit and make your changes. Important: Don't change the obejct id. - -* Save `assets.svg` or `assets-dark.svg` and delete the images corresponding to the edited .svg objects from the `assets` or `assets-dark` folder (or just delete everything in the `assets` or `assets-dark` folder). - -* Run `./render-assets.sh` or `./render-dark-assets.sh` from a terminal. diff --git a/common/gtk-3.0/3.14/.nvmrc b/common/gtk-3.0/3.14/.nvmrc deleted file mode 100644 index 2bf5ad0..0000000 --- a/common/gtk-3.0/3.14/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -stable diff --git a/common/gtk-3.0/3.14/README.md b/common/gtk-3.0/3.14/README.md deleted file mode 100644 index 4a159a5..0000000 --- a/common/gtk-3.0/3.14/README.md +++ /dev/null @@ -1,27 +0,0 @@ -This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. - -#### Editing the theme - -* Install `nvm` (https://github.com/creationix/nvm) - -* Run `nvm i` from the directory containing `.nvmrc` - -* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case. - -* Install `gulp` with `npm i -g gulp` - -* Edit the sass/*.scss files - -* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js` - --- - -#### Editing the images in the `assets` folder - -* Open the `assets.svg` file in inkscape. Each object in the .svg file corresponds to an image in the `assets` folder. - -* Find the object you want to edit and make your changes. Important: Don't change the obejct id. - -* Save `assets.svg` and delete the images corresponding to the edited .svg objects from the `assets` folder (or just delete everything in the `assets` folder). - -* Run `./render-assets.sh` from a terminal. diff --git a/common/gtk-3.0/3.14/gulpfile.js b/common/gtk-3.0/3.14/gulpfile.js deleted file mode 100644 index 230ac9d..0000000 --- a/common/gtk-3.0/3.14/gulpfile.js +++ /dev/null @@ -1,18 +0,0 @@ -var gulp = require("gulp"); -var sass = require("gulp-sass"); -var filter = require('gulp-filter'); - -gulp.task('sass', function () { - return gulp.src('sass/*.scss') - .pipe(sass({ - outputStyle: 'nested', - precision: 5, - onError: function (err) { - notify().write(err); - } - })) - .pipe(gulp.dest('.')) -}); - - -gulp.task('default', ['sass']); diff --git a/common/gtk-3.0/3.14/package.json b/common/gtk-3.0/3.14/package.json deleted file mode 100644 index b08961b..0000000 --- a/common/gtk-3.0/3.14/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "devDependencies": { - "gulp": "~3.9.0", - "gulp-filter": "~2.0.2", - "gulp-sass": "~2.0.4" - } -} diff --git a/common/gtk-3.0/3.16/.nvmrc b/common/gtk-3.0/3.16/.nvmrc deleted file mode 100644 index 2bf5ad0..0000000 --- a/common/gtk-3.0/3.16/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -stable diff --git a/common/gtk-3.0/3.16/README.md b/common/gtk-3.0/3.16/README.md deleted file mode 100644 index 4a159a5..0000000 --- a/common/gtk-3.0/3.16/README.md +++ /dev/null @@ -1,27 +0,0 @@ -This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. - -#### Editing the theme - -* Install `nvm` (https://github.com/creationix/nvm) - -* Run `nvm i` from the directory containing `.nvmrc` - -* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case. - -* Install `gulp` with `npm i -g gulp` - -* Edit the sass/*.scss files - -* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js` - --- - -#### Editing the images in the `assets` folder - -* Open the `assets.svg` file in inkscape. Each object in the .svg file corresponds to an image in the `assets` folder. - -* Find the object you want to edit and make your changes. Important: Don't change the obejct id. - -* Save `assets.svg` and delete the images corresponding to the edited .svg objects from the `assets` folder (or just delete everything in the `assets` folder). - -* Run `./render-assets.sh` from a terminal. diff --git a/common/gtk-3.0/3.16/gulpfile.js b/common/gtk-3.0/3.16/gulpfile.js deleted file mode 100644 index 230ac9d..0000000 --- a/common/gtk-3.0/3.16/gulpfile.js +++ /dev/null @@ -1,18 +0,0 @@ -var gulp = require("gulp"); -var sass = require("gulp-sass"); -var filter = require('gulp-filter'); - -gulp.task('sass', function () { - return gulp.src('sass/*.scss') - .pipe(sass({ - outputStyle: 'nested', - precision: 5, - onError: function (err) { - notify().write(err); - } - })) - .pipe(gulp.dest('.')) -}); - - -gulp.task('default', ['sass']); diff --git a/common/gtk-3.0/3.16/package.json b/common/gtk-3.0/3.16/package.json deleted file mode 100644 index b08961b..0000000 --- a/common/gtk-3.0/3.16/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "devDependencies": { - "gulp": "~3.9.0", - "gulp-filter": "~2.0.2", - "gulp-sass": "~2.0.4" - } -} diff --git a/common/gtk-3.0/3.18/.nvmrc b/common/gtk-3.0/3.18/.nvmrc deleted file mode 100644 index 2bf5ad0..0000000 --- a/common/gtk-3.0/3.18/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -stable diff --git a/common/gtk-3.0/3.18/README.md b/common/gtk-3.0/3.18/README.md deleted file mode 100644 index 4a159a5..0000000 --- a/common/gtk-3.0/3.18/README.md +++ /dev/null @@ -1,27 +0,0 @@ -This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. - -#### Editing the theme - -* Install `nvm` (https://github.com/creationix/nvm) - -* Run `nvm i` from the directory containing `.nvmrc` - -* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case. - -* Install `gulp` with `npm i -g gulp` - -* Edit the sass/*.scss files - -* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js` - --- - -#### Editing the images in the `assets` folder - -* Open the `assets.svg` file in inkscape. Each object in the .svg file corresponds to an image in the `assets` folder. - -* Find the object you want to edit and make your changes. Important: Don't change the obejct id. - -* Save `assets.svg` and delete the images corresponding to the edited .svg objects from the `assets` folder (or just delete everything in the `assets` folder). - -* Run `./render-assets.sh` from a terminal. diff --git a/common/gtk-3.0/3.18/gulpfile.js b/common/gtk-3.0/3.18/gulpfile.js deleted file mode 100644 index 230ac9d..0000000 --- a/common/gtk-3.0/3.18/gulpfile.js +++ /dev/null @@ -1,18 +0,0 @@ -var gulp = require("gulp"); -var sass = require("gulp-sass"); -var filter = require('gulp-filter'); - -gulp.task('sass', function () { - return gulp.src('sass/*.scss') - .pipe(sass({ - outputStyle: 'nested', - precision: 5, - onError: function (err) { - notify().write(err); - } - })) - .pipe(gulp.dest('.')) -}); - - -gulp.task('default', ['sass']); diff --git a/common/gtk-3.0/3.18/package.json b/common/gtk-3.0/3.18/package.json deleted file mode 100644 index b08961b..0000000 --- a/common/gtk-3.0/3.18/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "devDependencies": { - "gulp": "~3.9.0", - "gulp-filter": "~2.0.2", - "gulp-sass": "~2.0.4" - } -} diff --git a/common/gtk-3.0/3.20/.nvmrc b/common/gtk-3.0/3.20/.nvmrc deleted file mode 100644 index 2bf5ad0..0000000 --- a/common/gtk-3.0/3.20/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -stable diff --git a/common/gtk-3.0/3.20/README.md b/common/gtk-3.0/3.20/README.md deleted file mode 100644 index 4a159a5..0000000 --- a/common/gtk-3.0/3.20/README.md +++ /dev/null @@ -1,27 +0,0 @@ -This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. - -#### Editing the theme - -* Install `nvm` (https://github.com/creationix/nvm) - -* Run `nvm i` from the directory containing `.nvmrc` - -* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case. - -* Install `gulp` with `npm i -g gulp` - -* Edit the sass/*.scss files - -* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js` - --- - -#### Editing the images in the `assets` folder - -* Open the `assets.svg` file in inkscape. Each object in the .svg file corresponds to an image in the `assets` folder. - -* Find the object you want to edit and make your changes. Important: Don't change the obejct id. - -* Save `assets.svg` and delete the images corresponding to the edited .svg objects from the `assets` folder (or just delete everything in the `assets` folder). - -* Run `./render-assets.sh` from a terminal. diff --git a/common/gtk-3.0/3.20/gulpfile.js b/common/gtk-3.0/3.20/gulpfile.js deleted file mode 100644 index 230ac9d..0000000 --- a/common/gtk-3.0/3.20/gulpfile.js +++ /dev/null @@ -1,18 +0,0 @@ -var gulp = require("gulp"); -var sass = require("gulp-sass"); -var filter = require('gulp-filter'); - -gulp.task('sass', function () { - return gulp.src('sass/*.scss') - .pipe(sass({ - outputStyle: 'nested', - precision: 5, - onError: function (err) { - notify().write(err); - } - })) - .pipe(gulp.dest('.')) -}); - - -gulp.task('default', ['sass']); diff --git a/common/gtk-3.0/3.20/package.json b/common/gtk-3.0/3.20/package.json deleted file mode 100644 index b08961b..0000000 --- a/common/gtk-3.0/3.20/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "devDependencies": { - "gulp": "~3.9.0", - "gulp-filter": "~2.0.2", - "gulp-sass": "~2.0.4" - } -} diff --git a/common/gnome-shell/3.16/gulpfile.js b/gulpfile.js similarity index 57% rename from common/gnome-shell/3.16/gulpfile.js rename to gulpfile.js index 230ac9d..0ceafcd 100644 --- a/common/gnome-shell/3.16/gulpfile.js +++ b/gulpfile.js @@ -1,9 +1,9 @@ var gulp = require("gulp"); var sass = require("gulp-sass"); -var filter = require('gulp-filter'); +var rename = require('gulp-rename'); gulp.task('sass', function () { - return gulp.src('sass/*.scss') + return gulp.src(['./**/sass/*.scss', '!./node_modules/**/*', '!./m4/**/*']) .pipe(sass({ outputStyle: 'nested', precision: 5, @@ -11,8 +11,10 @@ gulp.task('sass', function () { notify().write(err); } })) - .pipe(gulp.dest('.')) + .pipe(rename(function (path) { + path.dirname += "/../"; + })) + .pipe(gulp.dest('./')) }); - gulp.task('default', ['sass']); diff --git a/package.json b/package.json new file mode 100644 index 0000000..163fd77 --- /dev/null +++ b/package.json @@ -0,0 +1,7 @@ +{ + "devDependencies": { + "gulp": "~3.9.1", + "gulp-sass": "~2.2.0", + "gulp-rename": "~1.2.2" + } +}