Bug fixes.

This commit is contained in:
Sam Hewitt 2015-02-24 19:33:07 -05:00
parent f3c97a66e8
commit a59cb7930d
3 changed files with 37 additions and 46 deletions

View File

@ -29,7 +29,7 @@ style "default"
# Style Properties # Style Properties
GtkWidget::focus-line-width = 1 GtkWidget::focus-line-width = 0
GtkMenuBar::window-dragging = 1 GtkMenuBar::window-dragging = 1
GtkToolbar::window-dragging = 1 GtkToolbar::window-dragging = 1
GtkToolbar::internal-padding = 4 GtkToolbar::internal-padding = 4
@ -85,6 +85,9 @@ style "default"
GtkExpander::expander-size = 11 GtkExpander::expander-size = 11
GtkWidget::link-color = @link_color
GtkWidget::visited-link-color = @link_color
# Colors # Colors
bg[NORMAL] = @bg_color bg[NORMAL] = @bg_color
@ -564,19 +567,18 @@ style "default"
style "dark" style "dark"
{ {
color["bg_color_dark"] = "#263238" color["bg_color_dark"] = "#4B5044"
color["fg_color_dark"] = "#DADBDB" color["fg_color_dark"] = "#ffffff"
color["selected_fg_color_dark"] = "#DADBDB" color["selected_fg_color_dark"] = "#ffffff"
color["selected_bg_color_dark"] = "#263238"
fg[NORMAL] = @fg_color_dark fg[NORMAL] = @fg_color_dark
fg[PRELIGHT] = shade (1.15, @fg_color_dark) fg[PRELIGHT] = shade (1.15, @fg_color_dark)
fg[ACTIVE] = @fg_color_dark fg[ACTIVE] = @fg_color_dark
fg[SELECTED] = @selected_fg_color_dark fg[SELECTED] = @selected_fg_color_dark
fg[INSENSITIVE] = shade (0.5, @fg_color_dark) fg[INSENSITIVE] = shade (0.5, @fg_color_dark)
bg[NORMAL] = @bg_color_dark bg[NORMAL] = @bg_color_dark
bg[ACTIVE] = shade (0.8, @bg_color_dark) bg[ACTIVE] = shade (0.8, @bg_color_dark)
bg[SELECTED] = @selected_bg_color bg[SELECTED] = @selected_bg_color
bg[PRELIGHT] = shade (1.0, "#4D4C48") bg[PRELIGHT] = shade (1.0, "#4D4C48")
bg[INSENSITIVE] = shade (0.85, @bg_color_dark) bg[INSENSITIVE] = shade (0.85, @bg_color_dark)
@ -810,18 +812,8 @@ style "scrollbar_dark"
style "menubar" style "menubar"
{ {
bg[NORMAL] = @menubar_color bg[PRELIGHT] = "#FFF"
bg[PRELIGHT] = @menubar_color fg[SELECTED] = @text_color
fg[NORMAL] = @base_color
fg[ACTIVE] = @base_color
fg[PRELIGHT] = @base_color
fg[SELECTED] = @base_color
text[NORMAL] = @base_color
text[ACTIVE] = @base_color
text[PRELIGHT] = @base_color
text[SELECTED] = @base_color
xthickness = 0 xthickness = 0
ythickness = 0 ythickness = 0
@ -1174,7 +1166,7 @@ style "entry"
detail = "entry" detail = "entry"
state = NORMAL state = NORMAL
shadow = IN shadow = IN
file = "Entry/entry-border-bg.png" file = "Entry/entry-border.png"
border = { 4, 4, 4, 4 } border = { 4, 4, 4, 4 }
stretch = TRUE stretch = TRUE
} }
@ -1185,7 +1177,7 @@ style "entry"
detail = "entry" detail = "entry"
state = INSENSITIVE state = INSENSITIVE
shadow = IN shadow = IN
file = "Entry/entry-border-disabled-bg.png" file = "Entry/entry-border-disabled.png"
border = { 4, 4, 4, 4 } border = { 4, 4, 4, 4 }
stretch = TRUE stretch = TRUE
} }
@ -1194,7 +1186,7 @@ style "entry"
function = SHADOW function = SHADOW
detail = "entry" detail = "entry"
state = ACTIVE state = ACTIVE
file = "Entry/entry-border-active-bg.png" file = "Entry/entry-border-active.png"
border = { 4, 4, 4, 4 } border = { 4, 4, 4, 4 }
stretch = TRUE stretch = TRUE
} }
@ -1203,8 +1195,8 @@ style "entry"
function = FLAT_BOX function = FLAT_BOX
detail = "entry_bg" detail = "entry_bg"
state = NORMAL state = NORMAL
overlay_file = "Entry/entry-border-fill.png" overlay_file = "Entry/entry-border-fill-plain.png"
overlay_border = { 0, 0, 0, 0 } overlay_border = { 1, 1, 1, 1 }
overlay_stretch = TRUE overlay_stretch = TRUE
} }
image image
@ -1212,7 +1204,7 @@ style "entry"
function = FLAT_BOX function = FLAT_BOX
detail = "entry_bg" detail = "entry_bg"
state = ACTIVE state = ACTIVE
overlay_file = "Entry/entry-border-fill.png" overlay_file = "Entry/entry-border-fill-plain.png"
overlay_border = { 0, 0, 0, 0 } overlay_border = { 0, 0, 0, 0 }
overlay_stretch = TRUE overlay_stretch = TRUE
} }
@ -1229,7 +1221,7 @@ style "notebook_entry"
detail = "entry" detail = "entry"
state = NORMAL state = NORMAL
shadow = IN shadow = IN
file = "Entry/entry-border-notebook.png" file = "Entry/entry-border.png"
border = { 4, 4, 4, 4 } border = { 4, 4, 4, 4 }
stretch = TRUE stretch = TRUE
} }
@ -1239,7 +1231,7 @@ style "notebook_entry"
detail = "entry" detail = "entry"
state = INSENSITIVE state = INSENSITIVE
shadow = IN shadow = IN
file = "Entry/entry-border-disabled-notebook.png" file = "Entry/entry-border-disabled.png"
border = { 4, 4, 4, 4 } border = { 4, 4, 4, 4 }
stretch = TRUE stretch = TRUE
} }
@ -1248,7 +1240,7 @@ style "notebook_entry"
function = SHADOW function = SHADOW
detail = "entry" detail = "entry"
state = ACTIVE state = ACTIVE
file = "Entry/entry-border-active-notebook.png" file = "Entry/entry-border-active.png"
border = { 4, 4, 4, 4 } border = { 4, 4, 4, 4 }
stretch = TRUE stretch = TRUE
} }
@ -1274,7 +1266,7 @@ style "combobox_entry"
detail = "entry" detail = "entry"
state = NORMAL state = NORMAL
shadow = IN shadow = IN
file = "Entry/combo-entry-border-bg.png" file = "Entry/combo-entry-border.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = LTR direction = LTR
@ -1285,7 +1277,7 @@ style "combobox_entry"
detail = "entry" detail = "entry"
state = INSENSITIVE state = INSENSITIVE
shadow = IN shadow = IN
file = "Entry/combo-entry-border-disabled-bg.png" file = "Entry/combo-entry-border-disabled.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = LTR direction = LTR
@ -1295,7 +1287,7 @@ style "combobox_entry"
function = SHADOW function = SHADOW
detail = "entry" detail = "entry"
state = ACTIVE state = ACTIVE
file = "Entry/combo-entry-border-active-bg.png" file = "Entry/combo-entry-border-active.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = LTR direction = LTR
@ -1309,7 +1301,7 @@ style "combobox_entry"
detail = "entry" detail = "entry"
state = NORMAL state = NORMAL
shadow = IN shadow = IN
file = "Entry/combo-entry-border-rtl-bg.png" file = "Entry/combo-entry-border-rtl.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = RTL direction = RTL
@ -1320,7 +1312,7 @@ style "combobox_entry"
detail = "entry" detail = "entry"
state = INSENSITIVE state = INSENSITIVE
shadow = IN shadow = IN
file = "Entry/combo-entry-border-disabled-rtl-bg.png" file = "Entry/combo-entry-border-disabled-rtl.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = RTL direction = RTL
@ -1330,7 +1322,7 @@ style "combobox_entry"
function = SHADOW function = SHADOW
detail = "entry" detail = "entry"
state = ACTIVE state = ACTIVE
file = "Entry/combo-entry-border-active-rtl-bg.png" file = "Entry/combo-entry-border-active-rtl.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = RTL direction = RTL
@ -1349,7 +1341,7 @@ style "notebook_combobox_entry"
detail = "entry" detail = "entry"
state = NORMAL state = NORMAL
shadow = IN shadow = IN
file = "Entry/combo-entry-border-notebook.png" file = "Entry/combo-entry-border.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = LTR direction = LTR
@ -1360,7 +1352,7 @@ style "notebook_combobox_entry"
detail = "entry" detail = "entry"
state = INSENSITIVE state = INSENSITIVE
shadow = IN shadow = IN
file = "Entry/combo-entry-border-disabled-notebook.png" file = "Entry/combo-entry-border-disabled.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = LTR direction = LTR
@ -1370,7 +1362,7 @@ style "notebook_combobox_entry"
function = SHADOW function = SHADOW
detail = "entry" detail = "entry"
state = ACTIVE state = ACTIVE
file = "Entry/combo-entry-border-active-notebook.png" file = "Entry/combo-entry-border-active.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = LTR direction = LTR
@ -1384,7 +1376,7 @@ style "notebook_combobox_entry"
detail = "entry" detail = "entry"
state = NORMAL state = NORMAL
shadow = IN shadow = IN
file = "Entry/combo-entry-border-rtl-notebook.png" file = "Entry/combo-entry-border-rtl.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = RTL direction = RTL
@ -1395,7 +1387,7 @@ style "notebook_combobox_entry"
detail = "entry" detail = "entry"
state = INSENSITIVE state = INSENSITIVE
shadow = IN shadow = IN
file = "Entry/combo-entry-border-disabled-rtl-notebook.png" file = "Entry/combo-entry-border-disabled-rtl.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = RTL direction = RTL
@ -1405,7 +1397,7 @@ style "notebook_combobox_entry"
function = SHADOW function = SHADOW
detail = "entry" detail = "entry"
state = ACTIVE state = ACTIVE
file = "Entry/combo-entry-border-active-rtl-notebook.png" file = "Entry/combo-entry-border-active-rtl.png"
border = { 4, 4, 5, 4 } border = { 4, 4, 5, 4 }
stretch = TRUE stretch = TRUE
direction = RTL direction = RTL
@ -1746,7 +1738,7 @@ style "standalone_entry"
detail = "entry" detail = "entry"
state = NORMAL state = NORMAL
shadow = IN shadow = IN
file = "Entry/entry-border-bg-solid.png" file = "Entry/entry-border.png"
border = { 4, 4, 4, 4 } border = { 4, 4, 4, 4 }
stretch = TRUE stretch = TRUE
} }
@ -1755,7 +1747,7 @@ style "standalone_entry"
function = SHADOW function = SHADOW
detail = "entry" detail = "entry"
state = ACTIVE state = ACTIVE
file = "Entry/entry-border-active-bg-solid.png" file = "Entry/entry-border-active.png"
border = { 4, 4, 4, 4 } border = { 4, 4, 4, 4 }
stretch = TRUE stretch = TRUE
} }
@ -2340,6 +2332,6 @@ include "Apps/chrome.rc"
include "Apps/eclipse.rc" include "Apps/eclipse.rc"
include "Apps/gimp.rc" include "Apps/gimp.rc"
include "Apps/libreoffice.rc" include "Apps/libreoffice.rc"
include "Apps/panel.rc"
include "Apps/terminal.rc" include "Apps/terminal.rc"
include "Apps/thunar.rc" include "Apps/thunar.rc"
include "Apps/xfce.rc"

View File

@ -38,7 +38,6 @@ GduVolumeGrid .toolbar {
} }
GduVolumeGrid, GduVolumeGrid,
GduVolumeGrid:*,
GduVolumeGrid * { GduVolumeGrid * {
color: @text; color: @text;
} }

View File

@ -77,7 +77,7 @@ GraniteWidgetsPopOver .button:active:hover {
* Welcome * * Welcome *
**********/ **********/
GraniteWidgetsWelcome { GraniteWidgetsWelcome {k
background-color: @base; background-color: @base;
} }
@ -95,7 +95,7 @@ GraniteWidgetsWelcome .h3 {
********/ ********/
.panel { .panel {
background-color: @panel; background-color: transparent;
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
} }