Merge pull request #22 from shimmerproject/master

Various changes
pull/23/head
Satyajit Sahoo 2013-04-02 01:04:33 -07:00
commit ce689c6255
32 changed files with 485 additions and 467 deletions

2
README
View File

@ -11,7 +11,7 @@ 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/"
Extract the zip file to the themes directory i.e. "/usr/share/themes/"
Use Gnome Tweak tool to choose the theme, or run the following commands in Terminal,

View File

@ -61,9 +61,9 @@ style "murrine-default" {
GtkScrollbar::has-forward-stepper = 0
GtkScrollbar::has-secondary-backward-stepper = 0
GtkScrollbar::has-secondary-forward-stepper = 0
GtkScrollbar::min-slider-length = 30
GtkScrollbar::min-slider-length = 100
GtkScrollbar::slider-width = 10
GtkScrollbar::trough-border = 1
GtkScrollbar::trough-border = 0
GtkScrolledWindow::scrollbar-spacing = 0
GtkScrolledWindow::scrollbars-within-bevel = 1
@ -183,7 +183,7 @@ style "murrine-button" = "murrine-wider" {
}
}
style "murrine-scrollbar" = "murrine-button" {
style "murrine-scrollbar" {
bg[NORMAL] = shade (0.90, @bg_color)
bg[PRELIGHT] = shade (0.80, @bg_color)
bg[ACTIVE] = @selected_bg_color

View File

@ -60,7 +60,6 @@ PanelApplet .button:active {
}
PanelApplet .button:prelight {
border-color: transparent;
border-color: mix(@panel_bg_color, @panel_fg_color, 0.13);
background-color: mix(@panel_bg_color, @panel_fg_color, 0.11);
background-image: none;
@ -91,14 +90,10 @@ WnckPager, WnckTasklist {
}
.nautilus-desktop.nautilus-canvas-item:active {
background-color: alpha(@theme_bg_color, 0.8);
background-image: none;
color: @theme_fg_color;
}
.nautilus-desktop.nautilus-canvas-item:selected {
background-color: alpha(@theme_selected_bg_color, 0.8);
background-image: none;
color: @theme_selected_fg_color;
}

View File

@ -54,8 +54,8 @@
@define-color wm_bg #2d2d2d;
@define-color wm_title_focused #dcdcdc;
@define-color wm_title_unfocused #888888;
@define-color wm_border_focused #2d2d2d;
@define-color wm_border_unfocused #2d2d2d;
@define-color wm_border_focused #484848;
@define-color wm_border_unfocused #393939;
@import url("gtk-widgets.css");
@import url("gtk-widgets-assets.css");

View File

@ -54,8 +54,8 @@
@define-color wm_bg #2d2d2d;
@define-color wm_title_focused #dcdcdc;
@define-color wm_title_unfocused #888888;
@define-color wm_border_focused #2d2d2d;
@define-color wm_border_unfocused #2d2d2d;
@define-color wm_border_focused #484848;
@define-color wm_border_unfocused #393939;
@import url("gtk-widgets.css");
@import url("gtk-widgets-assets.css");

View File

@ -65,17 +65,18 @@
</draw_ops>
<!-- ::: BORDER OUTLINE ::: -->
<draw_ops name="border">
<line color="#2d2d2d" x1="0" y1="0" x2="width" y2="0"/>
<line color="#2d2d2d" x1="4" y1="1" x2="width-1" y2="1"/>
<line color="#2d2d2d" x1="0" y1="0" x2="0" y2="height"/>
<line color="#2d2d2d" x1="width-1" y1="0" x2="width-1" y2="height"/>
<line color="#2d2d2d" x1="0" y1="height-1" x2="width" y2="height-1"/>
<draw_ops name="border_focused">
<line color="#484848" x1="0" y1="0" x2="width" y2="0"/>
<line color="#484848" x1="0" y1="0" x2="0" y2="height"/>
<line color="#484848" x1="width-1" y1="0" x2="width-1" y2="height"/>
<line color="#484848" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
<draw_ops name="maxed_border">
<line color="#2d2d2d" x1="0" y1="0" x2="width" y2="0"/>
<line color="#2d2d2d" x1="0" y1="height-1" x2="width" y2="height-1"/>
<draw_ops name="border_unfocused">
<line color="#393939" x1="0" y1="0" x2="width" y2="0"/>
<line color="#393939" x1="0" y1="0" x2="0" y2="height"/>
<line color="#393939" x1="width-1" y1="0" x2="width-1" y2="height"/>
<line color="#393939" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
<!-- ::: TITLEBAR ::: -->
@ -89,33 +90,31 @@
<draw_ops name="titlebar_maximized">
<include name="titlebar_gradient"/>
<include name="maxed_border"/>
</draw_ops>
<draw_ops name="titlebar_maximized_unfocused">
<include name="titlebar_gradient_unfocused"/>
<include name="maxed_border"/>
</draw_ops>
<draw_ops name="round_titlebar">
<include name="titlebar_gradient"/>
<include name="border"/>
<include name="border_focused"/>
<include name="corners_outline"/>
</draw_ops>
<draw_ops name="round_titlebar_unfocused">
<include name="titlebar_gradient_unfocused"/>
<include name="border"/>
<include name="border_unfocused"/>
<include name="corners_outline"/>
</draw_ops>
<draw_ops name="titlebar_shaded">
<include name="border"/>
<include name="border_focused"/>
<line color="#2d2d2d" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
<draw_ops name="round_titlebar_shaded">
<include name="border"/>
<include name="border_focused"/>
<include name="corners_outline"/>
<line color="#2d2d2d" x1="5" y1="height-1" x2="width-6" y2="height-1"/>
</draw_ops>
@ -330,7 +329,7 @@
</frame_style>
<frame_style name="border" geometry="border" parent="normal">
<piece position="entire_background" draw_ops="border"/>
<piece position="entire_background" draw_ops="border_focused"/>
<piece position="title" draw_ops="blank"/>
</frame_style>

View File

@ -15,7 +15,7 @@
<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6)" />
<!-- ::: GEOMETRY ::: -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="2" rounded_top_right="2">
<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
<distance name="left_width" value="1" />
<distance name="right_width" value="1" />
<distance name="bottom_height" value="1" />
@ -27,7 +27,7 @@
<border name="button_border" left="0" right="0" top="0" bottom="0" />
</frame_geometry>
<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="2" rounded_top_right="2" parent="normal" />
<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal" />
<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
<distance name="left_width" value="0" />
@ -68,7 +68,7 @@
<border name="button_border" left="0" right="0" top="0" bottom="0" />
</frame_geometry>
<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="2" rounded_top_right="2" rounded_bottom_right="2" rounded_bottom_left="2" parent="small">
<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_right="2" rounded_bottom_left="2" parent="small">
<distance name="title_vertical_pad" value="0" />
</frame_geometry>
@ -147,11 +147,11 @@
<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
<line color="C_border_focused" x1="0" y1="2" x2="0" y2="height-2" />
<line color="C_border_focused" x1="width-1" y1="2" x2="width-1" y2="height-2" />
<arc color="C_border_focused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" />
<arc color="C_border_focused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" />
<arc color="C_border_focused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" />
<arc color="C_border_focused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" />
<!-- double arcs for darker borders -->
<arc color="C_border_focused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" />
<arc color="C_border_focused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" />
<arc color="C_border_focused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" />
<arc color="C_border_focused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" />
</draw_ops>
<draw_ops name="rounded_border_unfocused">
@ -159,11 +159,11 @@
<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
<line color="C_border_unfocused" x1="0" y1="2" x2="0" y2="height-2" />
<line color="C_border_unfocused" x1="width-1" y1="2" x2="width-1" y2="height-2" />
<arc color="C_border_unfocused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" />
<arc color="C_border_unfocused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" />
<arc color="C_border_unfocused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" />
<arc color="C_border_unfocused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" />
<!-- double arcs for darker borders -->
<arc color="C_border_unfocused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" />
<arc color="C_border_unfocused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" />
<arc color="C_border_unfocused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" />
<arc color="C_border_unfocused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" />
</draw_ops>
<draw_ops name="border_right_focused">

View File

@ -27,7 +27,7 @@ menu.separator.padding.height: 4
# Active window
window.active.border.color: #2d2d2d
window.active.border.color: #484848
window.active.title.bg: flat solid
window.active.title.bg.color: #2d2d2d
@ -57,7 +57,7 @@ window.active.button.disabled.image.color: #888888
# Inactive window
window.inactive.border.color: #2d2d2d
window.inactive.border.color: #333333
window.inactive.title.bg: flat solid
window.inactive.title.bg.color: #2d2d2d
@ -113,6 +113,6 @@ menu.title.text.font:shadow=n
# Everything else
border.width: 1
padding.width: 4
window.handle.width: 1
window.handle.width: 0
window.client.padding.width: 0
window.label.text.justify: center

View File

@ -1,7 +1,8 @@
/* XPM */
static char * bottom_active_xpm[] = {
"8 2 2 1",
"8 2 3 1",
" c None",
". c #2D2D2D",
"+ c #484848",
"........",
"........"};
"++++++++"};

View File

@ -1,7 +1,8 @@
/* XPM */
static char * bottom_inactive_xpm[] = {
"8 2 2 1",
"8 2 3 1",
" c None",
". c #2D2D2D",
"+ c #393939",
"........",
"........"};
"++++++++"};

