diff --git a/.gitignore b/.gitignore index 0c59f63..7371009 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,10 @@ configure install-sh missing .idea/ +common/cinnamon/cinnamon-dark.css +common/cinnamon/cinnamon.css +common/gnome-shell/3.18/gnome-shell-dark.css +common/gnome-shell/3.18/gnome-shell.css +common/gtk-3.0/3.20/gtk-dark.css +common/gtk-3.0/3.20/gtk-darker.css +common/gtk-3.0/3.20/gtk.css diff --git a/HACKING.md b/HACKING.md index efea8b6..66a79e6 100644 --- a/HACKING.md +++ b/HACKING.md @@ -2,17 +2,9 @@ This theme uses node-sass/libsass to process the various .scss files. Never edit #### 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. +* Run `make` to generate all css files using sassc (starting with version 20180114). Gulp is no longer required. -- diff --git a/README.md b/README.md index 2b30845..ea8d28f 100644 --- a/README.md +++ b/README.md @@ -15,29 +15,6 @@ Arc-Flatabulous theme is the [Arc](https://github.com/horst3180/arc-theme) theme ![A screenshot of the Arc-Dark theme](http://i.imgur.com/zUC1pHT.png) -### Requirements - -* Gnome/GTK3 3.14 - 3.22 -* The `gnome-themes-standard` package -* The murrine engine. This has different names depending on your distro. - * `gtk-engine-murrine` (Arch Linux) - * `gtk2-engines-murrine` (Debian, Ubuntu, elementary OS) - * `gtk-murrine-engine` (Fedora) - * `gtk2-engine-murrine` (openSUSE) - * `gtk-engines-murrine` (Gentoo) - -Main distributions that meet these requirements are - -* Arch Linux and Arch Linux based distros -* Ubuntu 15.04 or newer (**Ubuntu 14.04 and 14.10 are not supported**) -* elementary OS Freya/Loki -* Debian 8, Testing or Unstable -* Gentoo -* Fedora 21 or newer -* openSUSE 13.2, Leap 42.1 and Tumbleweed - -If your distribution isn't listed, please check the requirements yourself. - ### Installation **Important:** Remove all older versions of the theme from your system before you proceed any further. @@ -52,9 +29,10 @@ Arch Linux users can install the theme from the AUR https://aur.archlinux.org/pa #### Manual Installation -To build the theme you'll need +To build the theme the follwing packages are required * `autoconf` * `automake` +* `sassc` * `pkg-config` or `pkgconfig` for Fedora * `libgtk-3-dev` for Debian based distros or `gtk3-devel` for RPM based distros * `git` to clone the source directory @@ -62,7 +40,7 @@ To build the theme you'll need **Note:** For distributions which don't ship separate development packages, just the GTK 3 package is needed instead of the `-dev` packages. For the theme to function properly, install the following -* GNOME Shell 3.14 - 3.24, GTK 3.14 - 3.22 +* GNOME Shell 3.18 - 3.26, GTK 3.18 - 3.22 * The `gnome-themes-standard` package * The murrine engine. This has different names depending on the distro. * `gtk-engine-murrine` (Arch Linux) @@ -77,7 +55,7 @@ Install the theme with the following commands If you want to install the latest version from git, clone the repository with - git clone https://github.com/andreisergiu98/arc-flatabulous-theme && cd arc-flatabulous-theme + git clone https://github.com/andreisergiu98/arc-flatabulous-theme --depth 1 && cd arc-flatabulous-theme **2. Build and install the theme** @@ -97,12 +75,14 @@ Other options to pass to autogen.sh are --disable-metacity disable Metacity support --disable-unity disable Unity support --disable-xfwm disable XFWM support + --disable-plank disable Plank theme support - --with-gnome= build the theme for a specific GNOME version (3.14, 3.16, 3.18, 3.20, 3.22) + --with-gnome= build the theme for a specific GNOME version (3.18, 3.20, 3.22) Note 1: Normally the correct version is detected automatically and this option should not be needed. - Note 2: For GNOME 3.24, use --with-gnome-version=3.22 + Note 2: For GNOME 3.24 and 3.26, use --with-gnome-version=3.22 (this works for now, the build system will be improved in the future) + --with-custom=