Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Luke Street
2017-04-15 01:51:54 -04:00
8 changed files with 240 additions and 177 deletions
+21 -24
View File
@@ -4,13 +4,13 @@
## Install It
### Official Distro Packages
### Distro Packages
|Distro|Install Command/Links|
|:----:|:----:|
|![arch](https://dl.dropboxusercontent.com/u/60521097/archlogo26x26.png) ![antergos](https://dl.dropboxusercontent.com/u/60521097/logo-square26x26.png)|`sudo pacman -S numix-themes`|
|![openSUSE](https://dl.dropboxusercontent.com/u/60521097/Geeko-button-bling7.png)|[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](https://dl.dropboxusercontent.com/u/60521097/fedora-logo.png)|`sudo dnf install numix-gtk-theme`|
|[![debian](https://www.debian.org/logos/openlogo-nd-25.jpg)](https://www.debian.org/) ![ubuntu](https://dl.dropboxusercontent.com/u/60521097/ubuntu_orange_hex.png)|`sudo apt install numix-gtk-theme`|
|![arch][arch]  ![antergos][antergos]|`sudo pacman -S numix-themes`|
|![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`|
## Build It
@@ -22,28 +22,16 @@ To install Sass, install Ruby and the gem command using your distribution's pack
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.
#### Debian, Ubuntu
|Distro|Commands|
|:----:|:----:|
|![arch][arch]  ![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]  ![ubuntu][ubuntu]|`sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils`|
```sh
sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils
```
#### Fedora
After installing all the dependencies, change to the cloned directory and, run the following in Terminal,
```sh
sudo dnf install glib2-devel gdk-pixbuf2-devel
```
#### Arch Linux
```sh
sudo pacman -S glib2 gdk-pixbuf2
```
After installing all the dependencies, switch to the cloned directory and, run the following in Terminal,
```sh
make
sudo make install
```
@@ -86,3 +74,12 @@ Murrine theme engine
Report bugs or contribute at [GitHub](https://github.com/numixproject/numix-gtk-theme)
License: GPL-3.0+
[antergos]: https://www.dropbox.com/s/tju7maccr328w87/logo-square26x26.png?dl=1 "antergos"
[arch]: https://www.dropbox.com/s/q8ypd345cqcd0b5/archlogo26x26.png?dl=1 "arch"
[fedora]: https://www.dropbox.com/s/b8q448vuwopb0cl/fedora-logo.png?dl=1 "fedora"
[openSUSE]: https://www.dropbox.com/s/jhirpw85ztgl59h/Geeko-button-bling7.png?dl=1 "openSUSE"
[ubuntu]: https://www.dropbox.com/s/nev98nld2u1qbgl/ubuntu_orange_hex.png?dl=1 "ubuntu"
[debian]: https://www.dropbox.com/s/jg7pypm1zk9qjt6/openlogo-nd-25.png?dl=1 "debian"
+8 -6
View File
@@ -43,9 +43,9 @@
}
%button {
min-height: 16px;
min-width: 16px;
padding: $spacing ($spacing + 2px);
//min-height: 16px;
//min-width: 16px;
padding: $spacing ($spacing + 1);
border-width: 1px;
border-style: solid;
border-radius: $roundness;
@@ -525,8 +525,8 @@
button.combo {
// otherwise the arrow placement is not symmetric
min-width: 0;
padding-left: $spacing + 2px;
padding-right: $spacing + 2px;
//padding-left: $spacing + 1px;
//padding-right: $spacing + 1px;
}
arrow {
@@ -537,9 +537,11 @@
box button, box entry {
@extend %linked_button;
padding: $spacing ($spacing + 2px);
}
//hack to get rid of extra +1px height in linked combobox
//.linked:not(.vertical) button.combo { padding: 4px; }
.linked:not(.vertical) > & > box > button.combo {
// the combo is a composite widget so the way we do button linked doesn't
// work, special case needed. See
+33
View File
@@ -286,6 +286,39 @@
}
}
//gnome-calendar-fix
popover.events {
grid.vertical {
&, & list, & list row, & list box {
margin: 0;
border-radius: 0;
background-color: $menu_bg_color;
}
}
grid.vertical box.vertical {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
}
popover {
list.calendar-list row { padding: 0px; }
datechooser {
& grid.vertical navigator button {
min-height: 20px;
min-width: 20px;
margin: 5px;
}
& grid.horizontal day.day {
min-height: 24px;
min-width: 24px;
}
}
}
modelbutton.flat,
menuitem.button.flat {
padding: ($spacing - 1px) ($spacing + 1px);
+109 -121
View File
@@ -145,28 +145,21 @@
tab {
padding: 0;
border-style: solid;
border-width: 1px; // for reorderable tabs
border-color: transparent; //
background-image: none;
box-shadow: none;
outline: none;
> box,
> label,
> widget > box {
padding: $spacing $spacing * 2; // top/bottom | left/right
border-width: 2px;
border-style: solid;
border-color: transparent;
transition: border-color .2s linear;
padding: ($spacing + 2px) $spacing * 2; // top/bottom | left/right
box-shadow: 1px 1px transparent; //duplicate shadows used for transition?
transition: box-shadow .2s linear;
}
&.reorderable-page {
> box,
> label,
> widget > box {
padding: $spacing $spacing * 2; // top | right | bottom | left
padding: ($spacing + 2px) $spacing * 2; // top | right | bottom | left
}
}
@@ -217,89 +210,29 @@
}
}
&.top tab,
&.bottom tab {
&:hover {
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85);
}
&:last-child:not(:only-child) {
box-shadow: -1px 0 1px shade($base_color, .85);
}
&:first-child:not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .85);
}
}
&:checked {
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8);
}
&:last-child:not(:only-child) {
box-shadow: -1px 0 1px shade($base_color, .8);
}
&:first-child:not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .8);
}
}
}
&.right tab,
&.left tab {
&:hover {
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85);
}
&:last-child:not(:only-child) {
box-shadow: 0 -1px 1px shade($base_color, .85);
}
&:first-child:not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .85);
}
}
&:checked {
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8);
}
&:last-child:not(:only-child) {
box-shadow: 0 -1px 1px shade($base_color, .8);
}
&:first-child:not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .8);
}
}
}
&.top tab {
border-style: solid;
border-color: $borders_color;
border-width: 0;
border-bottom-width: 1px;
transition: border-bottom-color .2s linear;
box-shadow: inset 0 -1px $borders_color;
transition: box-shadow .2s ease-out;
&:hover {
outline: none;
outline: none;
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color;
}
&:last-child:not(:only-child) {
box-shadow: -1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color;
}
&:first-child:not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color;
}
}
&:checked {
border-bottom-color: $selected_bg_color;
outline: none;
> box,
> label,
> widget > box {
border-bottom-color: $selected_bg_color;
}
label {
margin-bottom: 0;
color: $selected_bg_color;
@@ -308,30 +241,46 @@
&:hover {
background-color: mix($bg_color, $base_color, .6);
}
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color;
}
&:last-child:not(:only-child) {
box-shadow: -1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color;
}
&:first-child:not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color;
}
}
}
&.right tab {
border-style: solid;
border-color: $borders_color;
border-width: 0;
border-left-width: 1px;
transition: border-left-color .3s ease-out;
box-shadow: inset 1px 0 $borders_color;
transition: box-shadow .3s ease-out;
&:hover {
outline: none;
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85), inset 1px 0 $borders_color;
}
&:last-child:not(:only-child) {
box-shadow: 0 -1px 1px shade($base_color, .85), inset 1px 0 $borders_color;
}
&:first-child:not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .85), inset 1px 0 $borders_color;
}
}
&:checked {
border-left-color: $selected_bg_color;
outline: none;
> box,
> label,
> widget > box {
border-left-color: $selected_bg_color;
}
label {
margin-left: 0;
color: $selected_bg_color;
@@ -340,30 +289,43 @@
&:hover {
background-color: mix($bg_color, $base_color, .6);
}
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color;
}
&:last-child:not(:only-child) {
box-shadow: 0 -1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color;
}
&:first-child:not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color;
}
}
}
&.bottom tab {
border-style: solid;
border-color: $borders_color;
border-width: 0;
border-top-width: 1px;
transition: border-top-color .3s ease-out;
box-shadow: inset 0 1px $borders_color;
transition: box-shadow .3s ease-out;
&:hover {
outline: none;
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85), inset 0 1px $borders_color;
}
&:last-child:not(:only-child) {
box-shadow: -1px 0 1px shade($base_color, .85), inset 0 1px $borders_color;
}
&:first-child:not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .85), inset 0 1px $borders_color;
}
}
&:checked {
border-top-color: $selected_bg_color;
outline: none;
> box,
> label,
> widget > box {
border-top-color: $selected_bg_color;
}
label {
margin-top: 0;
color: $selected_bg_color;
@@ -372,30 +334,44 @@
&:hover {
background-color: mix($bg_color, $base_color, .6);
}
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color;
}
&:last-child:not(:only-child) {
box-shadow: -1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color;
}
&:first-child:not(:only-child) {
box-shadow: 1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color;
}
}
}
&.left tab {
border-style: solid;
border-color: $borders_color;
border-width: 0;
border-right-width: 1px;
transition: border-right-color .3s ease-out;
box-shadow: inset -1px 0 $borders_color;
transition: box-shadow .3s ease-out;
&:hover {
outline: none;
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85), inset -1px 0 $borders_color;
}
&:last-child:not(:only-child) {
box-shadow: 0 -1px 1px shade($base_color, .85), inset -1px 0 $borders_color;
}
&:first-child:not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .85), inset -1px 0 $borders_color;
}
}
&:checked {
border-right-color: $selected_bg_color;
outline: none;
> box,
> label,
> widget > box {
border-right-color: $selected_bg_color;
}
label {
margin-right: 0;
color: $selected_bg_color;
@@ -404,6 +380,18 @@
&:hover {
background-color: mix($bg_color, $base_color, .6);
}
&:not(:first-child):not(:last-child):not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color;
}
&:last-child:not(:only-child) {
box-shadow: 0 -1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color;
}
&:first-child:not(:only-child) {
box-shadow: 0 1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color;
}
}
}
}
+1 -1
View File
@@ -22,7 +22,7 @@
trough {
border: 1px solid alpha(border_normal($bg_color), .5);
background-color: shade($bg_color, 1.08);
background-color: shade($bg_color, 1.1);
background-image: none;
border-radius: $roundness;
}
+57 -10
View File
@@ -5,7 +5,7 @@
! Toolbar
**********/
@mixin toolbar($bg, $fg) {
@mixin titlebar($bg, $fg) {
@include linear-gradient($bg);
@include border($bg);
@@ -13,7 +13,6 @@
&:disabled {
@include linear-gradient(shade($bg, .9));
color: mix($fg, $bg, .5);
}
@@ -28,22 +27,65 @@
}
button { @include button($bg, $fg); }
.linked > button { @include linked_button($bg); }
combobox, button {
padding: $spacing;
combobox { padding: 4px; }
&.text-button { padding: $spacing; }
separator {
&, &:disabled {
color: shade($bg, ($contrast - .2));
border-color: currentColor;
-GtkWidget-window-dragging: true;
}
}
}
&.image-button { padding: $spacing; }
@mixin toolbar($bg, $fg) {
@include linear-gradient($bg);
@include border($bg);
color: $fg;
&:disabled {
@include linear-gradient(shade($bg, .9));
color: mix($fg, $bg, .5);
}
.title {
font-weight: bold;
padding: 0 ($spacing * 2);
}
.subtitle {
font-size: smaller;
padding: 0 ($spacing * 2);
}
button { @include button($bg, $fg); }
.linked > button { @include linked_button($bg); }
&.horizontal combobox { padding: 4px; }
&.horizontal button {
padding: 4px;
&.text-button { padding: 4px; }
&.image-button { padding: 4px; }
}
&.vertical button {
padding: 5px;
&.text-button { padding: 5px; }
&.image-button { padding: 5px; }
}
separator {
&, &:disabled {
color: shade($bg, ($contrast - .2));
border-color: currentColor;
-GtkWidget-window-dragging: true;
}
}
@@ -81,6 +123,7 @@
%toolbar {
padding: $spacing - 1px;
border-style: none;
-gtk-icon-style: symbolic;
// toolbar separators
&.horizontal separator { margin: 0 ($spacing + 2px) 1px; }
@@ -99,6 +142,11 @@
button { // Size height
margin-top: $spacing + 3px;
margin-bottom: $spacing + 3px;
&.popup { padding: 5px; }
&.image-button { padding: 5px; }
&.text-button.image-button { padding: 5px; }
&.text-button { padding: 5px; }
}
switch { // Size height
@@ -113,7 +161,7 @@
}
%titlebar { // Default headerbar and titlebar code.
@include toolbar($titlebar_bg_color, $titlebar_fg_color);
@include titlebar($titlebar_bg_color, $titlebar_fg_color);
@include linear-gradient($titlebar_bg_color);
border-radius: $roundness $roundness 0 0;
@@ -186,7 +234,6 @@
@include exports("toolbar") {
toolbar {
@include toolbar($toolbar_bg_color, $toolbar_fg_color);
@extend %toolbar;
&.inline-toolbar { @include inline-toolbar($toolbar_bg_color, $toolbar_fg_color); }
+10 -14
View File
@@ -177,9 +177,6 @@
border-radius: $roundness;
border: 1px solid $selected_borders_color;
background-color: $selected_bg_color;
//background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1));
box-shadow: inset 0 1px if($variant == 'light', transparentize($white, .7), transparentize($white, .85)),
0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9));
&:selected {
&:focus, & {
@@ -202,13 +199,12 @@
background-color: mix($backdrop_base_color, $selected_bg_color, .9);
}
&:disabled { background-color: shade($selected_bg_color, 1.08); } //required if disabled state is turned on
}
}
&:disabled {
@include linear-gradient($bg_color);
border-color: border_insensitive($bg_color);
}
&:disabled { background-color: shade($selected_bg_color, 1.08); }
&:backdrop {
@if $variant == 'light' {
@@ -223,20 +219,20 @@
}
&.trough { // progress bar trough in treeviews
background-color: transparentize($fg_color, .9);
border-radius: $roundness;
border: 1px solid alpha(border_normal($bg_color), .5);
background-color: shade($bg_color, 1.1);
&:selected {
&:focus, & {
background-color: if($variant == 'light', transparentize($selected_fg_color, .7), darken($selected_bg_color, .1));
background-color: if($variant == 'light', shade($bg_color, 1.1), darken($selected_bg_color, .1));
@if $variant == 'light' { border: 1px solid $selected_borders_color; }
@if $variant == 'light' {
border-width: 1px 0;
border-style: solid;
border-color: $selected_bg_color;
}
&:disabled { background-color: shade($bg_color, 1.08); }
}
}
&:disabled { background-color: shade($bg_color, 1.08); }
}
header {
+1 -1
View File
@@ -33,7 +33,7 @@
.solid-csd & {
border-radius: 0;
margin: 1px;
background-color: $bg_color;
background-color: $titlebar_bg_color;
// Unity/compiz regression: Issue: https://github.com/numixproject/numix-gtk-theme/issues/206
box-shadow: none;
}