View File

@ -1,7 +1,8 @@
/* XPM */
static char * bottom_left_active_xpm[] = {
"2 2 2 1",
"2 2 3 1",
" c None",
". c #2D2D2D",
"..",
". c #484848",
"+ c #2D2D2D",
".+",
".."};

View File

@ -1,7 +1,8 @@
/* XPM */
static char * bottom_left_inactive_xpm[] = {
"2 2 2 1",
"2 2 3 1",
" c None",
". c #2D2D2D",
"..",
". c #393939",
"+ c #2D2D2D",
".+",
".."};

View File

@ -1,7 +1,8 @@
/* XPM */
static char * bottom_right_active_xpm[] = {
"2 2 2 1",
"2 2 3 1",
" c None",
". c #2D2D2D",
"..",
".."};
"+ c #484848",
".+",
"++"};

View File

@ -1,7 +1,8 @@
/* XPM */
static char * bottom_right_inactive_xpm[] = {
"2 2 2 1",
"2 2 3 1",
" c None",
". c #2D2D2D",
"..",
".."};
"+ c #393939",
".+",
"++"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * left_active_xpm[] = {
"2 21 2 1",
"2 21 3 1",
" c None",
". c #2D2D2D",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
".."};
". c #484848",
"+ c #2D2D2D",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * left_inactive_xpm[] = {
"2 21 2 1",
"2 21 3 1",
" c None",
". c #2D2D2D",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
".."};
". c #393939",
"+ c #2D2D2D",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * right_active_xpm[] = {
"2 21 2 1",
"2 21 3 1",
" c None",
". c #2D2D2D",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
".."};
"+ c #484848",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * right_inactive_xpm[] = {
"2 21 2 1",
"2 21 3 1",
" c None",
". c #2D2D2D",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
".."};
"+ c #393939",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_1_active_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #484848",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #393939",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_2_active_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #484848",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_2_inactive_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #393939",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_3_active_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #484848",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #393939",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_4_active_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #484848",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_4_inactive_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #393939",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_5_active_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #484848",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
"8 21 2 1",
"1 21 3 1",
" c None",
". c #2D2D2D",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........",
"........"};
". c #393939",
"+ c #2D2D2D",
".",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+",
"+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * top_left_active_xpm[] = {
"2 21 2 1",
"2 21 3 1",
" c None",
". c #2D2D2D",
". c #484848",
"+ c #2D2D2D",
" .",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
".."};
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
"2 21 2 1",
"2 21 3 1",
" c None",
". c #2D2D2D",
". c #393939",
"+ c #2D2D2D",
" .",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
".."};
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+",
".+"};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * top_right_active_xpm[] = {
"2 21 2 1",
"2 21 3 1",
" c None",
". c #2D2D2D",
". c #484848",
"+ c #2D2D2D",
". ",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
".."};
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+."};

View File

@ -1,26 +1,27 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
"2 21 2 1",
"2 21 3 1",
" c None",
". c #2D2D2D",
". c #393939",
"+ c #2D2D2D",
". ",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
"..",
".."};
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+.",
"+."};