diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md deleted file mode 100644 index 6ae8a9a..0000000 --- a/.github/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,24 +0,0 @@ -# Contributor Code of Conduct - -As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. - -We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. - -Examples of unacceptable behavior by participants include: - -- The use of sexualized language or imagery -- Personal attacks -- Trolling or insulting/derogatory comments -- Public or private harassment -- Publishing other's private information, such as physical or electronic addresses, without explicit permission -- Other unethical or unprofessional conduct - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not inline with this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [numixproject@github.com](mailto:numixproject@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident. - -This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/ diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3e49f2e..1df3271 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -26,7 +26,7 @@ These are just guidelines, not rules, use your best judgment and feel free to pr ### Code of Conduct -This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). +This project adheres to the Contributor Covenant [code of conduct](/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [numixproject@github.com](mailto:numixproject@github.com). diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..287e1d0 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# 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/ diff --git a/README.md b/README.md index 36534cd..890b4d4 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ ## 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/)  [![Circle CI](https://img.shields.io/circleci/project/numixproject/numix-gtk-theme/master.svg?circle-token=b14acf911433d315298235b0c2fbf7b2670a92a8&maxAge=2592000&style=flat-square)](https://circleci.com/gh/numixproject/numix-gtk-theme/tree/master)  [![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)  ![Supports GTK+ 3.18](https://img.shields.io/badge/GTK%2B-3.18-4a90d9.svg?style=flat-square)  ![Supports GTK+ 3.20](https://img.shields.io/badge/GTK%2B-3.22-4a90d9.svg?style=flat-square) +[![By The Numix Project](https://img.shields.io/badge/By-The%20Numix%20Project-f0544c.svg?style=flat-square)](https://numixproject.org/)  [![Circle CI](https://img.shields.io/circleci/project/numixproject/numix-gtk-theme/master.svg?circle-token=b14acf911433d315298235b0c2fbf7b2670a92a8&maxAge=2592000&style=flat-square)](https://circleci.com/gh/numixproject/numix-gtk-theme/tree/master)  [![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)  ![Supports GTK+ 3.18](https://img.shields.io/badge/GTK%2B-3.18-4a90d9.svg?style=flat-square)  ![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]  ![antergos][antergos]|`sudo pacman -S numix-themes`| +|![arch][arch]  ![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)  \|  [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]  ![ubuntu][ubuntu]|`sudo apt install numix-gtk-theme`| diff --git a/src/gtk-2.0/gtkrc b/src/gtk-2.0/gtkrc index 8cda1e1..2729a57 100755 --- a/src/gtk-2.0/gtkrc +++ b/src/gtk-2.0/gtkrc @@ -2,6 +2,8 @@ gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#555555\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#444444\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#444444\ntitlebar_fg_color:#dddddd\nmenubar_bg_color:#444444\nmenubar_fg_color:#dddddd\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#555555\nmenu_bg_color:#444444\nmenu_fg_color:#dddddd\npanel_bg_color:#444444\npanel_fg_color:#dddddd\nlink_color:#f06860" +gtk-icon-sizes = "inkscape-decoration=16,16:gtk-small-toolbar=16,16" + # Default Style style "murrine-default" { diff --git a/src/gtk-3.0/scss/_widgets.scss b/src/gtk-3.0/scss/_widgets.scss index db51b05..d7e68e0 100644 --- a/src/gtk-3.0/scss/_widgets.scss +++ b/src/gtk-3.0/scss/_widgets.scss @@ -35,3 +35,4 @@ @import "apps/unity"; @import "apps/lightdm"; @import "apps/gnome-terminal"; +@import "apps/gnome-applications"; diff --git a/src/gtk-3.0/scss/apps/_gnome-applications.scss b/src/gtk-3.0/scss/apps/_gnome-applications.scss new file mode 100644 index 0000000..9a26efa --- /dev/null +++ b/src/gtk-3.0/scss/apps/_gnome-applications.scss @@ -0,0 +1,10 @@ +/**************** + ! Tilix * +*****************/ + +@include exports("tilix") { + .terminal-titlebar { + border-color: $titlebar_bg_color; + } +} + diff --git a/src/gtk-3.20/scss/apps/_gnome-terminal.scss b/src/gtk-3.20/scss/apps/_gnome-terminal.scss index c23893c..fd3af1c 100644 --- a/src/gtk-3.20/scss/apps/_gnome-terminal.scss +++ b/src/gtk-3.20/scss/apps/_gnome-terminal.scss @@ -1,3 +1,5 @@ +@import "widgets/button"; + /********************** ! Genome Terminal * ***********************/ @@ -35,3 +37,16 @@ } } } + + +/********************** + ! Tilix * +***********************/ + +@include exports("tilix") { + .terminal-titlebar:active { + border-width: 0 0 2px 0; + border-style: solid; + border-color: $selected_bg_color; + } +} diff --git a/src/gtk-3.20/scss/apps/_panel.scss b/src/gtk-3.20/scss/apps/_panel.scss index 814a450..76b9045 100644 --- a/src/gtk-3.20/scss/apps/_panel.scss +++ b/src/gtk-3.20/scss/apps/_panel.scss @@ -54,7 +54,11 @@ color: $black; } - #clock-applet-button { &, &:backdrop { @extend %panelbutton; } } + #clock-applet-button, + #tasklist-button, + #showdesktop-button { + &, &:backdrop { @extend %panelbutton; } + } panel-applet { border: 0; diff --git a/src/metacity-1/metacity-theme-2.xml b/src/metacity-1/metacity-theme-2.xml index b3410ba..0a627e6 100644 --- a/src/metacity-1/metacity-theme-2.xml +++ b/src/metacity-1/metacity-theme-2.xml @@ -990,7 +990,7 @@ - + @@ -1024,7 +1024,7 @@ - + diff --git a/src/metacity-1/metacity-theme-3.xml b/src/metacity-1/metacity-theme-3.xml index c8a6952..9dee0df 100644 --- a/src/metacity-1/metacity-theme-3.xml +++ b/src/metacity-1/metacity-theme-3.xml @@ -1002,7 +1002,7 @@ - + @@ -1036,7 +1036,7 @@ - + diff --git a/src/xfwm4/bottom-active.xpm b/src/xfwm4/bottom-active.xpm index 773d2df..9497d62 100644 --- a/src/xfwm4/bottom-active.xpm +++ b/src/xfwm4/bottom-active.xpm @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_active_xpm[] = { -"8 1 2 1", +"8 5 3 1", " c None", -". c #484848", -"........"}; +". c #444444", +"# c #484848", +"........", +"........", +"........", +"........", +"########"}; diff --git a/src/xfwm4/bottom-inactive.xpm b/src/xfwm4/bottom-inactive.xpm index 7c2fda7..e108e20 100644 --- a/src/xfwm4/bottom-inactive.xpm +++ b/src/xfwm4/bottom-inactive.xpm @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_inactive_xpm[] = { -"8 1 2 1", +"8 5 3 1", " c None", -". c #393939", -"........"}; +". c #444444", +"# c #393939", +"........", +"........", +"........", +"........", +"########"}; diff --git a/src/xfwm4/bottom-left-active.xpm b/src/xfwm4/bottom-left-active.xpm index 46fde54..22fc38e 100644 --- a/src/xfwm4/bottom-left-active.xpm +++ b/src/xfwm4/bottom-left-active.xpm @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_left_active_xpm[] = { -"1 1 2 1", +"24 5 3 1", " c None", -". c #484848", -"."}; +". c #444444", +"# c #484848", +"#.......................", +"#.......................", +"#.......................", +"#.......................", +"########################"}; diff --git a/src/xfwm4/bottom-left-inactive.xpm b/src/xfwm4/bottom-left-inactive.xpm index 1984979..2e039b4 100644 --- a/src/xfwm4/bottom-left-inactive.xpm +++ b/src/xfwm4/bottom-left-inactive.xpm @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_left_inactive_xpm[] = { -"1 1 2 1", +"24 5 3 1", " c None", -". c #393939", -"."}; +". c #444444", +"# c #393939", +"#.......................", +"#.......................", +"#.......................", +"#.......................", +"########################"}; diff --git a/src/xfwm4/bottom-right-active.xpm b/src/xfwm4/bottom-right-active.xpm index 2ef97a5..30aeb3c 100644 --- a/src/xfwm4/bottom-right-active.xpm +++ b/src/xfwm4/bottom-right-active.xpm @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_right_active_xpm[] = { -"1 1 2 1", +"24 5 3 1", " c None", -". c #484848", -"."}; +". c #444444", +"# c #484848", +".......................#", +".......................#", +".......................#", +".......................#", +"########################"}; diff --git a/src/xfwm4/bottom-right-inactive.xpm b/src/xfwm4/bottom-right-inactive.xpm index 7357440..50809f4 100644 --- a/src/xfwm4/bottom-right-inactive.xpm +++ b/src/xfwm4/bottom-right-inactive.xpm @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_right_inactive_xpm[] = { -"1 1 2 1", +"24 5 3 1", " c None", -". c #393939", -"."}; +". c #444444", +"# c #393939", +".......................#", +".......................#", +".......................#", +".......................#", +"########################"};