diff --git a/Extras/override/gtk.css b/Extras/override/gtk.css index 97ed898..8680aee 100755 --- a/Extras/override/gtk.css +++ b/Extras/override/gtk.css @@ -1,64 +1,17 @@ -/* Panel plugins */ -#pulseaudio-button { - padding: 6px 6px; -} - +/* This just keeps the power manager plugin icon to stay small. This trick +doesn't work for the pulse audio icon unfortunately.*/ #xfce4-power-manager-plugin { - padding: 6px 6px; -} - -/* File Chooser */ -filechooser box paned placessidebar viewport list { - background-color: white; -} - -filechooser box paned placessidebar viewport list box { - padding: 3px; -} - -filechooser box paned placessidebar viewport { - border: none; -} - - -filechooser box paned box box stack placesview stack frame scrolledwindow viewport list { - border: 1px solid; -} - -filechooser box paned box revealer box stack box widget button { -padding-top: 1px; -padding-bottom: 1px; -padding-left: 5px; -padding-right: 5px; -} - -filechooser box paned box revealer box stack box treeview { -border-left: 2px solid black; -} - -filechooser box paned placessidebar viewport list separator { - border-top: 1px solid #808080; - border-bottom: 1px solid white; -} - -filechooser placessidebar viewport list { - background-color: white; -} - -filechooser box paned placessidebar viewport list *:selected, -filechooser box paned placessidebar viewport list *:active, -filechooser box paned placessidebar viewport list *:focus { - outline: none; -} - -filechooser placessidebar viewport separator { - border-top: 1 -} + padding: 6px 6px; } /* GNOME Disk utility */ +/* This is a fix for the GNOME disk application which uses its own CSS to +theme the grid style; overriding user themes. In reality this doesn’t work +so well, so we'll just override that with out own!*/ .gnome-disk-utility-grid { -background-color: #000080; -padding: 20px; -} - +background-color: @bg_shade; + color: @font_bright; + border-radius: 0px; + outline-color: white; } + .gnome-disk-utility-grid:backdrop { + background-color: @bg_shade; } \ No newline at end of file diff --git a/INSTALL.md b/INSTALL.md index 44cf7ef..ad41f54 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,6 +1,6 @@ ## How To Install -Note: You may have to enable `view hidden folders` in your file manager to see hidden files. +Note: You will have to enable `view hidden folders` in your file manager to see hidden files. Create a `.themes` folder in your user directory `/home/$USER/` if it doesn't already exist. (with $USER being your username.) @@ -104,13 +104,13 @@ Note: This might be a little complicated since it's more of a work-around than a If you want to force 16x16px icons in the launcher buttons, you can do this by making your own custom icons or through the theme by editing the panel.rc file. - Open a text editor and navigate to `/home/$USER/.themes/Chicago95/gtk-2.0/panel.rc` (with $USER being your username.) -- Move to line 268 of the file where you will see a section specified for Launcher buttons. +- Move to line 250 of the file where you will see a section specified for Launcher buttons. Example steps: You will first need to determine your current panel bar row size since the launcher button icon padding is determined by the vertical size of the panel bar. - Open the XFCE settings manager > Panel - Verify the "Row Size (pixels)". (Lets say that it's 38 pixels for this example.) -- Return back to the text editor and locate the line comment that is specifying your panel bar row size. (38px height panel for this example is on line 302.) +- Return back to the text editor and locate the line comment that is specifying your panel bar row size. (38px height panel for this example is on line 284.) - Delete the "#" pound character in front of the xthickness and the ythickness values for the specified panel bar size. - Now Insert a "#" pound character in front of the xthickness and the ythickness values of the previous default selection, which is for a 26px height panel. - Save the file and reload the xfce panel bar. You can run `xfce4-panel -r` in a terminal to reload the panel. diff --git a/README.md b/README.md index dd39c26..c2c2d27 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ # Chicago95 #### XFCE / Xubuntu Windows 95 Total Conversion + +

+Chicago95 Desktop +

