Skip to content

Commit

Permalink
Tweaked colours, fixed bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
xyl0n committed Oct 6, 2013
2 parents 4409283 + 8b11ea6 commit 6e9edcc
Show file tree
Hide file tree
Showing 7 changed files with 211 additions and 49 deletions.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Iris is a modern looking flat theme for Gtk. The theme is compatible with GTK 3.6 (Supposedly?). It also includes a GTK 2.0 theme using Murrine engine.
Iris is a modern looking flat theme for Gtk. The theme is compatible with GTK 3.6. It also includes a GTK 2.0 theme using Murrine engine.

---

Expand Down
198 changes: 189 additions & 9 deletions gtk-3.0/apps/granite-widgets.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
}

.dynamic-notebook .notebook tab {
box-shadow: inset 0 2px 2px #555;
padding: 6px;
border-color: transparent;
border-radius: 0;
Expand Down Expand Up @@ -146,7 +145,7 @@
.source-list.view {
text-shadow: 0 1 #444;
border-radius: 0;
background-color: @button_bg_color; /*shade(@theme_bg_color, 1.10);*/
background-color: shade(@button_bg_color, 1.25); /*shade(@theme_bg_color, 1.10);*/
color: @theme_selected_fg_color;/*mix(@theme_fg_color, @theme_bg_color, 0.1);*/
}

Expand All @@ -158,9 +157,9 @@

.source-list.view:selected,
.source-list.view:prelight:selected {
background-color: shade(@button_bg_color, 0.95);
background-color: shade(@button_bg_color, 1.05);
color: @theme_selected_fg_color;
box-shadow: inset 2 0 shade(@theme_selected_bg_color, 1.2);
box-shadow: inset 2 0 shade(@theme_selected_bg_color, 1.08);
text-shadow: 0 -1 #333;
}

Expand All @@ -185,12 +184,12 @@
* statusbar *
*************/
GraniteWidgetsStatusBar {
padding: 1px;
padding: 4px;
border-top-style: solid;
border-top-color: shade(@theme_bg_color, 0.9);
background-color: @theme_bg_color;
border-top-color: shade(@theme_bg_color, 0.85);
border-radius: 0;
background-color: shade(@theme_bg_color, 1.2);
background-image: none;
box-shadow: inset 0 1px shade(@theme_bg_color, 0.8);
}

/***********
Expand Down Expand Up @@ -413,12 +412,193 @@ GraniteWidgetsPopOver *.separator {
}

.composited-indicator.menuitem:active,
.composited-indicator.menuitem:prelight{
.composited-indicator.menuitem:prelight,
.wingpanel-app-button:prelight,
.wingpanel-indicator-button:prelight,
.wingpanel-app-button:active,
.wingpanel-indicator-button:active{
background-image: none;
background-color: transparent;
color: #fff;
box-shadow: inset 0 -2 @theme_selected_bg_color;
}

.modebutton {
color: #ff0000;
}

/*_____________________________________________________________________________________________*/
/* Copyright 2011-2013 elementary LLC.
*
* This file is part of the elementary GTK theme.
*
* The elementary GTK theme is free software: you can redistribute it
* and/or modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* The elementary GTK theme is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with the elementary GTK theme. If not, see http://www.gnu.org/licenses/.
*/

.content-view-window {
background-color: @theme_base_color;

border-radius: 0;

border-width: 1px;
border-style: solid;
border-color: alpha (#000, 0.15);

}

.content-view,
.content-view GtkViewport {
background-color: @base_color;

}

.content-view GtkNotebook,
.content-view GtkTreeView,
.content-view GtkTextView,
.content-view GtkEventBox {
background-image: none;
background-color: @transparent;
}

.content-view column-header .button {
border-width: 0 0 1px 1px;


background-image: -gtk-gradient (linear,
left top,
left bottom,
from (shade (@base_color, 0.98)),
to (shade (@base_color, 0.92)));

}

.content-view .entry {

padding: 4px 5px;
border-style: solid;
border-radius: 0px;
background-color: shade(@theme_bg_color, 1.05);
background-image: none;
border-color: shade(@theme_bg_color, 0.9);
color: @theme_text_color;
}

.content-view .entry:insensitive {

background-image: -gtk-gradient (linear,
left top,
left bottom,
from (alpha (#000, 0.10)),
color-stop (0.20, alpha (#000, 0.00)),
to (alpha (#000, 0.00)));
}



.content-view .title,
.content-view .option-title {
color: @text_color;
text-shadow: 0 1 alpha (#fff, 0.3);
}


.content-view .subtitle,
.content-view .option-description {
color: alpha (@text_color, 0.5);
text-shadow: 0 1 alpha (#fff, 0.4);
}

.content-view GtkComboBox.button,
.content-view GtkComboBox .button,
.content-view .button {

color: @theme_bg_color;

border-style: none;
border-radius: 0;

background-color: @button_bg_color;

background-image: none;
}

.content-view .button:hover,
.content-view .button:active,
.content-view .button:active:hover {

color: @theme_bg_color;

border-style: none;
border-radius: 0;

background-color: shade(@button_bg_color, 1.17);

background-image: none;

}

.content-view .button:insensitive {
background-color: shade(@theme_bg_color, 0.85);
border-radius: 0;
background-image: none;
}

.content-view .button GtkLabel:insensitive {
color: @insensitive_color;
}

.content-view .button:focus {

background-image: none;
color: @theme_selected_bg_color;
}

.content-view .help_button GtkLabel {
color: @text_color;
}

.content-view .toolbar {
-GtkWidget-window-dragging: true;

padding: 1px;

border-style: solid;
border-width: 0 0 1px 0;

border-color: alpha (#000, 0.05);
background-image: -gtk-gradient (linear,
left top,
left bottom,
from (alpha (#000, 0.10)),
to (alpha (#000, 0.03)));

}

.content-view GtkTreeMenu.menu,
.content-view GtkMenuToolButton.menu,
.content-view GtkComboBox .menu {
background-color: @menu_bg_color;
color: @menu_fg_color;
}

.content-view .check,
.content-view .check row:selected,
.content-view .check row:selected:focus {

border: 1px solid;
background-color: #f7f7f7;
background-image: none;

}

Binary file modified gtk-3.0/assets/menuitem-checkbox-checked-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gtk-3.0/assets/menuitem-checkbox-mixed-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gtk-3.0/assets/menuitem-radio-checked-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6e9edcc

Please sign in to comment.