Merge pull request #20 from shimmerproject/master

Various bug fixes and reworked granite support
pull/22/merge
Satyajit Sahoo 2013-03-23 05:37:18 -07:00
commit fcecf40751
6 changed files with 347 additions and 155 deletions

25
README
View File

@ -1,3 +1,24 @@
Name: Numix
Summary: A flat and light theme with a modern look
Numix is a modern looking flat theme for Gnome. It supports Gnome, Unity, Pantheon, XFCE and Openbox. The theme is compatible with GTK 3.6. It also includes a GTK 2.0 theme using Murrine engine.
---
Ubuntu users can install Numix from our themes PPA using the following commands,
sudo add-apt-repository ppa:satyajit-happy/themes
sudo apt-get update && sudo apt-get install numix-gtk-theme
---
Installation Instructions for other distros:
Extract the zip file to the themes directory i.e. "~/.themes/" or "/usr/share/themes/"
Use Gnome Tweak tool to choose the theme, or run the following commands in Terminal,
gsettings set org.gnome.desktop.interface gtk-theme "Numix"
gsettings set org.gnome.desktop.wm.preferences theme "Numix"
---
License: GPL-3.0+

View File

@ -500,6 +500,10 @@ widget "*gimmie*" style "bold-panel-item"
# XFCE Styles
style "workspace-switcher" = "murrine-panel" {
bg[SELECTED] = @selected_bg_color
}
style "xfce-header" {
bg[NORMAL] = shade (0.9, @bg_color)
base[NORMAL] = shade (1.18, @bg_color)
@ -549,6 +553,8 @@ style "xfsm-logout" {
}
}
widget "*WnckPager*" style "workspace-switcher"
widget "*Xfce*Panel*" style "murrine-panel"
class "*Xfce*Panel*" style "murrine-panel"

View File