+ I was unhappy with the various XFCE/GTK2/GTK3 Windows 95 based themes and decided to make one that was more consistent across the board for theming. Included in this theme: diff --git a/Screenshots/Chicago95_Desktop.png b/Screenshots/Chicago95_Desktop.png new file mode 100644 index 0000000..12cc86e Binary files /dev/null and b/Screenshots/Chicago95_Desktop.png differ diff --git a/Theme/Chicago95/gtk-2.0/panel.rc b/Theme/Chicago95/gtk-2.0/panel.rc index 6a1ff7e..120c8ad 100755 --- a/Theme/Chicago95/gtk-2.0/panel.rc +++ b/Theme/Chicago95/gtk-2.0/panel.rc @@ -126,7 +126,7 @@ widget_class "*Tomboy*Tray*" style "panel" widget "*fast-user-switch*" style "panel" widget_class "*PanelToplevel*" style "panel" class "Xfce*Panel*" style "panel" -widget_class "*Xfce*Panel*" style "panel" +#widget_class "*Xfce*Panel*" style "panel" widget_class "*PanelApplet*" style "panel" widget_class "*PanelWidget*" style "panel" widget_class "*computertemp*" style "panel" diff --git a/Theme/Chicago95/gtk-2.0/panel/panel-bg4.png.bak b/Theme/Chicago95/gtk-2.0/panel/panel-bg4.png.bak deleted file mode 100755 index 9ec5c56..0000000 Binary files a/Theme/Chicago95/gtk-2.0/panel/panel-bg4.png.bak and /dev/null differ diff --git a/Theme/Chicago95/gtk-2.0/progress.rc b/Theme/Chicago95/gtk-2.0/progress.rc index b868e3a..d2e96ff 100755 --- a/Theme/Chicago95/gtk-2.0/progress.rc +++ b/Theme/Chicago95/gtk-2.0/progress.rc @@ -1,48 +1,14 @@ style "progressbar" = "default" { -xthickness = 2 -ythickness = 2 - fg[PRELIGHT] = @selected_fg_color - #bg[NORMAL] = shade (1.1,@bg_color) bg[NORMAL] = @bg_color bg[PRELIGHT] = @selected_bg_color GtkProgressBar::min-vertical-bar-width = 16 GtkProgressBar::min-horizontal-bar-height = 16 - -engine "pixmap" -{ - - - image - { - - function = BOX - recolorable = TRUE - detail = "bar" - file = "/progress/progress.png" - border = { 2 , 2 , 2 , 2} - stretch = TRUE - orientation = HORIZONTAL - } - - - image - { - - function = BOX - recolorable = TRUE - detail = "bar" - file = "/progress/progress.png" - border = { 2 , 2 , 2 ,2} - stretch = TRUE - orientation = VERTICAL - } -} } class "GtkProgressBar" style "progressbar" widget_class "*ProgressBar*" style "progressbar" -widget_class "*MenuItem.*ProgressBar*" style "progressbar" \ No newline at end of file +widget_class "*MenuItem.*ProgressBar*" style "progressbar" diff --git a/Theme/Chicago95/gtk-3.0/apps/filechooser.css b/Theme/Chicago95/gtk-3.0/apps/filechooser.css index 5f21954..a1314b8 100755 --- a/Theme/Chicago95/gtk-3.0/apps/filechooser.css +++ b/Theme/Chicago95/gtk-3.0/apps/filechooser.css @@ -1,7 +1,7 @@ /* File Chooser */ - -filechooser box paned placessidebar viewport list { +/* The commented out section below should not be required anymore, but I'm keeping it around for a little while.*/ +/*filechooser box paned placessidebar viewport list { background-color: white; } @@ -47,4 +47,18 @@ margin: 0px; dialog box box filechooser box paned placessidebar viewport { border: none; box-shadow: none; -} +}*/ + +filechooser revealer > box > stack { + border-left: 1px solid @bg_shade; + border-top: 1px solid @bg_shade; + border-right: 1px solid @bg_bright; + border-bottom: 1px solid @bg_bright; + box-shadow: inset 1px 1px @bg_bright, + inset -1px -1px @bg_shade; + padding: 0px;} + filechooser revealer > box > stack button { + margin: 1px; + padding: 2px; + min-width: 20px; + min-height: 20px; } \ No newline at end of file diff --git a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css index 4d3bd29..a7519c5 100755 --- a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css +++ b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css @@ -1,41 +1,70 @@ /* Whisker Menu Button style */ +/* We will remove the border effect and margin effects on the button and apply it to the box inside. +This will allow people to be able to run their pointer to the far corner of the screen and activate +the whisker menu without having to correct their pointer location. */ #whiskermenu-button { - padding: 2px; - margin: 2px; - border-top: 1px solid #FFFFFF; - border-bottom: 1px solid #000000; - border-left: 1px solid #FFFFFF; - border-right: 1px solid #000000; - box-shadow: inset -1px -1px #808080; - background-color: #c0c0c0; } + border: none; + box-shadow: none; + margin: 0px; } + #whiskermenu-button box { + padding: 2px; + margin: 1px; + border-top: 1px solid #FFFFFF; + border-bottom: 1px solid #000000; + border-left: 1px solid #FFFFFF; + border-right: 1px solid #000000; + box-shadow: inset -1px -1px #808080; + background-color: #c0c0c0; } + #whiskermenu-button:active box, #whiskermenu-button:checked box { + padding-left: 3px; + padding-right: 1px; + margin: 1px; + border-bottom: 1px solid #FFF; + border-right: 1px solid #FFF; + border-top: 1px solid #000000; + border-left: 1px solid #000000; + box-shadow: inset -1px -1px #c0c0c0, + inset 1px 1px #808080; + border-radius: 0px; } + #whiskermenu-button image { + margin-right: -4px; + margin-left: 1px; } + #whiskermenu-button label { + padding: 0px; + margin-right: 1px; + margin-left: -1px; + border: none; + color: black; + font-family: "MS Sans Serif Bold", Sans, Sans-Serif; + font-weight: 600; + font-size: 11px; } -#whiskermenu-button label { - color: @whisker_button_text; - font-size: 11px; - font-weight: bold; } - -#whiskermenu-button:active, #whiskermenu-button:checked { - padding-left: 3px; - padding-right: 1px; - margin: 2px; - border-bottom: 1px solid #FFF; - border-right: 1px solid #FFF; - border-top: 1px solid #000000; - border-left: 1px solid #000000; - box-shadow: inset -1px -1px #c0c0c0, - inset 1px 1px #808080; - border-radius: 0px; } +/**************** +* Whisker Menu ** +****************/ #whiskermenu-window treeview { padding-left: 5px; padding-right: 5px; padding-top: 2px; padding-bottom: 2px;} - -#whiskermenu-window button { - padding: 2px; - min-height: 16px; } - #whiskermenu-window button:not(:hover):not(:checked) { - border-color: transparent; - box-shadow: none;} + #whiskermenu-window button { + padding: 2px; + min-height: 16px; } + #whiskermenu-window button:not(:hover):not(:checked) { + border-color: transparent; + box-shadow: none;} + #whiskermenu-window separator { + margin: 5px; } + #whiskermenu-window frame > box > box > scrolledwindow { + padding: 5px; + border: 1px solid; + background-color: @bg_color; + border-color: @bg_shade @bg_bright @bg_bright @bg_shade; + box-shadow: inset 1px 1px @bg_bright, + inset -1px -1px @bg_shade; } + #whiskermenu-window entry { + margin-top: 3px; + margin-bottom: 3px; + min-height: 16px; } diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css index c03df0a..8e1ae7b 100755 --- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css +++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css @@ -79,23 +79,6 @@ slider, .slider { min-width: 10px; background-color: @bg_color;} -frame { - background-color: transparent; - padding: 3px; - padding-right: 5px; } - .frame { - background-color: transparent;} - -/* since .view is white and frame is generally behind grey, lets nullify frame's padding */ -frame > list, frame > .view { - margin: -2px; } - frame > scrolledwindow { - margin: -3px; } - /* frame always comes with a border element which is the one that should be decorated, but so far i found - * that decorating only the frame with sunken 2px is better */ - frame > label { - margin-left: 6px; } - border.flat { border-style: none; box-shadow: none; } @@ -118,97 +101,52 @@ progressbar trough, margin-right: 4px; } -/* Sunken 2px */ -/* stacksidebar list row:selected, -stacksidebar list row:active, */ -colorswatch:selected, -calendar.view, -frame, -entry, -slider, -switch, -.sidebar list, -scale trough, -combobox button:checked, -popover button.flat:selected, popover button.flat:active, -button.appmenu:selected, button.appmenu:active, - -scrolledwindow.frame, -/*scrolledwindow:not(.frame) > viewport,*/ /*Commenting out because it makes extra frames. */ -/*stack.view > box, -.nautilus-list-view,*/ -notebook:not(.frame) > stack > box { - border-style: solid; - border-width: 1px; - border-color: @bg_shade @bg_bright @bg_bright @bg_shade; - box-shadow: inset 1px 1px @bg_dark, - inset -1px -1px @bg_color; - background-color: @theme_bg_color; -} - -scrolledwindow:not(.frame) > viewport { /*Adding this for background colour. */ - background-color: @theme_bg_color; -} - - - -/* Raised 1px */ -/*button.appmenu button.flat, -button.flat:hover, -toolbar button, -toolbar button:hover:not(:active):not(:checked):not(:selected), -toolbar:not(.inline-toolbar),*/ stepper { border-style: solid; border-width: 1px; border-color: white black black white; box-shadow: inset 1px 1px #dfdfdf, inset -1px -1px @bg_dark; - border-radius: 0; -} + border-radius: 0; } -/* Raised 2px */ -window > frame, -/* stacksidebar list row, */ -colorswatch, -combobox > window, -calendar.header, -popover button.flat, -slider, -notebook > header > tabs > tab, -notebook.frame { - border-style: solid; - border-width: 1px; - border-color: @bg_color @bg_dark @bg_dark @bg_color; - box-shadow: inset 1px 1px @bg_bright, - inset -1px -1px @bg_shade; - border-radius: 0px; -} - -window box notebook stack box scrolledwindow viewport { - border-left: 1px solid @bg_shade; - border-top: 1px solid @bg_shade; - border-right: 1px solid white; - border-bottom: 1px solid white; - box-shadow: inset 1px 1px white, - inset -1px -1px @bg_shade; -} - -/* Makes a checkerboard */ -/*stacksidebar list row:selected:hover, -stacksidebar list row:selected,*/ -/*button:selected, button:active, button:checked,*/ -/*toolbar button:active, -toolbar button:checked,*/ -slider:disabled, -trough, -paned > separator { +slider { + border-style: solid; + border-width: 1px; + border-color: @bg_color @bg_dark @bg_dark @bg_color; + box-shadow: inset 1px 1px @bg_bright, + inset -1px -1px @bg_shade; + border-radius: 0px; } + /* Makes a checkerboard */ + slider:disabled, trough, paned > separator { background-color: @border_bright; background-image: linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @bg_color), linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @border_dark); background-size: 2px 2px; - background-position: 0 0, 1px 1px; -} - + background-position: 0 0, 1px 1px; } + +combobox > window, notebook > header > tabs > tab { + border-style: solid; + border-width: 1px; + border-color: @bg_color @bg_dark @bg_dark @bg_color; + box-shadow: inset 1px 1px @bg_bright, + inset -1px -1px @bg_shade; + border-radius: 0px; } + +colorswatch:selected, calendar.view, entry, switch, scale trough, combobox button:checked, popover button.flat:selected, popover button.flat:active, button.appmenu:selected, button.appmenu:active { + border-style: solid; + border-width: 1px; + border-color: @bg_shade @bg_bright @bg_bright @bg_shade; + box-shadow: inset 1px 1px @bg_dark, + inset -1px -1px @bg_color; + background-color: @theme_bg_color; } + +colorswatch, calendar.header { + border-style: solid; + border-width: 1px; + border-color: @bg_color @bg_dark @bg_dark @bg_color; + box-shadow: inset 1px 1px @bg_bright, + inset -1px -1px @bg_shade; + border-radius: 0px; } + /*********** * Buttons * ***********/ @@ -218,8 +156,8 @@ paned > separator { to { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#398ee7), to(transparent)); } } button { - min-height: 20px; - min-width: 20px; + min-height: 16px; + min-width: 16px; padding: 2px; border: 1px solid; border-radius: 0px; @@ -232,8 +170,11 @@ button { border-bottom-color: @border_dark; background-color: @bg_color; box-shadow: inset -1px -1px #808080;} + button.flat { + min-width: 16px; + min-height: 16px; } button.sidebar-button, - button.flat:not(toolbar button) { + button.flat { box-shadow: inset -1px -1px @border_shade; text-shadow: none; -gtk-icon-shadow: none; @@ -251,7 +192,6 @@ button { border-left-color: @border_dark; border-bottom-color: @border_bright; box-shadow: inset 1px 1px @border_shade;} - transition-duration: none; } button.sidebar-button:backdrop, button:backdrop.flat, button:backdrop { @@ -325,7 +265,7 @@ button { button:backdrop:disabled:active label, button:backdrop:disabled:checked label { color: @font_color; } - /* The commented option below can change the theme of a button in a non-active (non-focused) window. Currently leaving it as an option, but disabled./* + /* The commented option below can change the theme of a button in a non-active (non-focused) window. Currently leaving it as an option, but disabled.*/ /*button.sidebar-button:backdrop, button.sidebar-button:disabled, button.sidebar-button:backdrop:disabled, button.flat:backdrop, button.flat:disabled, @@ -362,7 +302,7 @@ button { button:disabled:checked label, button:disabled:checked { color: @font_color; } - button.image-button:not(toolbar button) { + button.image-button { min-height: 16px; min-width: 16px; padding-left: 4px; @@ -466,7 +406,7 @@ button.osd { .osd button { color: @font_color; border-radius: 0px; - border-style: transparent; + border-style: none; background-color: @bg_color; box-shadow: none; background-clip: padding-box; @@ -549,7 +489,7 @@ button.osd { .osd button.flat:disabled { color: @disabled_font; border-radius: 0px; - border-style: transparent; + border-style: none; background-color: @bg_color; box-shadow: none; background-clip: padding-box; @@ -597,7 +537,6 @@ button.osd { .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image { - : none; background-image: none; } .inline-toolbar button, .inline-toolbar button:backdrop { border-radius: 0px; @@ -757,58 +696,202 @@ radio:indeterminate:disabled { -gtk-icon-source: url("assets/radio-mixed-insensitive.png"); } +/********* +* Frames * +**********/ + +frame { + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: @bg_shade @bg_bright @bg_bright @bg_shade; + box-shadow: inset 1px 1px @bg_dark, + inset -1px -1px @bg_color; + background-color: @theme_bg_color; } + .frame { + background-color: transparent;} + frame.border-outset { + border-color: @bg_bright @bg_dark @bg_dark @bg_bright; + box-shadow: inset 1px 1px @bg_color, + inset -1px -1px @bg_shade; } + frame.border-inset { + border-color: @bg_shade @bg_bright @bg_bright @bg_shade; + box-shadow: inset 1px 1px @bg_dark, + inset -1px -1px @bg_color; + background-color: @theme_bg_color; } + frame > list, frame > .view { + margin: -2px; } + frame > label { + margin-left: 6px; } + window > frame { + border-style: solid; + border-width: 1px; + border-color: @bg_color @bg_dark @bg_dark @bg_color; + box-shadow: inset 1px 1px @bg_bright, + inset -1px -1px @bg_shade; + border-radius: 0px; } + dialog box box notebook stack box frame { + border-left: 1px solid @bg_shade; + border-top: 1px solid @bg_shade; + border-right: 1px solid white; + border-bottom: 1px solid white; + box-shadow: inset 1px 1px white, + inset -1px -1px @bg_shade; } + dialog box box box notebook stack grid frame { + border-left: 1px solid @bg_shade; + border-top: 1px solid @bg_shade; + border-right: 1px solid white; + border-bottom: 1px solid white; + box-shadow: inset 1px 1px white, + inset -1px -1px @bg_shade; } + viewport.frame > frame, viewport.frame > box > frame { + background-color: @base_color; + color: @font_color; } + scrolledwindow.frame { + padding: 1px; + background-color: white; + border-left: 1px solid @bg_dark; + border-top: 1px solid @bg_dark; + border-right: 1px solid @bg_bright; + border-bottom: 1px solid @bg_bright; + box-shadow: inset -1px -1px @bg_color, + inset 1px 1px @bg_shade; + margin: 0px; } + notebook.frame { + border-style: solid; + border-width: 1px; + border-color: @bg_color @bg_dark @bg_dark @bg_color; + box-shadow: inset 1px 1px @bg_bright, + inset -1px -1px @bg_shade; + border-radius: 0px; } + notebook stack frame, frame frame { + border-left: 1px solid @bg_shade; + border-top: 1px solid @bg_shade; + border-right: 1px solid white; + border-bottom: 1px solid white; + box-shadow: inset 1px 1px white, + inset -1px -1px @bg_shade; } + .osd.frame { + background-clip: border-box; + background-origin: border-box; } + statusbar frame { + padding: 1px; } + /**************************** * viewport, iconview, view * ****************************/ -viewport, viewport list, viewport iconview, viewport textview, viewport.frame > frame, viewport.frame > box > frame, viewport list.tweak-group, viewport list.tweak-categories { +viewport, viewport list, viewport iconview, viewport textview, viewport list.tweak-group, viewport list.tweak-categories { background-color: @base_color; color: @font_color; } + viewport { + padding: 1px; } + viewport row { + padding: 1px; + min-height: 20px; } viewport list row box { background-color: transparent; } + viewport separator { + border-top: 1px solid @selected_inactive_bg_color; + border-bottom: 1px solid white; } + dialog viewport { + border-style: solid; + border-width: 1px; + border-color: @bg_shade @bg_bright @bg_bright @bg_shade; + box-shadow: inset 1px 1px @bg_dark, + inset -1px -1px @bg_color; + background-color: @theme_bg_color; } + /* If there is a viewport inside of a scrolled window, then the viewport wont need a border style because the scrolled window will already have one. Otherwise we would get a double border style effect.*/ + scrolledwindow > viewport { + border: transparent; + box-shadow: none; } + scrolledwindow:not(.frame) > viewport { /*Adding this for background colour. */ + background-color: @theme_bg_color; } + dialog scrolledwindow viewport { + padding: 5px; } + grid viewport box scrolledwindow viewport { + border: none; + box-shadow: inset 0 0; + background-color: white; } + grid viewport { + border: none; + background-color: white; + border: 1px solid black; } view, .view { - border-width: 0px; - background-color: @base_color; - color: @theme_text_color; -} - -box.view { + border-width: 0px; + background-color: @base_color; + color: @theme_text_color; } + view:disabled, + view:disabled:disabled { background-color: @bg_color; - color: @fg_color; -} - -view:disabled, -view:disabled:disabled { + color: @fg_color; } + view:selected, + view:selected:focus { + background-color: @theme_selected_bg_color; + color: @font_bright; } + box.view { background-color: @bg_color; - color: @fg_color; -} + color: @fg_color; } -view:selected, -view:selected:focus { - background-color: @theme_selected_bg_color; - color: @font_bright; -} - -viewport separator { - border-top: 1px solid @selected_inactive_bg_color; - border-bottom: 1px solid white; -} - -/*box viewport { - border-left: 1px solid black; - border-top: 1px solid black; - border-right: 1px solid white; - border-bottom: 1px solid white; - box-shadow: inset 1px 1px @bg_bright, - inset -1px -1px @bg_shade; +.sidebar list { + padding: 0px; +/* border-left: 1px solid @bg_shade; + border-top: 1px solid @bg_shade; + border-right: 1px solid @bg_bright; + border-bottom: 1px solid @bg_bright; + box-shadow: inset 1px 1px @bg_dark, + inset -1px -1px @bg_color;*/ border-radius: 0px; -}*/ +} iconview { -GdMainIconView-icon-size: 48; } +/******************* + * scrolled window * + *******************/ + +scrolledwindow { + padding: 1px; + background-color: @bg_color; + border-left: 1px solid @bg_dark; + border-top: 1px solid @bg_dark; + border-right: 1px solid @bg_bright; + border-bottom: 1px solid @bg_bright; + box-shadow: inset -1px -1px @bg_color, + inset 1px 1px @bg_shade; + margin: 0px; } + scrolledwindow > viewport { + border: transparent;} + scrolledwindow viewport list row { + border: none; + box-shadow: none; + padding: 2px; + margin: 0px; } + .nautilus-window overlay > scrolledwindow { + background-color: @base_color; } + stacksidebar > scrolledwindow { + padding: 0px; + margin: 0px; + border: 0px; + box-shadow: none; } + .sidebar GtkScrolledWindow { + background-color: @selected_fg_color; + color: @text_color; + box-shadow: none;} + frame > scrolledwindow { + margin: 0px; } + notebook stack scrolledwindow { + border-left: 1px solid @bg_shade; + border-top: 1px solid @bg_shade; + border-right: 1px solid white; + border-bottom: 1px solid white; + box-shadow: inset 1px 1px white, + inset -1px -1px @bg_shade; + margin: 3px; } + /**************** * List Box * ***************/ @@ -850,16 +933,6 @@ row, :not(check):not(radio).row { border: solid transparent; } -/* remove :not(.frame) for less elements separated with horizontla lines */ -viewport:not(.frame) list row { - border-bottom: 0px; - padding: 0px; - padding-top: 1px; - padding-bottom: 1px; - margin-top: 1px; - margin-bottom: 1px; -} - list > row label, list > row image { padding-left: 4px; @@ -928,30 +1001,37 @@ separator { } /* MUST KEEP min-width and min-height above zero, or else a default value of 4px is used! */ -paned > separator { - border: 0px; - min-width: 1px; - min-height: 1px; - -gtk-icon-source: none; -} +/*paned > separator { + padding: 0px; + min-width: 1px; + border-left: 1px dashed @bg_shade; + border-right: none; + border-bottom: none; + border-top: none; + background: none; }*/ /* quodlibet likes to reset background-image here... paned separator { background-image: linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @bg_color), linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @border_dark); }*/ - +/* GTK has the panes flipped. the .vertical is ACTUALLY a horizontal.*/ paned.vertical > separator { - margin-top: 2px; - margin-bottom: 2px; - padding-top: 1px; - padding-bottom: 1px; + padding: 0px; + border-left: none; + border-right: none; + border-bottom: 1px dashed @bg_bright; + border-top: none; + background: none } +/* GTK has the panes flipped. the .horizontal is ACTUALLY a vertical.*/ paned.horizontal > separator { - margin-left: 2px; - margin-right: 2px; - padding-left: 1px; - padding-right: 1px; + padding: 0px; + border-left: 1px dashed @bg_bright; + border-right: none; + border-bottom: none; + border-top: none; + background: none } @@ -1307,38 +1387,6 @@ expander arrow { min-height: 16px; } - -/******************* - * scrolled window * - *******************/ - -scrolledwindow viewport list row { - border: none; - box-shadow: none; - padding: 2px; - margin: 0px; -} - -scrolledwindow.frame, -scrolledwindow { - padding: 0px; - padding-bottom: 0px; - margin: 1px; -} - -/* transmission misteriously resets border-width to zero, cant even force it here*/ -scrolledwindow.frame { - border-width: 1px; - padding: 1px; -} - -/* nautilus seems to have a special transparent icon canvas, since scrolledwindow is also transparent -the default background color is shown, lets paint it with the base color */ -.nautilus-window overlay > scrolledwindow { - background-color: @base_color; -} - - /************ * iconview * ************/ @@ -1720,8 +1768,9 @@ using borders or box-shadows on one side of the header > tabs */ notebook { padding-left: 0px; padding-right: 0px; - margin-top: 0px; -} + margin-top: 0px; } + notebook stack notebook { + margin: 5px; } notebook > header { background-color: @bg_color; @@ -1741,11 +1790,6 @@ notebook > stack{ margin: 3px; } -notebook stack box frame { -border: transparent; -box-shadow: none; -} - notebook:not(.frame) > stack { padding: 0px; margin: 0px; @@ -1776,32 +1820,11 @@ notebook > header.top tab:checked { outline: 1px dotted @border_dark; } -/*notebook stack box scrolledwindow viewport { -border: transparent; -box-shadow: none; -}*/ - -dialog box box notebook stack box frame { -border-left: 1px solid @bg_shade; -border-top: 1px solid @bg_shade; -border-right: 1px solid white; -border-bottom: 1px solid white; -box-shadow: inset 1px 1px white, - inset -1px -1px @bg_shade; +notebook header.top { +padding: 0px; +margin-bottom: -4px; } -dialog box box box notebook stack grid frame { -border-left: 1px solid @bg_shade; -border-top: 1px solid @bg_shade; -border-right: 1px solid white; -border-bottom: 1px solid white; -box-shadow: inset 1px 1px white, - inset -1px -1px @bg_shade; -} - -/* Note to self: bottom and right use a newer method better than top and left, update them -in the future... */ - /* TOP tabs */ notebook > header.top { margin-left: -1px; @@ -1855,7 +1878,7 @@ notebook > header.left > tabs { } notebook > header.left > tabs > tab { /* raised 2px EXCEPTION */ - padding-bottom: 1px; + padding-bottom: 6px; border-right: 0px; box-shadow: inset 1px 1px @bg_bright, inset 0px -1px @bg_shade; @@ -1867,10 +1890,12 @@ notebook > header.left > tabs > tab { } notebook > header.left > tabs > tab:checked { - margin-left: 0px; - margin-right: 0px; - margin-top: -3px; - margin-bottom: -3px; + padding: 0px; + padding-bottom: 5px; + margin-left: 0px; + margin-right: 0px; + margin-top: -3px; + margin-bottom: -3px; } notebook header.left tabs tab:checked label { @@ -1935,7 +1960,7 @@ notebook > header.right > tabs { } notebook > header.right > tabs > tab { /* raised 2px EXCEPTION */ - padding-bottom: 1px; + padding-bottom: 6px; border-left: 0px; box-shadow: inset 0px 1px @bg_bright, inset -1px -1px @bg_shade; @@ -1947,12 +1972,12 @@ notebook > header.right > tabs > tab { } notebook > header.right > tabs > tab:checked { - margin-left: -1px; - margin-right: -1px; - - margin-top: -3px; - margin-bottom: -3px; -} + padding: 0px; + padding-bottom: 5px; + margin-left: -1px; + margin-right: -1px; + margin-top: -3px; + margin-bottom: -3px; } notebook header.right tabs tab:checked label { margin: 5px; @@ -2043,67 +2068,43 @@ levelbar.horizontal.discrete block { scale.vertical { margin-top: 3px; margin-bottom: 3px; - padding: 1px 7px 1px 7px; -} - -scale.horizontal { + padding: 1px 7px 1px 7px; } + scale.horizontal { margin-left: 3px; margin-right: 3px; - padding: 9px 1px 9px 1px; -} - -scale trough { + padding: 9px 1px 9px 1px; } + scale trough { + min-width: 1px; + min-height: 1px; } + scale highlight, scale empty { min-width: 1px; min-height: 1px; -} - -scale highlight, -scale empty { - min-width: 1px; - min-height: 1px; - background-color: transparent; -} - -scale.vertical slider { + background-color: transparent; } + scale.vertical slider { min-width: 1px; min-height: 10px; - margin: 0px -12px 0px -12px; -} -scale.horizontal slider { - min-width: 10px; - min-height: 1px; - margin: -12px 0px -12px 0px; -} - -/* there might be other cases where the inside is filled by other widgets */ -scale.color contents trough { + margin: 0px -12px 0px -12px; } + scale.horizontal slider { + min-width: 10px; + min-height: 1px; + margin: -12px 0px -12px 0px; } + /* there might be other cases where the inside is filled by other widgets */ + scale.color contents trough { min-height: 8px; - min-width: 8px; -} - -/* outline inside the trough node is terrible, this disables it but -can't put it in the slider... -scale *:focus { -outline: 0px; -} */ - -scale:focus trough { - outline-offset: 2px; -} + min-width: 8px; } + /* outline inside the trough node is terrible, this disables it but can't put it in the slider... + scale *:focus { + outline: 0px; } */ + scale:focus trough { + outline-offset: 2px; } + scale value { + padding: 4px } /**************** * stacksidebar * ****************/ -stacksidebar > scrolledwindow { - padding: 0px; - margin: 0px; - border: 0px; - - box-shadow: none; -} - stacksidebar separator { padding: 0px; margin: 0px; @@ -2119,7 +2120,7 @@ stacksidebar.sidebar list{ } stacksidebar list row { - padding: 2px; + padding: 3px; margin: 0px; } @@ -2151,8 +2152,9 @@ stacksidebar list row:selected:hover { ***********/ stack overlay box box scrolledwindow viewport list row { - border-bottom: 1px solid @bg_shade; -} + border-bottom: 1px solid @bg_shade; } + notebook notebook stack { + margin: 2px; } /*********** * sidebar * @@ -2173,14 +2175,15 @@ placessidebar list > row, * sidebar * ***********/ -.sidebar, +/*.sidebar,*/ .sidebar.view, -.sidebar .view, -.sidebar GtkScrolledWindow { +.sidebar .view { + background-color: @selected_fg_color; + color: @text_color; + box-shadow: none;} + .sidebar { background-color: @selected_fg_color; - color: @text_color; - box-shadow: none; -} + color: @text_color;} .sidebar row:selected, .sidebar row:selected:hover, @@ -2208,7 +2211,7 @@ NEW ON GTK 3.18 ---------------*/ GtkSidebarRow.list-row { - padding: 0px; + padding: 3px; } GtkSidebarRow .sidebar-revealer { @@ -2452,11 +2455,6 @@ overlay.osd { background-color: transparent; } -.osd.frame { - background-clip: border-box; - background-origin: border-box; -} - overlay toolbar.osd { border-bottom: none; box-shadow: none; @@ -2879,32 +2877,15 @@ grid viewport box box textview { background-color: white; } -grid viewport { - border: none; - background-color: white; - border: 1px solid black; -} - grid viewport box { background-color: white; } -grid viewport box scrolledwindow viewport { - border: none; - box-shadow: inset 0 0; - background-color: white; -} - /* printdialog */ -printdialog notebook > stack > box { - padding: 10px; -} - printdialog notebook { border-right: 1px solid black; border-bottom: 1px solid black; box-shadow: inset 1px 1px 0 0 white, inset -1px -1px @bg_shade; - margin: 7px; -} + margin: 7px; } diff --git a/Theme/Chicago95/gtk-3.0/gtk.css b/Theme/Chicago95/gtk-3.0/gtk.css index ef96657..48e74c8 100755 --- a/Theme/Chicago95/gtk-3.0/gtk.css +++ b/Theme/Chicago95/gtk-3.0/gtk.css @@ -31,8 +31,8 @@ @define-color font_bright white; @define-color disabled_font_shadow white; @define-color disabled_font #808080; -@defube0color icon_shadow black; -@defube0color icon_shadow_bright white; +@define-color icon_shadow black; +@define-color icon_shadow_bright white; /* dark color scheme */ @define-color dark_bg_color @bg_color; @@ -101,6 +101,7 @@ @import url("gtk-widgets.css"); @import url("apps/xfce.css"); @import url("apps/whiskermenu.css"); +@import url("apps/filechooser.css"); /* @import url("apps/gnome-applications.css"); @import url("apps/granite-widgets.css"); diff --git a/Theme/Chicago95/misc/windows.png b/Theme/Chicago95/misc/windows.png old mode 100755 new mode 100644 index a138ce7..4414f00 Binary files a/Theme/Chicago95/misc/windows.png and b/Theme/Chicago95/misc/windows.png differ