diff options
Diffstat (limited to 'common/gtk-3.0')
33 files changed, 1250 insertions, 825 deletions
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 2e76f77..cba9510 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -720,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1396,14 +1400,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1463,45 +1468,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2452,6 +2460,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } @@ -2869,9 +2880,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2896,6 +2904,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #404552; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3414,7 +3425,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3550,6 +3562,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3562,8 +3577,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3841,10 +3855,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3882,10 +3896,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -3900,13 +3910,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(42, 45, 55, 0.95); } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #2f343f; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #2f343f; } .gedit-bottom-panel-paned { background-color: #404552; } 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 dca07d7..0f669e0 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1399,14 +1403,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1466,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2455,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2872,9 +2883,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2899,6 +2907,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3417,7 +3428,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3553,6 +3565,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3565,8 +3580,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3834,10 +3848,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3875,10 +3889,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -3893,13 +3903,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #2f343f; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #2f343f; } .gedit-bottom-panel-paned { background-color: #ffffff; } 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 e815030..01c40c4 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 @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -720,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1396,14 +1400,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1463,45 +1468,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2452,6 +2460,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } @@ -2869,9 +2880,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2896,6 +2904,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #404552; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3414,7 +3425,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3550,6 +3562,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3562,8 +3577,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3841,10 +3855,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3882,10 +3896,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -3900,13 +3910,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #2a2d37; } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #2f343f; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #2a2d37; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #2f343f; } .gedit-bottom-panel-paned { background-color: #404552; } 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 073614b..a720b5f 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 @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1399,14 +1403,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1466,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2455,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2872,9 +2883,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2899,6 +2907,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3417,7 +3428,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3553,6 +3565,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3565,8 +3580,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3834,10 +3848,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3875,10 +3889,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -3893,13 +3903,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #2f343f; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #2f343f; } .gedit-bottom-panel-paned { background-color: #ffffff; } 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 20dcea4..cb5c4df 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1399,14 +1403,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1466,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2455,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2872,9 +2883,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2899,6 +2907,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3417,7 +3428,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3553,6 +3565,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3565,8 +3580,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3834,10 +3848,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3875,10 +3889,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #d4d5db; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #e7e8eb; } @@ -3893,13 +3903,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #e7e8eb; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #e7e8eb; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 6864b67..fa315ab 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1399,14 +1403,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1466,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2455,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2872,9 +2883,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2899,6 +2907,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3417,7 +3428,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3553,6 +3565,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3565,8 +3580,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3834,10 +3848,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3875,10 +3889,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(212, 213, 219, 0.95); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(231, 232, 235, 0.95); } @@ -3893,13 +3903,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #e7e8eb; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #e7e8eb; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index 5c0841f..2f6738b 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -71,8 +71,6 @@ TerminalWindow { // // Nautilus // -NautilusCanvasViewContainer.view .entry { border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -96,62 +94,56 @@ NautilusNotebook.notebook { } } -//NautilusNotebook.notebook { -// background-color: $base_color; -//} - NautilusQueryEditor .search-bar.toolbar { padding: 5px; box-shadow: none; background-color: $base_color; } - // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } - -NemoWindow .sidebar .frame { - border-width: 0; -} - -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} - .nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoWindow .primary-toolbar NemoPathBar.linked > .button { - $_linked_separator_color: $header_button_border; +NemoWindow { - @include button(header-hover); + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:insensitive { color: transparentize($header_fg, 0.4); } + .sidebar .frame { border-width: 0; } - @extend %linked; + GtkSeparator.separator.horizontal { color: $borders_color; } - &:hover { - box-shadow: inset 1px 0 $_linked_separator_color, - inset -1px 0 $_linked_separator_color; - } - &:active, &:checked { box-shadow: none; } + .primary-toolbar NemoPathBar.linked > .button { + $_linked_separator_color: $header_button_border; - &:first-child { - &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } - &:active, &:checked { box-shadow: none; } - } - &:last-child { - &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } - &:active, &:checked { box-shadow: none; } - } - &:only-child { - &:hover { box-shadow: none; } + @include button(header-hover); + + &:hover { background-color: lighten($header_button_bg, 15%); } + &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } + + @extend %linked; + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } &:active, &:checked { box-shadow: none; } + + &:first-child { + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:last-child { + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:only-child { + &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } + } } } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 8ed1d94..05abc85 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -473,6 +473,7 @@ $_dot_color: $selected_bg_color; &:hover { @include button(osd-hover); @extend %linked; + &, &:first-child, &:last-child { box-shadow: none; } } &:active, &:checked { background-clip: padding-box; @@ -489,6 +490,7 @@ $_dot_color: $selected_bg_color; box-shadow: none; &:hover { @include button(osd-hover); + &, &:first-child, &:last-child { box-shadow: none; } } &:insensitive { @include button(osd-insensitive); @@ -1481,16 +1483,17 @@ GtkTreeView.view { // treeview grid lines a &.progressbar { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; + background-image: linear-gradient(to bottom, $selected_bg_color); &:selected { color: $selected_bg_color; box-shadow: none; - background-color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_fg_color); } } &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; - background-color: $button_border; + background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; } @@ -1584,7 +1587,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1630,6 +1633,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2684,6 +2689,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } &.csd { &.popup, &.menu { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/sass/_granite.scss b/common/gtk-3.0/3.14/sass/_granite.scss index 1e53c7f..8e3b35d 100644 --- a/common/gtk-3.0/3.14/sass/_granite.scss +++ b/common/gtk-3.0/3.14/sass/_granite.scss @@ -192,6 +192,11 @@ GraniteWidgetsPopOver * { } // +// Xs Entry +// +GraniteWidgetsXsEntry.entry { padding: 4px; } + +// // Text Styles // .h1 { font: open sans 24px; } @@ -201,7 +206,6 @@ GraniteWidgetsPopOver * { .category-label { color: mix($bg_color, $text_color, 30%); font-weight: 600; - text-shadow: 0 1px transparentize(white, 0.4); } .h4 { 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 b04ed38..c89875f 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -53,10 +53,13 @@ MarlinViewWindow { .scrollbar { @extend %dark_sidebar_scrollbar } } &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - - .pane-separator { background-color: $dark_sidebar_border; } } +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {background-color: $dark_sidebar_border} + GtkFileChooserDialog { &.background.csd, &.background { background-color: $dark_sidebar_bg } @@ -100,8 +103,6 @@ GeditWindow.background.csd { > .titlebar .pane-separator:backdrop, &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } - > .titlebar { background-color: transparent; } - > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: $header_bg; @@ -115,11 +116,17 @@ GeditWindow.background.csd { } } -// Gedit -GeditWindow.background.csd { +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { background-color: transparent; +} + +// Gedit +GeditWindow.background { + &.csd { background-color: transparent; } - .pane-separator { background-color: $dark_sidebar_border; } + .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } + .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } > .titlebar.default-decoration, > .titlebar.default-decoration:backdrop { background-color: opacify($header_bg, 1); } // fix for elementary OS diff --git a/common/gtk-3.0/3.14/sass/_unity.scss b/common/gtk-3.0/3.14/sass/_unity.scss index 48ebb2b..00fec8f 100644 --- a/common/gtk-3.0/3.14/sass/_unity.scss +++ b/common/gtk-3.0/3.14/sass/_unity.scss @@ -53,6 +53,7 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: $selected_bg_color; + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_bg_color); border-bottom: none; } diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index e58b5de..f38632e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -720,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1402,14 +1406,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1469,45 +1474,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2530,12 +2538,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { @@ -2556,12 +2567,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2582,7 +2592,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2778,9 +2789,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2836,6 +2844,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #313541; border-color: #1b1d24; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3365,7 +3376,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3501,6 +3513,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3513,8 +3528,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3786,10 +3800,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3827,10 +3841,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -3845,10 +3855,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 970b8e8..30da6e9 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1405,14 +1409,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1472,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2533,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { 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 { @@ -2559,12 +2570,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2585,7 +2595,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2781,9 +2792,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2839,6 +2847,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3368,7 +3379,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3504,6 +3516,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3516,8 +3531,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3779,10 +3793,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3820,10 +3834,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -3838,10 +3848,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 3523ad9..4934854 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -720,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1402,14 +1406,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1469,45 +1474,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2530,12 +2538,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { @@ -2556,12 +2567,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2582,7 +2592,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2778,9 +2789,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2836,6 +2844,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #313541; border-color: #1b1d24; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3365,7 +3376,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3501,6 +3513,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3513,8 +3528,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3786,10 +3800,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3827,10 +3841,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -3845,10 +3855,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #2a2d37; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #2a2d37; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index 1716acc..530f297 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1405,14 +1409,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1472,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2533,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { 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 { @@ -2559,12 +2570,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2585,7 +2595,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2781,9 +2792,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2839,6 +2847,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3368,7 +3379,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3504,6 +3516,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3516,8 +3531,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3779,10 +3793,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3820,10 +3834,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -3838,10 +3848,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 291b0a9..2599d8e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1405,14 +1409,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1472,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2533,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { 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 { @@ -2559,12 +2570,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2585,7 +2595,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2781,9 +2792,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2839,6 +2847,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3368,7 +3379,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3504,6 +3516,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3516,8 +3531,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3779,10 +3793,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3820,10 +3834,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #d4d5db; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #e7e8eb; } @@ -3838,10 +3848,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 3eb5ee3..82d98f3 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1405,14 +1409,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1472,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2533,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { 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 { @@ -2559,12 +2570,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2585,7 +2595,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2781,9 +2792,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2839,6 +2847,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3368,7 +3379,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3504,6 +3516,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3516,8 +3531,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3779,10 +3793,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3820,10 +3834,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(212, 213, 219, 0.95); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(231, 232, 235, 0.95); } @@ -3838,10 +3848,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index af9eb56..259be9f 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -71,8 +71,6 @@ TerminalWindow { // // Nautilus // -NautilusCanvasViewContainer.view .entry { border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -139,48 +137,47 @@ $disk_space_free: darken($bg_color, 3%); // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } - -NemoWindow .sidebar .frame { - border-width: 0; -} - -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} - .nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoWindow .primary-toolbar NemoPathBar.linked > .button { - $_linked_separator_color: $header_button_border; +NemoWindow { - @include button(header-hover); + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:insensitive { color: transparentize($header_fg, 0.4); } + .sidebar .frame { border-width: 0; } - @extend %linked; + GtkSeparator.separator.horizontal { color: $borders_color; } - &:hover { - box-shadow: inset 1px 0 $_linked_separator_color, - inset -1px 0 $_linked_separator_color; - } - &:active, &:checked { box-shadow: none; } + .primary-toolbar NemoPathBar.linked > .button { + $_linked_separator_color: $header_button_border; - &:first-child { - &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } - &:active, &:checked { box-shadow: none; } - } - &:last-child { - &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } - &:active, &:checked { box-shadow: none; } - } - &:only-child { - &:hover { box-shadow: none; } + @include button(header-hover); + + &:hover { background-color: lighten($header_button_bg, 15%); } + &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } + + @extend %linked; + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } &:active, &:checked { box-shadow: none; } + + &:first-child { + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:last-child { + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:only-child { + &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } + } } } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 87c21fc..ec66a1a 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -473,6 +473,7 @@ $_dot_color: $selected_bg_color; &:hover { @include button(osd-hover); @extend %linked; + &, &:first-child, &:last-child { box-shadow: none; } } &:active, &:checked { background-clip: padding-box; @@ -489,6 +490,7 @@ $_dot_color: $selected_bg_color; box-shadow: none; &:hover { @include button(osd-hover); + &, &:first-child, &:last-child { box-shadow: none; } } &:insensitive { @include button(osd-insensitive); @@ -1495,16 +1497,17 @@ GtkTreeView.view { // treeview grid lines a &.progressbar { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; + background-image: linear-gradient(to bottom, $selected_bg_color); &:selected { color: $selected_bg_color; box-shadow: none; - background-color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_fg_color); } } &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; - background-color: $button_border; + background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; } @@ -1598,7 +1601,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1644,6 +1647,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2804,6 +2809,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } // server-side decorations as used by mutter &.ssd { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); @@ -2812,7 +2821,7 @@ GtkVolumeButton.button { padding: 8px; } &.maximized { border-radius: 0; } } &.csd { - &.popup, &.menu { + &.popup { 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($bg_color, 10%)); @@ -2843,11 +2852,10 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1); - border-width: 0; &:hover { @include button(header-hover); @@ -2862,6 +2870,7 @@ GtkVolumeButton.button { padding: 8px; } background-color: transparent; background-position: center; background-repeat: no-repeat; + border-width: 0; &:backdrop { opacity: 1; } } diff --git a/common/gtk-3.0/3.16/sass/_granite.scss b/common/gtk-3.0/3.16/sass/_granite.scss index 1e53c7f..8e3b35d 100644 --- a/common/gtk-3.0/3.16/sass/_granite.scss +++ b/common/gtk-3.0/3.16/sass/_granite.scss @@ -192,6 +192,11 @@ GraniteWidgetsPopOver * { } // +// Xs Entry +// +GraniteWidgetsXsEntry.entry { padding: 4px; } + +// // Text Styles // .h1 { font: open sans 24px; } @@ -201,7 +206,6 @@ GraniteWidgetsPopOver * { .category-label { color: mix($bg_color, $text_color, 30%); font-weight: 600; - text-shadow: 0 1px transparentize(white, 0.4); } .h4 { diff --git a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss index 4c1b9c6..c69ed40 100644 --- a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss @@ -44,19 +44,20 @@ MarlinViewWindow { } } - &.frame { - color: $dark_sidebar_fg; - } + &.frame { color: $dark_sidebar_fg; } .separator { color: transparent; } .scrollbar { @extend %dark_sidebar_scrollbar } } &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - - .pane-separator { background-color: $dark_sidebar_border; } } +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {background-color: $dark_sidebar_border} + GtkFileChooserDialog { &.background.csd, &.background { background-color: $dark_sidebar_bg } @@ -100,8 +101,6 @@ GeditWindow.background.csd { > .titlebar .pane-separator:backdrop, &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } - > .titlebar { background-color: transparent; } - > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: $header_bg; @@ -115,11 +114,17 @@ GeditWindow.background.csd { } } -// Gedit -GeditWindow.background.csd { +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { background-color: transparent; +} + +// Gedit +GeditWindow.background { + &.csd { background-color: transparent; } - .pane-separator { background-color: $dark_sidebar_border; } + .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } + .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } } .gedit-bottom-panel-paned { background-color: $base_color; } diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss index 48ebb2b..00fec8f 100644 --- a/common/gtk-3.0/3.16/sass/_unity.scss +++ b/common/gtk-3.0/3.16/sass/_unity.scss @@ -53,6 +53,7 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: $selected_bg_color; + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_bg_color); border-bottom: none; } diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css index 4b4d7f9..a88f858 100644 --- a/common/gtk-3.0/3.18/gtk-contained-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-dark.css @@ -801,7 +801,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1540,14 +1540,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1607,45 +1608,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2429,8 +2433,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #D3DAE3; - background-color: rgba(43, 46, 57, 0.5); } + color: #D3DAE3; } /*********** * Dialogs * @@ -2516,6 +2519,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2703,12 +2717,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { @@ -2729,12 +2746,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2755,7 +2771,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2970,9 +2987,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3032,6 +3046,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #2b2e39; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3576,7 +3593,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3712,6 +3730,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3724,8 +3745,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4009,8 +4029,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4048,10 +4068,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -4066,10 +4082,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css index 50ff653..00d3ffc 100644 --- a/common/gtk-3.0/3.18/gtk-contained-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-darker.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1543,14 +1543,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1610,45 +1611,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2432,8 +2436,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #5c616c; - background-color: rgba(207, 214, 230, 0.5); } + color: #5c616c; } /*********** * Dialogs * @@ -2519,6 +2522,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2706,12 +2720,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { 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 { @@ -2732,12 +2749,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2758,7 +2774,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2973,9 +2990,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3035,6 +3049,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #dbdfe3; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3579,7 +3596,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3715,6 +3733,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3727,8 +3748,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4002,8 +4022,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4041,10 +4061,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -4059,10 +4075,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css index c72f3b5..261a428 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css @@ -801,7 +801,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1540,14 +1540,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1607,45 +1608,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2429,8 +2433,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #D3DAE3; - background-color: rgba(43, 46, 57, 0.5); } + color: #D3DAE3; } /*********** * Dialogs * @@ -2516,6 +2519,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2703,12 +2717,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { @@ -2729,12 +2746,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2755,7 +2771,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2970,9 +2987,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3032,6 +3046,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #2b2e39; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3576,7 +3593,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3712,6 +3730,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3724,8 +3745,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4009,8 +4029,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4048,10 +4068,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -4066,10 +4082,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #2a2d37; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #2a2d37; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css index 3da7479..f7062c4 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1543,14 +1543,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1610,45 +1611,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2432,8 +2436,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #5c616c; - background-color: rgba(207, 214, 230, 0.5); } + color: #5c616c; } /*********** * Dialogs * @@ -2519,6 +2522,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2706,12 +2720,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { 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 { @@ -2732,12 +2749,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2758,7 +2774,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2973,9 +2990,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3035,6 +3049,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #dbdfe3; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3579,7 +3596,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3715,6 +3733,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3727,8 +3748,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4002,8 +4022,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4041,10 +4061,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -4059,10 +4075,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css index 7f48e8f..5c646b3 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1547,14 +1547,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1614,45 +1615,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2436,8 +2440,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #5c616c; - background-color: rgba(207, 214, 230, 0.5); } + color: #5c616c; } /*********** * Dialogs * @@ -2523,6 +2526,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2710,12 +2724,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { 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 { @@ -2736,12 +2753,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2762,7 +2778,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2977,9 +2994,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3039,6 +3053,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #dbdfe3; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3583,7 +3600,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3719,6 +3737,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3731,8 +3752,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4006,8 +4026,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4045,10 +4065,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #d4d5db; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #e7e8eb; } @@ -4063,10 +4079,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index 1616fe1..d9e204e 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1547,14 +1547,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1614,45 +1615,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2436,8 +2440,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #5c616c; - background-color: rgba(207, 214, 230, 0.5); } + color: #5c616c; } /*********** * Dialogs * @@ -2523,6 +2526,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2710,12 +2724,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { 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 { @@ -2736,12 +2753,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2762,7 +2778,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2977,9 +2994,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3039,6 +3053,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #dbdfe3; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3583,7 +3600,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3719,6 +3737,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3731,8 +3752,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4006,8 +4026,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4045,10 +4065,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(212, 213, 219, 0.95); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(231, 232, 235, 0.95); } @@ -4063,10 +4079,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index e95a754..6418e56 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -90,8 +90,6 @@ TerminalWindow { // // Nautilus // -NautilusCanvasViewContainer.view .entry { border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -162,50 +160,47 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } +.nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoWindow .sidebar .frame { - border-width: 0; -} +NemoWindow { -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry -.nemo-desktop.nemo-canvas-item { - @extend .nautilus-desktop.nautilus-canvas-item; -} + .sidebar .frame { border-width: 0; } -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button { + GtkSeparator.separator.horizontal { color: $borders_color; } - @include button(header-hover); + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button { - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:insensitive { color: transparentize($header_fg, 0.4); } -} + @include button(header-hover); -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button, -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover, -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked, -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive { - @extend %linked; - @extend %linked_button; -} + &:hover { background-color: lighten($header_button_bg, 15%); } + &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } + } -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) { + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive { + @extend %linked; + @extend %linked_button; + } - $_linked_separator_color: $header_button_border; + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) { - > .button:hover:not(:checked):not(:active):not(:only-child) { + $_linked_separator_color: $header_button_border; - &:hover { - box-shadow: inset 1px 0 $_linked_separator_color, - inset -1px 0 $_linked_separator_color; - } - &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; } - &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + > .button:hover:not(:checked):not(:active):not(:only-child) { + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } + &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + } } } diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 1ce7d17..db4fb6c 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1594,16 +1594,17 @@ GtkTreeView.view { // treeview grid lines a &.progressbar { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; + background-image: linear-gradient(to bottom, $selected_bg_color); &:selected { color: $selected_bg_color; box-shadow: none; - background-color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_fg_color); } } &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; - background-color: $button_border; + background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; } @@ -1697,7 +1698,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1743,6 +1744,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2569,7 +2572,6 @@ GtkCalendar { &:inconsistent { color: gtkalpha(currentColor,0.55); } &.highlight { color: $fg_color; - background-color: transparentize($button_border, 0.5); } } @@ -2707,6 +2709,23 @@ GtkPlacesSidebar.sidebar { } // +// File chooser +// +GtkPlacesView { + .server-list-button > GtkImage { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(0turn); + } + + .server-list-button:checked > GtkImage { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(-0.5turn); + } + + .list-row.activatable:hover { background-color: transparent; } +} + +// // Paned // GtkPaned { // this is for the standard paned separator @@ -2951,6 +2970,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } // server-side decorations as used by mutter &.ssd { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); @@ -2959,7 +2982,7 @@ GtkVolumeButton.button { padding: 8px; } &.maximized { border-radius: 0; } } &.csd { - &.popup, &.menu { + &.popup { 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($bg_color, 10%)); @@ -2990,11 +3013,10 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1); - border-width: 0; &:hover { @include button(header-hover); @@ -3009,6 +3031,7 @@ GtkVolumeButton.button { padding: 8px; } background-color: transparent; background-position: center; background-repeat: no-repeat; + border-width: 0; &:backdrop { opacity: 1; } } diff --git a/common/gtk-3.0/3.18/sass/_granite.scss b/common/gtk-3.0/3.18/sass/_granite.scss index 1e53c7f..8e3b35d 100644 --- a/common/gtk-3.0/3.18/sass/_granite.scss +++ b/common/gtk-3.0/3.18/sass/_granite.scss @@ -192,6 +192,11 @@ GraniteWidgetsPopOver * { } // +// Xs Entry +// +GraniteWidgetsXsEntry.entry { padding: 4px; } + +// // Text Styles // .h1 { font: open sans 24px; } @@ -201,7 +206,6 @@ GraniteWidgetsPopOver * { .category-label { color: mix($bg_color, $text_color, 30%); font-weight: 600; - text-shadow: 0 1px transparentize(white, 0.4); } .h4 { diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss index 92c1b59..c738981 100644 --- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss @@ -96,9 +96,12 @@ MarlinViewWindow { } &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - .pane-separator { background-color: $dark_sidebar_border; } } +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: $dark_sidebar_border } + + GtkFileChooserDialog { &.background.csd, &.background { background-color: $dark_sidebar_bg } @@ -142,8 +145,6 @@ GeditWindow.background.csd { > .titlebar .pane-separator:backdrop, &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } - > .titlebar { background-color: transparent; } - > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: $header_bg; @@ -157,11 +158,17 @@ GeditWindow.background.csd { } } -// Gedit -GeditWindow.background.csd { +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { background-color: transparent; +} + +// Gedit +GeditWindow.background { + &.csd { background-color: transparent; } - .pane-separator { background-color: $dark_sidebar_border; } + .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } + .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } } .gedit-bottom-panel-paned { background-color: $base_color; } diff --git a/common/gtk-3.0/3.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss index 48ebb2b..00fec8f 100644 --- a/common/gtk-3.0/3.18/sass/_unity.scss +++ b/common/gtk-3.0/3.18/sass/_unity.scss @@ -53,6 +53,7 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: $selected_bg_color; + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_bg_color); border-bottom: none; } |