Commit 9b02e62e authored by Jeremy Bicha's avatar Jeremy Bicha

Update upstream source from tag 'upstream/2.6.7'

Update to upstream version '2.6.7'
with Debian dir 877c9169d5df2026404c18bd182843749c98de79
parents 6eb0c14f 635fd69d
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org
root = true
[*]
# change these settings to your own preference
indent_style = space
indent_size = 4
# we recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
trim_trailing_whitespace = false
[*.yml]
indent_style = space
indent_size = 2
[Makefile]
indent_style = tab
indent_size = 4
[*.sh]
indent_style = tab
indent_size = 4
This diff is collapsed.
# Ignore Backup Copies from Text Editor
*~
# Ignore SASS files
.sass-cache
gtk.gresource
dist
# Jetbrains IDEs
.idea
*.iml
scss:
config_file: .scss-lint.yml
linters:
BangFormat:
enabled: true
space_before_bang: true
space_after_bang: false
BorderZero:
enabled: true
ColorKeyword:
enabled: true
ColorVariable:
enabled: true
Comment:
enabled: false
DebugStatement:
enabled: true
DeclarationOrder:
enabled: true
DisableLinterReason:
enabled: false
DuplicateProperty:
enabled: true
ElsePlacement:
enabled: true
style: same_line
EmptyLineBetweenBlocks:
enabled: true
ignore_single_line_blocks: false
EmptyRule:
enabled: true
ExtendDirective:
enabled: false
FinalNewline:
enabled: true
present: true
HexLength:
enabled: true
style: short
HexNotation:
enabled: true
style: lowercase
HexValidation:
enabled: true
IdSelector:
enabled: false
ImportantRule:
enabled: true
ImportPath:
enabled: true
leading_underscore: false
filename_extension: false
Indentation:
enabled: true
character: space
width: 4
LeadingZero:
enabled: true
style: exclude_zero
MergeableSelector:
enabled: false
NameFormat:
enabled: false
convention: hyphenated_lowercase
NestingDepth:
enabled: true
max_depth: 5
PlaceholderInExtend:
enabled: false
PropertyCount:
enabled: false
PropertySortOrder:
enabled: false
PropertySpelling:
enabled: true
extra_properties: [ "icon-shadow", "outline-radius" ]
PropertyUnits:
enabled: true
global: [ "px", "%", "s", "ms" ]
PseudoElement:
enabled: false
QualifyingElement:
enabled: false
allow_element_with_attribute: false
allow_element_with_class: false
allow_element_with_id: false
SelectorDepth:
enabled: true
max_depth: 5
SelectorFormat:
enabled: false
convention: hyphenated_lowercase
Shorthand:
enabled: true
SingleLinePerProperty:
enabled: true
allow_single_line_rule_sets: true
SingleLinePerSelector:
enabled: false
SpaceAfterComma:
enabled: true
SpaceAfterPropertyColon:
enabled: true
style: one_space
SpaceAfterPropertyName:
enabled: true
SpaceAfterVariableName:
enabled: true
SpaceAroundOperator:
enabled: true
SpaceBeforeBrace:
enabled: true
style: space
allow_single_line_padding: true
SpaceBetweenParens:
enabled: true
spaces: 0
StringQuotes:
enabled: true
style: double_quotes
TrailingSemicolon:
enabled: true
TrailingZero:
enabled: true
UnnecessaryMantissa:
enabled: true
UnnecessaryParentReference:
enabled: true
UrlFormat:
enabled: false
UrlQuotes:
enabled: true
VariableForProperty:
enabled: false
VendorPrefix:
enabled: false
identifier_list: base
include: []
exclude: []
ZeroUnit:
enabled: true
Compass::*:
enabled: false
This diff is collapsed.
# Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
## Scope
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@numixproject.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
Simon Steinbeiß <simon.steinbeiss@univie.ac.at>
Joern Konopka <cldx3000@googlemail.com>
Georgi Karavasilev <motorslav@gmail.com>
David Barr <dpbarr@gmail.com>
This diff is collapsed.
SASS=scss
SASSFLAGS=--sourcemap=none
GLIB_COMPILE_RESOURCES=glib-compile-resources
RES_DIR=src/gtk-3.0
SCSS_DIR=$(RES_DIR)/scss
DIST_DIR=$(RES_DIR)/dist
RES_DIR320=src/gtk-3.20
SCSS_DIR320=$(RES_DIR320)/scss
DIST_DIR320=$(RES_DIR320)/dist
INSTALL_DIR=$(DESTDIR)/usr/share/themes/Numix
ROOT_DIR=${PWD}
UTILS=scripts/utils.sh
all: clean gresource
css:
$(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR)
$(SASS) --update $(SASSFLAGS) $(SCSS_DIR320):$(DIST_DIR320)
gresource: css
$(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml
$(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR320) $(RES_DIR320)/gtk.gresource.xml
watch: clean
while true; do \
make gresource; \
inotifywait @gtk.gresource -qr -e modify -e create -e delete $(RES_DIR); \
done
clean:
rm -rf $(DIST_DIR)
rm -f $(RES_DIR)/gtk.gresource
rm -rf $(DIST_DIR320)
rm -f $(RES_DIR320)/gtk.gresource
rm -rf $(ROOT_DIR)/dist
install: all
$(UTILS) install $(INSTALL_DIR)
uninstall:
rm -rf $(INSTALL_DIR)
changes:
$(UTILS) changes
zip: all
mkdir $(ROOT_DIR)/dist
$(UTILS) install $(ROOT_DIR)/dist/$$(basename $(INSTALL_DIR))
cd $(ROOT_DIR)/dist && zip --symlinks -rq $$(basename $(INSTALL_DIR)) $$(basename $(INSTALL_DIR))
.PHONY: all
.PHONY: css
.PHONY: watch
.PHONY: gresource
.PHONY: clean
.PHONY: install
.PHONY: uninstall
.PHONY: changes
.DEFAULT_GOAL := all
# vim: set ts=4 sw=4 tw=0 noet :
## Numix
##### A modern flat theme with a combination of light and dark elements. It supports GNOME, Unity, Xfce and Openbox.
[![By The Numix Project](https://img.shields.io/badge/By-The%20Numix%20Project-f0544c.svg?style=flat-square)](https://numixproject.org/) &nbsp;[![Circle CI](https://img.shields.io/circleci/project/numixproject/numix-gtk-theme/master.svg?circle-token=b14acf911433d315298235b0c2fbf7b2670a92a8&maxAge=3600&style=flat-square)](https://circleci.com/gh/numixproject/numix-gtk-theme/tree/master) &nbsp;[![GitHub release](https://img.shields.io/github/release/numixproject/numix-gtk-theme.svg?maxAge=3600&style=flat-square)](https://github.com/numixproject/numix-gtk-theme/releases/latest) &nbsp;![Supports GTK+ 3.18](https://img.shields.io/badge/GTK%2B-3.18-4a90d9.svg?style=flat-square) &nbsp;![Supports GTK+ 3.24](https://img.shields.io/badge/GTK%2B-3.24-4a90d9.svg?style=flat-square)
## Install It
### Distro Packages
|Distro|Install Command/Links|
|:----:|:----:|
|![arch][arch] &nbsp;![antergos][antergos]|`sudo pacman -S numix-gtk-theme`|
|![opensuse][opensuse]|[1 Click Install](http://software.opensuse.org/ymp/openSUSE:Factory/standard/numix-gtk-theme.ymp) &nbsp;\|&nbsp; [OBS Repo](http://software.opensuse.org/download.html?project=openSUSE%3AFactory&package=numix-gtk-theme)|
|![fedora][fedora]|`sudo dnf install numix-gtk-theme`|
|![debian][debian] &nbsp;![ubuntu][ubuntu]|`sudo apt install numix-gtk-theme`|
## Build It
First, you need to compile the theme using the [Sass](http://sass-lang.com/) compiler.
To install Sass, install Ruby and the gem command using your distribution's package manager. Then install `sass` with the `gem` command,
`gem install sass` (not needed for Ubuntu/Debian)
You'll also need the ```glib-compile-schemas``` and ```gdk-pixbuf-pixdata``` commands in your path to generate the gresource binary. Install them using your distribution's package manager.
|Distro|Commands|
|:----:|:----:|
|![arch][arch] &nbsp;![antergos][antergos]|`sudo pacman -S glib2 gdk-pixbuf2`|
|![opensuse][opensuse]|`sudo zipper install glib2-devel gdk-pixbuf-devel`|
|![fedora][fedora]|`sudo dnf install glib2-devel gdk-pixbuf2-devel`|
|![debian][debian] &nbsp;![ubuntu][ubuntu]|`sudo apt-get install ruby-sass libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils`|
After installing all the dependencies, change to the cloned directory and, run the following in Terminal,
```sh
sudo make install
```
To set the theme in GNOME, run the following commands in Terminal,
```sh
gsettings set org.gnome.desktop.interface gtk-theme "Numix"
gsettings set org.gnome.desktop.wm.preferences theme "Numix"
```
To set the theme in Xfce, run the following commands in Terminal,
```sh
xfconf-query -c xsettings -p /Net/ThemeName -s "Numix"
xfconf-query -c xfwm4 -p /general/theme -s "Numix"
```
### For contributors
Start by reviewing the [guidelines for contributing](https://github.com/numixproject/numix-gtk-theme/blob/master/.github/CONTRIBUTING.md).
#### For developers
If you want to hack on the theme, make sure you have the `inotifywait` command available, which is used for watching and automatically building the files.
To start watching for changes, run the following,
```sh
make watch
```
If you change any assets, you'll need to regenerate the `gtk.gresource.xml` and `gtk.gresource` files. You can use [grrr](https://github.com/satya164/grrr) to do it easily.
### Requirements
GTK+ 3.18 or above
Murrine theme engine
### Code and license
Report bugs or contribute at [GitHub](https://github.com/numixproject/numix-gtk-theme)
License: GPL-3.0+
[antergos]: https://antergos.com/distro-logos/logo-square26x26.png "antergos"
[arch]: https://antergos.com/distro-logos/archlogo26x26.png "arch"
[fedora]: https://antergos.com/distro-logos/fedora-logo.png "fedora"
[openSUSE]: https://antergos.com/distro-logos/Geeko-button-bling7.png "openSUSE"
[ubuntu]: https://antergos.com/distro-logos/ubuntu_orange_hex.png "ubuntu"
[debian]: https://antergos.com/distro-logos/openlogo-nd-25.png "debian"
machine:
ruby:
version: 2.3.0
#! /bin/bash
INKSCAPE="/usr/bin/inkscape"
OPTIPNG="/usr/bin/optipng"
SRC_FILE="../src/assets/all-assets.svg"
ASSETS_DIR="../src/assets"
INDEX="../src/assets/all-assets.txt"
for i in `cat $INDEX`
do
if [ -f $ASSETS_DIR/$i.png ]; then
echo $ASSETS_DIR/$i.png exists.
else
echo
echo Rendering $ASSETS_DIR/$i.png
$INKSCAPE --export-id=$i \
--export-id-only \
--export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null #\
# && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
fi
if [ -f $ASSETS_DIR/$i@2.png ]; then
echo $ASSETS_DIR/$i@2.png exists.
else
echo
echo Rendering $ASSETS_DIR/$i@2.png
$INKSCAPE --export-id=$i \
--export-dpi=180 \
--export-id-only \
--export-png=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null #\
# && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png
fi
done
exit 0
#!/bin/bash
do_install() {
local GTKDIR GTK320DIR GTKVER INSTALL_DIR
INSTALL_DIR="$1"
GTKDIR="${INSTALL_DIR}/gtk-3.0"
GTK320DIR="${INSTALL_DIR}/gtk-3.20"
install -dm755 "${INSTALL_DIR}"
cd src
cp index.theme "${INSTALL_DIR}"
cp -rt "${INSTALL_DIR}" \
assets gtk-2.0 metacity-1 openbox-3 xfce-notify-4.0 xfwm4 unity
for _DIR in "${GTKDIR}" "${GTK320DIR}"
do
GTKVER="${_DIR##*/}"
mkdir -p "${_DIR}"
cp -t "${_DIR}" \
"${GTKVER}/gtk.css" \
"${GTKVER}/gtk-dark.css" \
"${GTKVER}/gtk.gresource" \
"${GTKVER}/thumbnail.png"
cd "${_DIR}"
ln -srf ../assets assets
cd -
done
}
output_changes_file_version_marker() {
line() {
dashes="$(printf '%0.s-' $(seq 1 13))"
echo "${dashes}>>>> $1 <<<<${dashes}"
}
tag_line="$(line $1)"
echo "-${tag_line}${tag_line}${tag_line}-"
}
update_changes_file() {
LAST_STABLE_RELEASE=$(git describe --abbrev=0 --tags $(git rev-list --tags --max-count=1))
LAST_MAJOR_MINOR="${LAST_STABLE_RELEASE%.*}"
LAST_MAJOR="${LAST_STABLE_RELEASE%%.*}"
LAST_MINOR="${LAST_MAJOR_MINOR#*.}"
LAST_PATCH="${LAST_STABLE_RELEASE##*.}"
case "${PWD##*/}" in
numix-gtk-theme)
NEXT_PATCH=$(($LAST_PATCH + 1))
NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}"
;;
Numix-Frost)
LAST_MAJOR=$(($LAST_MAJOR + 1))
NEXT_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}"
LAST_PATCH=$(($LAST_PATCH - 1))
LAST_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}"
;;
*)
echo 'Unknown directory!' && exit 1
;;
esac
[[ -f CHANGES ]] && mv CHANGES CHANGES.old
output_changes_file_version_marker "${NEXT_STABLE_RELEASE}" > CHANGES
{ git log \
--pretty=format:"[%ai] %<(69,trunc) %s %><(15) %aN {%h}" \
--cherry-pick "${LAST_STABLE_RELEASE}...HEAD"; } >> CHANGES
[[ -f CHANGES.old ]] && echo "" >> CHANGES && cat CHANGES.old >> CHANGES && rm CHANGES.old
git add CHANGES
git commit -m 'RELEASE PREP :: Update CHANGES file.'
git push
}
case $1 in
changes)
update_changes_file
exit $?
;;
install)
do_install "$2"
;;
*)
exit 0
;;
esac
This diff is collapsed.