Skip to content

Commit

Permalink
remove duplicate files
Browse files Browse the repository at this point in the history
  • Loading branch information
horst3180 committed Apr 5, 2016
1 parent bf1883a commit 428f89c
Show file tree
Hide file tree
Showing 38 changed files with 87 additions and 417 deletions.
File renamed without changes.
45 changes: 45 additions & 0 deletions HACKING.md
Original file line number Diff line number Diff line change
@@ -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
11 changes: 9 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -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
16 changes: 0 additions & 16 deletions common/cinnamon/README.md

This file was deleted.

25 changes: 9 additions & 16 deletions common/cinnamon/cinnamon-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -514,7 +514,7 @@ StScrollBar {
color: #888; }

.calendar {
padding: 0.4em 1.75em;
padding: .4em 1.75em;
spacing-rows: 0px;
spacing-columns: 0px; }

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1289,7 +1282,7 @@ StScrollBar {
font-size: 48pt; }

.notification-applet-padding {
padding: 0.5em 1em; }
padding: .5em 1em; }

.notification-applet-container {
max-height: 100px; }
Expand Down
29 changes: 11 additions & 18 deletions common/cinnamon/cinnamon.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -514,7 +514,7 @@ StScrollBar {
color: #888; }

.calendar {
padding: 0.4em 1.75em;
padding: .4em 1.75em;
spacing-rows: 0px;
spacing-columns: 0px; }

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1289,7 +1282,7 @@ StScrollBar {
font-size: 48pt; }

.notification-applet-padding {
padding: 0.5em 1em; }
padding: .5em 1em; }

.notification-applet-container {
max-height: 100px; }
Expand Down
18 changes: 0 additions & 18 deletions common/cinnamon/gulpfile.js

This file was deleted.

7 changes: 0 additions & 7 deletions common/cinnamon/package.json

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.14/.nvmrc

This file was deleted.

16 changes: 0 additions & 16 deletions common/gnome-shell/3.14/README.md

This file was deleted.

18 changes: 0 additions & 18 deletions common/gnome-shell/3.14/gulpfile.js

This file was deleted.

7 changes: 0 additions & 7 deletions common/gnome-shell/3.14/package.json

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.16/.nvmrc

This file was deleted.

16 changes: 0 additions & 16 deletions common/gnome-shell/3.16/README.md

This file was deleted.

7 changes: 0 additions & 7 deletions common/gnome-shell/3.16/package.json

This file was deleted.

1 change: 0 additions & 1 deletion common/gnome-shell/3.18/.nvmrc

This file was deleted.

16 changes: 0 additions & 16 deletions common/gnome-shell/3.18/README.md

This file was deleted.

18 changes: 0 additions & 18 deletions common/gnome-shell/3.18/gulpfile.js

This file was deleted.

7 changes: 0 additions & 7 deletions common/gnome-shell/3.18/package.json

This file was deleted.

Loading

0 comments on commit 428f89c

Please sign in to comment.