@ -1,27 +1,32 @@
/*********************
* dynamic notebooks *
*********************/
/********************
* dynamic notebook *
********************/
.dynamic-notebook {
background-color: shade(@theme_bg_color, 1.08);
background-image: none;
}
.dynamic-notebook GtkLabel,
.dynamic-notebook GtkImage {
color: alpha(@theme_fg_color, 0.5);
}
.dynamic-notebook .notebook {
-GtkNotebook-tab-overlap: 3px;
-GtkNotebook-initial-gap: 5px;
border-width: 1px 0 0 0;
border-color: shade(@theme_bg_color, 0.8);
border-radius: 0;
padding: 1px 0 0 0;
}
.dynamic-notebook .notebook tab {
padding: 2px 3px 0 3px;
border-width: 0 1px 0 0;
border-color: shade(@theme_bg_color, 0.8);
border-radius: 0;
background-color: transparent;
padding: 3px;
border-color: shade(@theme_bg_color, 0.85);
border-radius: 2px;
background-color: shade(@theme_bg_color, 0.9);
background-image: none;
color: @theme_fg_color;
}
.dynamic-notebook .notebook tab:nth-child(first) {
@ -36,26 +41,30 @@
color: @theme_fg_color;
}
.dynamic-notebook .button,
.dynamic-notebook .notebook tab .entry {
border-radius: 2px;
padding: 4px 3px;
}
.dynamic-notebook .button:hover,
.dynamic-notebook .button:hover:active,
.dynamic-notebook .notebook .button,
.dynamic-notebook .notebook .button:hover,
.dynamic-notebook .notebook .button:hover:active {
padding: 0;
background-color: transparent;
border-color: shade(@theme_bg_color, 0.7);
background-color: shade(@theme_bg_color, 1.10);
background-image: none;
}
.dynamic-notebook .button:hover:active,
.dynamic-notebook .notebook .button:hover:active {
border-color: shade(@theme_bg_color, 0.7);
color: shade(@theme_fg_color, 0.7);
}
/****************
* content view *
****************/
.content-view,
.content-view *,
.content-view GtkViewport {
background-color: @theme_base_color;
}
.content-view-window {
border-width: 1px;
border-style: solid;
@ -65,85 +74,104 @@
color: @theme_fg_color;
}
.content-view,
.content-view GtkViewport {
background-color: @theme_base_color;
}
.content-view * {
background-color: transparent;
background-image: none;
}
.content-view .entry {
background-color: @theme_base_color;
background-image: none;
color: @theme_text_color;
}
.content-view .title,
.content-view .option-title {
color: @theme_text_color;
}
.content-view .subtitle,
.content-view .option-description {
color: mix(@theme_fg_color, @theme_bg_color, 0.5);
}
.content-view .button {
border-style: solid;
border-color: shade(@theme_bg_color, 0.8);
border-radius: 2px;
background-color: shade(@theme_bg_color, 1.08);
background-image: none;
color: @theme_fg_color;
}
.content-view .button:active,
.content-view .button:active:hover {
.content-view .button:hover {
border-color: shade(@theme_bg_color, 0.7);
background-color: shade(@theme_bg_color, 1.10);
background-image: none;
}
.content-view .button:active {
border-color: shade(@theme_bg_color, 0.8);
background-color: shade(@theme_bg_color, 0.95);
background-image: none;
}
.content-view .button:active:hover {
border-color: shade(@theme_bg_color, 0.7);
color: shade(@theme_fg_color, 0.7);
}
.content-view .button:insensitive {
background-color: shade(@theme_bg_color, 0.9);
background-image: none;
}
.content-view .help_button * {
color: @theme_text_color;
color: @theme_fg_color;
}
.content-view .toolbar {
-GtkWidget-window-dragging: true;
padding: 1px;
border-width: 0 0 1px 0;
border-style: solid;
border-color: shade(@theme_bg_color, 0.8);
background-color: @theme_bg_color;
background-image: none;
-GtkWidget-window-dragging: true;
}
/*******************
* album list view *
*******************/
.album-list-view,
.album-list-view * {
border-color: shade(@theme_bg_color, 0.8);
/**************
* sourcelist *
*************/
.source-list,
.source-list.view {
border-radius: 0;
background-color: @theme_base_color;
color: @theme_fg_color;
background-color: @theme_bg_color;
color: mix(@theme_fg_color, @theme_bg_color, 0.1);
}
.album-list-view GtkTreeView {
.source-list {
-GtkTreeView-horizontal-separator: 1;
-GtkTreeView-vertical-separator: 1;
-GtkTreeView-grid-line-width: 0;
background-color: @theme_base_color;
color: @theme_fg_color;
}
.album-list-view GtkTreeView row:nth-child(even) {
border-width: 0;
border-style: none;
background-color: shade(@theme_base_color, 0.97);
.source-list.view:selected,
.source-list.view:prelight:selected {
background-color: @theme_selected_bg_color;
color: @theme_selected_fg_color;
}
.album-list-view GtkTreeView row:nth-child(odd) {
.source-list.view:prelight {
background-color: shade(@theme_bg_color, 1.08);
}
.source-list.badge,
.source-list.badge:prelight,
.source-list.badge:selected,
.source-list.badge:prelight:selected {
margin: 0 3px;
padding: 0 6px;
border-width: 0;
border-style: none;
background-color: shade(@theme_base_color, 1.0);
border-radius: 10px;
background-color: @theme_selected_bg_color;
background-image: none;
color: @theme_selected_fg_color;
}
/*************
@ -158,13 +186,13 @@ GraniteWidgetsStatusBar {
/***********
* popover *
***********/
**********/
GraniteWidgetsPopOver {
-GraniteWidgetsPopOver-arrow-width: 24;
-GraniteWidgetsPopOver-arrow-width: 21;
-GraniteWidgetsPopOver-arrow-height: 12;
-GraniteWidgetsPopOver-border-radius: 5px;
-GraniteWidgetsPopOver-border-radius: 2px;
-GraniteWidgetsPopOver-border-width: 1;
-GraniteWidgetsPopOver-shadow-size: 15;
-GraniteWidgetsPopOver-shadow-size: 12;
margin: 0;
border-style: solid;
@ -186,26 +214,40 @@ GraniteWidgetsPopOver * {
color: @menu_fg_color;
}
GraniteWidgetsPopOver .sidebar.view:selected,
GraniteWidgetsPopOver .sidebar.view:selected:focus,
GraniteWidgetsPopOver *:selected,
GraniteWidgetsPopOver *:selected:focus {
background-color: @theme_selected_bg_color;
color: @theme_selected_fg_color;
}
GraniteWidgetsPopOver .button {
border-color: shade(@menu_bg_color, 0.8);
background-color: shade(@menu_bg_color, 1.08);
background-image: none;
color: @menu_fg_color;
}
GraniteWidgetsPopOver .button:hover {
border-color: shade(@menu_bg_color, 0.7);
background-color: shade(@menu_bg_color, 1.10);
background-image: none;
color: shade(@menu_fg_color, 0.7);
}
GraniteWidgetsPopOver .button:active,
GraniteWidgetsPopOver .button:hover:active {
GraniteWidgetsPopOver .button:active {
border-color: shade(@menu_bg_color, 0.8);
background-color: shade(@menu_bg_color, 0.95);
background-image: none;
}
GraniteWidgetsPopOver .button:active:hover {
border-color: shade(@menu_bg_color, 0.7);
color: shade(@menu_fg_color, 0.7);
}
GraniteWidgetsPopOver .entry {
border-color: shade(@menu_bg_color, 0.7);
background-color: @menu_bg_color;
@ -218,25 +260,125 @@ GraniteWidgetsPopOver .entry:focus {
border-color: shade(@menu_bg_color, 0.7);
}
GraniteWidgetsPopOver *.separator {
border-color: shade(@menu_bg_color, 0.9);
color: transparent;
}
.button.app {
border-width: 0;
border-radius: 2px;
background-color: transparent;
}
.app:hover,
.app:focus {
border-color: shade(@theme_selected_bg_color, 0.90);
.button.app:hover {
border-color: shade(@theme_selected_bg_color, 0.9);
background-color: @theme_selected_bg_color;
background-image: none;
color: @theme_selected_fg_color;
}
/*************
* wingpanel *
*************/
.button.app:focus {
border-color: shade(@theme_selected_bg_color, 0.9);
background-color: @theme_selected_bg_color;
background-image: none;
color: @theme_selected_fg_color;
}
/********
* gala *
*******/
.gala-workspaces-background {
border-width: 1px 0 0 0;
border-color: shade(@panel_bg_color, 0.8);
background-color: @panel_bg_color;
background-image: none;
}
.gala-workspace-selected {
border-width: 1px;
border-radius: 2px;
border-color: shade(@theme_selected_bg_color, 0.9);
background-color: @theme_selected_bg_color;
background-image: none;
}
/*********
* files *
********/
.files-overlay-bar {
margin: 3px;
padding: 3px 6px;
border-width: 0;
border-radius: 2px;
background-color: @theme_tooltip_bg_color;
}
.files-overlay-bar* {
color: @theme_tooltip_fg_color;
}
/*********
* noise *
********/
.album-list-view,
.album-list-view * {
border-color: shade(@theme_bg_color, 0.8);
border-radius: 0;
background-color: @theme_base_color;
color: @theme_fg_color;
}
.album-list-view GtkTreeView {
-GtkTreeView-vertical-separator: 1;
-GtkTreeView-grid-line-width: 0;
background-color: @theme_base_color;
color: @theme_fg_color;
}
.album-list-view GtkTreeView row:nth-child(even) {
border-width: 0;
border-style: none;
background-color: shade(@theme_base_color, 0.97);
}
.album-list-view GtkTreeView row:nth-child(odd) {
border-width: 0;
border-style: none;
background-color: shade(@theme_base_color, 1.0);
}
.album-list-view GtkTreeView row:selected {
background-color: @selected_bg_color;
color: @selected_fg_color;
}
/**********
* notify *
*********/
.notify {
border-width: 1px;
border-style: solid;
border-color: shade(@theme_base_color, 0.7);
border-radius: 2px;
background-color: @theme_base_color;
color: @theme_text_color;
}
.notify .low {
}
.notify .critical {
}
/*********
* panel *
********/
.panel {
background-color: alpha(#000, 0.6);
color: #fff;
background-color: @panel_bg_color;
color: @panel_fg_color;
}
.shadow {
@ -252,7 +394,7 @@ GraniteWidgetsPopOver .entry:focus {
.wingpanel-indicator-button {
padding: 0 2px;
background-color: transparent;
color: #fff;
color: @panel_fg_color;
}
.composited-indicator.menuitem:active,
@ -260,21 +402,3 @@ GraniteWidgetsPopOver .entry:focus {
border-style: none;
background-image: none;
}
/**********
* notify *
**********/
.notify {
border-width: 1px;
border-style: solid;
border-color: shade(@theme_bg_color, 0.8);
border-radius: 2px;
background-color: @theme_base_color;
color: @theme_text_color;
}
.notify .low {
}
.notify .critical {
}

View File

@ -378,8 +378,6 @@ GtkAssistant .sidebar {
.cell {
border-width: 0;
border-radius: 0;
background-color: @theme_base_color;
color: @theme_text_color;
}
.cell:selected,
@ -426,13 +424,14 @@ column-header .button:active {
}
column-header .button {
border-color: shade(@theme_bg_color, 0.8);
background-color: shade(@theme_bg_color, 1.08);
border-color: shade(@theme_base_color, 0.8);
background-color: shade(@theme_base_color, 0.95);
background-image: none;
}
column-header .button:hover {
background-color: shade(@theme_bg_color, 1.10);
border-color: shade(@theme_base_color, 0.7);
background-color: shade(@theme_base_color, 0.97);
background-image: none;
}
@ -440,6 +439,49 @@ column-header:last-child .button {
border-width: 0 0 1px 0;
}
/****************
* content view *
****************/
.content-view.view {
background-color: @theme_base_color;
}
.content-view.view:prelight {
background-color: alpha(@theme_selected_bg_color, 0.6);
}
.content-view.view:selected,
.content-view.view:active {
background-color: @theme_selected_bg_color;
}
.content-view.view:insensitive {
background-color: shade(@theme_base_color, 0.9);
}
GdMainIconView.content-view {
-GdMainIconView-icon-size: 40;
}
GtkIconView.content-view.check {
background-color: transparent;
}
GtkIconView.content-view.check:active {
background-color: transparent;
}
.content-view.view.check,
.content-view.view.check:active {
background-color: transparent;
}
GtkIconView.content-view.check:prelight,
GtkIconView.content-view.check:insensitive,
GtkIconView.content-view.check:selected {
background-color: transparent;
}
/****************
* drawing area *
****************/
@ -498,7 +540,7 @@ GtkCalendar.button:insensitive {
GtkCalendar.highlight {
border-width: 0;
background-color: transparent;
color: @selected_bg_color;
color: @theme_selected_bg_color;
}
/******************
@ -591,18 +633,16 @@ GtkComboBox.combobox-entry .button:insensitive {
/************
* iconview *
************/
GtkIconView {
background-color: transparent;
}
GtkIconView.view.cell:selected,
GtkIconView.view.cell:selected:focus {
border-width: 1px;
border-style: solid;
border-color: shade(@theme_selected_bg_color, 0.9);
border-radius: 2px;
background-color: @theme_selected_bg_color;
background-image: none;
background-image: -gtk-gradient(linear, left top, left bottom,
from (@theme_selected_bg_color),
to (@theme_selected_bg_color));
color: @theme_selected_fg_color;
}
@ -780,7 +820,7 @@ GtkInfoBar {
.dim-label:selected,
.dim-label:selected:focus {
color: mix(@theme_selected_fg_color, @theme_bg_color, 0.5);
color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.5);
}
.dnd {
@ -1655,10 +1695,7 @@ GtkTextView {
}
.primary-toolbar GtkComboBox,
.primary-toolbar GtkComboBox .cell
.primary-toolbar .button *,
.primary-toolbar .button,
.toolbar GtkComboBox .cell {
.primary-toolbar .button {
padding: 2px;
border-width: 1px;
border-color: transparent;
@ -1670,6 +1707,7 @@ GtkTextView {
.primary-toolbar .raised .button,
.primary-toolbar .raised.button,
.toolbar GtkComboBox,
.toolbar .button {
border-color: shade(@toolbar_bg_color, 0.8);
background-color: shade(@toolbar_bg_color, 1.08);
@ -1678,8 +1716,7 @@ GtkTextView {
}
.primary-toolbar .button:hover,
.toolbar .button:hover,
.toolbar GtkComboBox .cell:hover {
.toolbar .button:hover {
border-color: shade(@toolbar_bg_color, 0.7);
background-color: shade(@toolbar_bg_color, 1.10);
background-image: none;
@ -1948,10 +1985,6 @@ GtkTreeView .entry {
/************
* viewport *
************/
GtkViewport {
background-color: transparent;
}
GtkViewport.frame {
border-width: 0;
}

View File

@ -2,21 +2,21 @@
# Author: Satyajit Sahoo <satyajit.happy@gmail.com>
# License: GPL-3.0+
### Menu
# Menu
menu.border.color: #2d2d2d
menu.title.bg: Flat Solid
menu.title.bg: flat solid
menu.title.bg.color: #2d2d2d
menu.title.bg.border.color: #2d2d2d
menu.title.text.color: #dcdcdc
menu.title.text.justify: Center
menu.title.text.justify: center
menu.items.bg: Flat Solid
menu.items.bg: flat solid
menu.items.bg.color: #2d2d2d
menu.items.text.color: #dcdcdc
menu.items.disabled.text.color: #888888
menu.items.active.bg: Flat Solid
menu.items.active.bg: flat solid
menu.items.active.bg.color: #d64937
menu.items.active.text.color: #f9f9f9
@ -26,85 +26,93 @@ menu.separator.padding.width: 2
menu.separator.padding.height: 4
### Window active
window.active.title.bg: Flat Border Solid
# Active window
window.active.border.color: #2d2d2d
window.active.title.bg: flat solid
window.active.title.bg.color: #2d2d2d
window.active.title.bg.border.color: #2d2d2d
window.active.title.separator.color: #2d2d2d
window.active.text.justify: center
window.active.label.bg: Parentrelative
window.active.label.bg: parentrelative
window.active.label.text.color: #dcdcdc
window.active.handle.bg: Flat Border Solid
window.active.handle.bg: flat solid
window.active.handle.bg.color: #2d2d2d
window.active.handle.bg.border.color: #2d2d2d
window.active.grip.bg: Flat Border Solid
window.active.grip.bg: flat solid
window.active.grip.bg.color: #2d2d2d
window.active.grip.bg.border.color: #2d2d2d
window.active.button.unpressed.bg: Flat Border Solid
window.active.button.unpressed.bg: flat solid
window.active.button.unpressed.bg.color: #2d2d2d
window.active.button.unpressed.bg.border.color: #2d2d2d
window.active.button.unpressed.image.color: #dcdcdc
window.active.button.pressed.bg: Flat Border Solid
window.active.button.pressed.bg: flat solid
window.active.button.pressed.bg.color: #2d2d2d
window.active.button.pressed.bg.border.color: #2d2d2d
window.active.button.pressed.image.color: #d64937
window.active.button.disabled.bg: Flat Border Solid
window.active.button.disabled.bg: flat solid
window.active.button.disabled.bg.color: #2d2d2d
window.active.button.disabled.bg.border.color: #2d2d2d
window.active.button.disabled.image.color: #888888
### Window inactive
window.inactive.title.bg: Flat Border Solid
# Inactive window
window.inactive.border.color: #2d2d2d
window.inactive.title.bg: flat solid
window.inactive.title.bg.color: #2d2d2d
window.inactive.title.bg.border.color: #2d2d2d
window.inactive.title.separator.color: #2d2d2d
window.inactive.text.justify: center
window.inactive.label.bg: Parentrelative
window.inactive.label.bg: parentrelative
window.inactive.label.text.color: #888888
window.inactive.handle.bg: Flat Border Solid
window.inactive.handle.bg: flat solid
window.inactive.handle.bg.color: #2d2d2d
window.inactive.handle.bg.border.color: #2d2d2d
window.inactive.grip.bg: Flat Border Solid
window.inactive.grip.bg: flat solid
window.inactive.grip.bg.color: #2d2d2d
window.inactive.grip.bg.border.color: #2d2d2d
window.inactive.button.unpressed.bg: Flat Border Solid
window.inactive.button.unpressed.bg: flat solid
window.inactive.button.unpressed.bg.color: #2d2d2d
window.inactive.button.unpressed.bg.border.color: #2d2d2d
window.inactive.button.unpressed.image.color: #888888
window.inactive.button.pressed.bg: Flat Border Solid
window.inactive.button.pressed.bg: flat solid
window.inactive.button.pressed.bg.color: #2d2d2d
window.inactive.button.pressed.bg.border.color: #2d2d2d
window.inactive.button.pressed.image.color: #d64937
window.inactive.button.disabled.bg: Flat Border Solid
window.inactive.button.disabled.bg: flat solid
window.inactive.button.disabled.bg.color: #2d2d2d
window.inactive.button.disabled.bg.border.color: #2d2d2d
window.inactive.button.disabled.image.color: #888888
### Everything else
# OSD
osd.border.color: #2d2d2d
osd.bg: flat solid
osd.bg.color: #2d2d2d
osd.label.bg: flat solid
osd.label.bg.color: #2d2d2d
osd.label.text.color: #dcdcdc
osd.hilight.bg: flat solid
osd.hilight.bg.color: #d64937
osd.unhilight.bg: flat solid
osd.unhilight.bg.color: #888888
# Fonts
window.active.label.text.font:shadow=n
window.inactive.label.text.font:shadow=n
menu.items.font:shadow=n
menu.title.text.font:shadow=n
# Everything else
border.width: 1
padding.width: 4
window.handle.width: 1
window.client.padding.width: 0
window.label.text.justify: center
window.active.border.color: #2d2d2d
window.inactive.border.color: #2d2d2d
### Fonts
window.active.label.text.font:shadow=n
window.inactive.label.text.font:shadow=n
menu.items.font:shadow=n
menu.title.text.font:shadow=n

0
xfwm4/themerc 100755 → 100644
View File