diff options
Diffstat (limited to 'common/gtk-3.0/3.14')
| -rw-r--r-- | common/gtk-3.0/3.14/.nvmrc | 2 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-dark.css | 360 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-darker.css | 334 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 364 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 338 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid.css | 338 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/gtk-contained.css | 334 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_colors.scss | 32 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_common.scss | 35 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_drawing.scss | 33 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_lightdm.scss | 67 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_transparent_widgets.scss | 2 |
12 files changed, 1095 insertions, 1144 deletions
diff --git a/common/gtk-3.0/3.14/.nvmrc b/common/gtk-3.0/3.14/.nvmrc index 43c2417..2bf5ad0 100644 --- a/common/gtk-3.0/3.14/.nvmrc +++ b/common/gtk-3.0/3.14/.nvmrc @@ -1 +1 @@ -0.12.5 +stable diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 5ca613b..eb0bf39 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -675,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -821,9 +820,9 @@ GtkComboBox { background-color: #444852; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1309,7 +1308,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #2d3036; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -1786,7 +1785,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1816,8 +1815,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1962,6 +1961,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -1970,32 +1970,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2158,10 +2157,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2250,7 +2249,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } .window-frame.csd.tooltip { border-radius: 2px; @@ -2512,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; @@ -2850,16 +2849,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2937,8 +2936,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2946,10 +2945,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2970,7 +2969,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2979,21 +2978,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3178,8 +3177,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3345,18 +3344,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3374,9 +3373,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(68, 72, 82, 0.95); + background-color: #383C45; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #D3DAE3; @@ -3405,30 +3406,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #D3DAE3; @@ -3439,50 +3442,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3503,12 +3504,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid rgba(46, 49, 56, 0.95); } + border-right: 1px solid rgba(37, 39, 45, 0.95); } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid rgba(46, 49, 56, 0.95); } + border-left: 1px solid rgba(37, 39, 45, 0.95); } GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, @@ -3542,7 +3543,7 @@ NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, NemoWindow NemoPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3563,7 +3564,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3583,7 +3584,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3615,7 +3616,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3660,7 +3661,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3671,7 +3672,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3721,16 +3722,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(46, 49, 56, 0.95); } + background-color: rgba(37, 39, 45, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3742,23 +3743,23 @@ GtkFileChooserDialog .dialog-action-box { background-color: #444852; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(35, 37, 42, 0.95); } + border-color: rgba(25, 27, 31, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(46, 49, 56, 0.95); } + background-color: rgba(37, 39, 45, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3769,19 +3770,19 @@ GeditWindow.background.csd { background-color: #383C45; } .gedit-document-panel { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } .maximized .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3795,21 +3796,21 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3825,60 +3826,59 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(53, 57, 65, 0.95); } + border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index d296129..6527a56 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -675,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -821,9 +820,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1310,7 +1309,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -1787,7 +1786,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1817,8 +1816,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1963,6 +1962,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -1971,32 +1971,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2159,10 +2158,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2251,7 +2250,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; @@ -2513,7 +2512,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; @@ -2851,16 +2850,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2938,8 +2937,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2947,10 +2946,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2971,7 +2970,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2980,21 +2979,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3179,8 +3178,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3346,18 +3345,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3375,9 +3374,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3406,30 +3407,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3440,50 +3443,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3554,7 +3555,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3574,7 +3575,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3606,7 +3607,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3651,7 +3652,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3662,7 +3663,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3733,7 +3734,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3743,7 +3744,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3764,15 +3765,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3786,7 +3787,7 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: rgba(60, 64, 73, 0.95); } @@ -3798,9 +3799,9 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3818,58 +3819,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index be70c84..178b3af 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -675,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -821,9 +820,9 @@ GtkComboBox { background-color: #444852; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1309,7 +1308,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #2d3036; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -1786,7 +1785,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1816,8 +1815,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1962,40 +1961,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2158,10 +2157,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2250,7 +2249,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } .window-frame.csd.tooltip { border-radius: 2px; @@ -2512,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; @@ -2850,16 +2849,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2937,8 +2936,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2946,10 +2945,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2970,7 +2969,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2979,21 +2978,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3178,8 +3177,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3345,18 +3344,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3374,9 +3373,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(68, 72, 82, 0.95); + background-color: #383C45; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #D3DAE3; @@ -3405,30 +3406,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #D3DAE3; @@ -3439,50 +3442,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3503,12 +3504,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid #2e3138; } + border-right: 1px solid #25272d; } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid #2e3138; } + border-left: 1px solid #25272d; } GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, @@ -3542,7 +3543,7 @@ NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, NemoWindow NemoPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3563,7 +3564,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3583,7 +3584,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3615,7 +3616,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3660,7 +3661,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3671,7 +3672,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3721,16 +3722,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #2e3138; } + background-color: #25272d; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3742,23 +3743,23 @@ GtkFileChooserDialog .dialog-action-box { background-color: #444852; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #23252a; } + border-color: #191b1f; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #2e3138; } + background-color: #25272d; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3769,19 +3770,19 @@ GeditWindow.background.csd { background-color: #383C45; } .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .maximized .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3795,21 +3796,21 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3825,60 +3826,59 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #353941; } + border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 98a78c9..5ce2657 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -675,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -821,9 +820,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1310,7 +1309,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -1787,7 +1786,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1817,8 +1816,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1963,40 +1962,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2159,10 +2158,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2251,7 +2250,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; @@ -2513,7 +2512,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; @@ -2851,16 +2850,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2938,8 +2937,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2947,10 +2946,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2971,7 +2970,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2980,21 +2979,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3179,8 +3178,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3346,18 +3345,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3375,9 +3374,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3406,30 +3407,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3440,50 +3443,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3554,7 +3555,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3574,7 +3575,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3606,7 +3607,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3651,7 +3652,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3662,7 +3663,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3733,7 +3734,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3743,7 +3744,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3764,15 +3765,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3786,7 +3787,7 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } @@ -3798,9 +3799,9 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3818,58 +3819,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 4f72252..a804228 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -675,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -821,9 +820,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -1309,7 +1308,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -1786,7 +1785,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1816,8 +1815,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1962,40 +1961,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2158,10 +2157,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2250,7 +2249,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; @@ -2512,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; @@ -2850,16 +2849,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2937,8 +2936,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2946,10 +2945,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2970,7 +2969,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2979,21 +2978,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3178,8 +3177,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3345,18 +3344,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3374,9 +3373,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3405,30 +3406,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3439,50 +3442,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3553,7 +3554,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3573,7 +3574,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3605,7 +3606,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3650,7 +3651,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3661,7 +3662,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3732,7 +3733,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3742,7 +3743,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3763,15 +3764,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3785,7 +3786,7 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } @@ -3797,9 +3798,9 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3817,58 +3818,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 2628d67..89e41ca 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -675,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -821,9 +820,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -1309,7 +1308,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -1786,7 +1785,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1816,8 +1815,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1962,6 +1961,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -1970,32 +1970,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2158,10 +2157,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2250,7 +2249,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; @@ -2512,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; @@ -2850,16 +2849,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2937,8 +2936,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2946,10 +2945,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2970,7 +2969,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2979,21 +2978,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3178,8 +3177,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3345,18 +3344,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3374,9 +3373,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3405,30 +3406,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3439,50 +3442,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3553,7 +3554,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3573,7 +3574,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3605,7 +3606,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3650,7 +3651,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3661,7 +3662,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3732,7 +3733,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3742,7 +3743,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3763,15 +3764,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3785,7 +3786,7 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: rgba(60, 64, 73, 0.95); } @@ -3797,9 +3798,9 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3817,58 +3818,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.14/sass/_colors.scss b/common/gtk-3.0/3.14/sass/_colors.scss index c32b223..9c51858 100644 --- a/common/gtk-3.0/3.14/sass/_colors.scss +++ b/common/gtk-3.0/3.14/sass/_colors.scss @@ -24,19 +24,6 @@ $success_color: #73d216; $destructive_color: #F04A50; $suggested_color: #4DADD4; -$osd_fg_color: #A8ADB5; -$osd_bg_color: transparentize(#3c4049, 0.05); -$osd_button_bg: darken($osd_bg_color, 3%); - -$osd_insensitive_bg_color: darken($osd_bg_color, 3%); -$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); -$osd_borders_color: transparentize(black, 0.3); - - -$tooltip_bg: $osd_bg_color; -$tooltip_fg: #edf5fb; -$tooltip_borders_color: transparentize(white, 0.9); - //insensitive state derived colors $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); @@ -44,7 +31,6 @@ $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), $entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); $entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); -$entry_focus_border: $selected_bg_color; $button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); $button_border: $entry_border; @@ -55,8 +41,6 @@ $header_bg: red; @if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } @if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } -//$header_bg: if(($darker == 'true' or $variant == 'dark') and $transparency == 'true', transparentize(#2f343b, 0.03), #2f343b); - $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); $header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); @@ -64,15 +48,19 @@ $header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_b $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true' and $variant == 'light', $osd_bg_color, opacify($osd_bg_color, 1)); -@if $variant==dark { $dark_sidebar_bg: if($transparency == 'true', lighten($osd_bg_color, 4%), lighten(opacify($osd_bg_color, 1), 4%)); } - -$dark_sidebar_fg: $osd_fg_color; +$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_fg: #BAC3CF; $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); -$panel_bg: darken($osd_bg_color, 10%); -$panel_fg: $dark_sidebar_fg; +$osd_fg_color: $dark_sidebar_fg; +$osd_bg_color: darken($dark_sidebar_bg, 8%); + +$osd_insensitive_bg_color: darken($osd_bg_color, 3%); +$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); +$osd_borders_color: transparentize(black, 0.3); +$panel_bg: darken($osd_bg_color, 4.7%); +$panel_fg: $osd_fg_color; //WM Buttons diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index b9f2863..d9e56c9 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -441,7 +441,7 @@ $_dot_color: $selected_bg_color; &.image-button { padding: 10px; } - &:hover { @include button(osd-hover); border-color: transparentize($osd_fg_color, 0.7)} + &:hover { @include button(osd-hover); background-color: $osd_bg_color; } &:active, &:checked { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } @@ -736,9 +736,10 @@ $_dot_color: $selected_bg_color; border-radius: 2px; &:hover { background-color: mix($fg_color,$bg_color,5%); } - &:selected, &:checked, &:active { + &:active, &:selected { @extend %selected_items; } + &:checked { color: $fg_color; } } /********* @@ -970,9 +971,9 @@ GtkComboBox { background-color: $bg_color; .osd &, &.osd { padding: 7px; - border: none; - border-radius: 4px; - background-color: $osd_bg_color; + border: 1px solid transparentize(black, 0.4); + border-radius: 3px; + background-color: transparentize($osd_bg_color, 0.1); } } @@ -1377,7 +1378,6 @@ GtkTreeView.view { // treeview grid lines a background-color: $selected_fg_color; } } - &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; background-color: $button_border; @@ -1480,7 +1480,7 @@ column-header.button.dnd { // for treeview-like derive widgets .csd & { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } @@ -1637,12 +1637,6 @@ column-header.button.dnd { // for treeview-like derive widgets &.top, &.bottom { padding-left: 12px; // for a nicer close button padding-right: 12px; // placement - //border-left-width: 1px; - //border-right-width: 1px; - } - &.left, &.right { - //border-bottom-width: 1px; - //border-top-width: 1px; } } @each $_tab in (top, bottom, right, left) { @@ -1790,6 +1784,7 @@ column-header.button.dnd { // for treeview-like derive widgets background-color: $base_color; } + /********** * Switch * **********/ @@ -2189,15 +2184,15 @@ GtkScrolledWindow { .app-notification, .app-notification.frame { - @extend %osd; padding: 10px; - background-color: $osd_bg_color; + color: $dark_sidebar_fg; + background-color: $dark_sidebar_bg; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: darken($osd_bg_color, 10%); - + border-color: darken($dark_sidebar_bg, 10%); + .button { @include button(osd); &.flat { @@ -2459,11 +2454,11 @@ GtkInfoBar { &.background { // background-color needs to be set this way otherwise it gets drawn twice // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details. - background-color: $tooltip_bg; + background-color: $osd_bg_color; background-clip: padding-box; } - color: $tooltip_fg; + color: $osd_fg_color; border-radius: 2px; &.window-frame.csd { @@ -2591,7 +2586,7 @@ GtkVolumeButton.button { padding: 8px; } } &.csd { &.popup, &.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px if($variant == 'light', $_wm_border, darken($base_color, 10%)); } diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss index 378e5d9..c073126 100644 --- a/common/gtk-3.0/3.14/sass/_drawing.scss +++ b/common/gtk-3.0/3.14/sass/_drawing.scss @@ -87,30 +87,30 @@ @else if $t==osd { // - // normal osd button + // normal osd entry // color: $osd_fg_color; - border-color: transparentize($osd_fg_color, 0.7); + border-color: transparentize(black, 0.6); background-color: transparent; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-image: linear-gradient(to bottom, transparentize(black, 0.8)); } @else if $t==osd-focus { // - // active osd button + // active osd entry // - color: $selected_bg_color; + color: $osd_fg_color; border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-image: linear-gradient(to bottom, transparentize(black, 0.8)); } @else if $t==osd-insensitive { // - // insensitive osd button + // insensitive osd entry // color: $osd_insensitive_fg_color; - border-color: transparentize($osd_fg_color, 0.8); - background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); + border-color: transparentize(black, 0.6); + background-image: linear-gradient(to bottom, transparentize(black, 0.9)); } } @@ -237,19 +237,18 @@ // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - border-color: transparentize($osd_fg_color, 0.7); - background-color: transparent; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + border-color: transparentize(black, 0.55); + background-color: transparentize(black, 0.7); } @else if $t==osd-hover { // // active osd button // - color: $selected_bg_color; + color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-color: transparentize(black, 0.7); } @else if $t==osd-active { @@ -259,7 +258,7 @@ color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, $selected_bg_color); + background-color: $selected_bg_color; } @else if $t==osd-insensitive { @@ -267,8 +266,8 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border-color: transparentize($osd_fg_color, 0.8); - background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); + border-color: transparentize(black, 0.55); + background-color: transparentize(black, 0.85); } @else if $t==suggested_destructive { diff --git a/common/gtk-3.0/3.14/sass/_lightdm.scss b/common/gtk-3.0/3.14/sass/_lightdm.scss index 9b14d09..9b2fa76 100644 --- a/common/gtk-3.0/3.14/sass/_lightdm.scss +++ b/common/gtk-3.0/3.14/sass/_lightdm.scss @@ -14,7 +14,7 @@ } .menubar .menuitem:insensitive { - color: darken($panel_fg, 20%); + color: transparentize($panel_fg, 0.5); GtkLabel { color: inherit; } } @@ -34,9 +34,11 @@ /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: transparentize($bg_color, 0.05); + background-color: if($variant == 'light', $bg_color, $base_color); border-top-left-radius: 2px; border-top-right-radius: 2px; + border: solid transparentize(black, 0.9); + border-width: 1px 1px 0 1px; } #content_frame .button { @@ -53,8 +55,11 @@ padding-bottom: 0px; border-style: none; background-color: $osd_bg_color; - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid transparentize(black, 0.9); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px darken($osd_bg_color, 10%); } #buttonbox_frame .button{ @@ -76,7 +81,7 @@ /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; + border-radius: 2px; } /* the border around the user's avatar box */ @@ -84,54 +89,18 @@ /* the shutdown button */ #shutdown_button.button { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: $destructive_color; - background-color: $destructive_color; - background-image: none; - background-clip: border-box; - - &:hover { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: lighten($destructive_color, 9%); - background-color: lighten($destructive_color, 9%); - background-image: none; - } - &:active, &:checked { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: darken($destructive_color, 7%); - background-color: darken($destructive_color, 7%); - background-image: none; - } + @include button(suggested_destructive, $destructive_color); + + &:hover { @include button(suggested_destructive, lighten($destructive_color, 10%)); } + &:active, &:checked { @include button(suggested_destructive, darken($destructive_color, 10%)); } } /* the restart button */ #restart_button.button { - $_restart_bg: #51CF74; - - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: $_restart_bg; - background-color: $_restart_bg; - background-image: none; - background-clip: border-box; - - &:hover { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: lighten($_restart_bg, 9%); - background-color: lighten($_restart_bg, 9%); - background-image: none; - } - &:active, &:checked { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: darken($_restart_bg, 7%); - background-color: darken($_restart_bg, 7%); - background-image: none; - } + @include button(suggested_destructive, $suggested_color); + + &:hover { @include button(suggested_destructive, lighten($suggested_color, 10%)); } + &:active, &:checked { @include button(suggested_destructive, darken($suggested_color, 10%)); } } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ diff --git a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss index 2e05e43..e10fb05 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -38,7 +38,7 @@ MarlinViewWindow { background-color: transparent; color: $dark_sidebar_fg; - &.image { color: transparentize($dark_sidebar_fg, 0.4); } + &.image { color: transparentize($dark_sidebar_fg, 0.3); } &.cell:selected { background-color: $selected_bg_color; |