remove duplicate files

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

Makefile.am

@@ -1,4 +1,11 @@
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = \
+	README.md \
+	HACKING.md \
+	autogen.sh \
+	gulpfile.js \
+	package.json \
+	.nvmrc
+
 SUBDIRS = common extra

common/cinnamon/README.md

@@ -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`
-

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-inner-box, .menu-applications-outer-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:active, .window-list-item-box:checked, .window-list-item-box:focus {
-  .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:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus {
-    .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:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus {
-    .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; }

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-inner-box, .menu-applications-outer-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:active, .window-list-item-box:checked, .window-list-item-box:focus {
-  .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:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus {
-    .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:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus {
-    .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; }

common/cinnamon/gulpfile.js

@@ -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']);

common/cinnamon/package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "gulp": "~3.9.0",
-    "gulp-filter": "~2.0.2",
-    "gulp-sass": "~2.0.4"
-  }
-}

common/gnome-shell/3.14/.nvmrc

@@ -1 +0,0 @@
-stable

common/gnome-shell/3.14/README.md

@@ -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`
-

common/gnome-shell/3.14/gulpfile.js

@@ -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']);

common/gnome-shell/3.14/package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "gulp": "~3.9.0",
-    "gulp-filter": "~2.0.2",
-    "gulp-sass": "~2.0.4"
-  }
-}

common/gnome-shell/3.16/.nvmrc

@@ -1 +0,0 @@
-stable

common/gnome-shell/3.16/README.md

@@ -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`
-

common/gnome-shell/3.16/package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "gulp": "~3.9.0",
-    "gulp-filter": "~2.0.2",
-    "gulp-sass": "~2.0.4"
-  }
-}

common/gnome-shell/3.18/.nvmrc

@@ -1 +0,0 @@
-stable

common/gnome-shell/3.18/README.md

@@ -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`
-

common/gnome-shell/3.18/gulpfile.js

@@ -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']);

common/gnome-shell/3.18/package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "gulp": "~3.9.0",
-    "gulp-filter": "~2.0.2",
-    "gulp-sass": "~2.0.4"
-  }
-}

common/gtk-2.0/README.md

@@ -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.

common/gtk-3.0/3.14/.nvmrc

@@ -1 +0,0 @@
-stable

common/gtk-3.0/3.14/README.md

@@ -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.

common/gtk-3.0/3.14/gulpfile.js

@@ -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']);

common/gtk-3.0/3.14/package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "gulp": "~3.9.0",
-    "gulp-filter": "~2.0.2",
-    "gulp-sass": "~2.0.4"
-  }
-}

common/gtk-3.0/3.16/.nvmrc

@@ -1 +0,0 @@
-stable

common/gtk-3.0/3.16/README.md

@@ -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.

common/gtk-3.0/3.16/gulpfile.js

@@ -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']);

common/gtk-3.0/3.16/package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "gulp": "~3.9.0",
-    "gulp-filter": "~2.0.2",
-    "gulp-sass": "~2.0.4"
-  }
-}

common/gtk-3.0/3.18/.nvmrc

@@ -1 +0,0 @@
-stable

common/gtk-3.0/3.18/README.md

@@ -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.

common/gtk-3.0/3.18/gulpfile.js

@@ -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']);

common/gtk-3.0/3.18/package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "gulp": "~3.9.0",
-    "gulp-filter": "~2.0.2",
-    "gulp-sass": "~2.0.4"
-  }
-}

common/gtk-3.0/3.20/.nvmrc

@@ -1 +0,0 @@
-stable

common/gtk-3.0/3.20/README.md

@@ -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.

common/gtk-3.0/3.20/gulpfile.js

@@ -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']);

common/gtk-3.0/3.20/package.json

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {
-    "gulp": "~3.9.0",
-    "gulp-filter": "~2.0.2",
-    "gulp-sass": "~2.0.4"
-  }
-}

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']);

package.json

@@ -0,0 +1,7 @@
+{
+  "devDependencies": {
+    "gulp": "~3.9.1",
+    "gulp-sass": "~2.2.0",
+    "gulp-rename": "~1.2.2"
+  }
+}