From 7b9b116ad6e167a86bc538cf391ac19cc14d137e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Sun, 18 Jun 2017 12:52:20 +0200 Subject: [PATCH] adwaita: Remove style properties They don't exist anymore. --- gtk/theme/Adwaita/_common.scss | 36 ------------------------ gtk/theme/Adwaita/gtk-contained-dark.css | 12 ++------ gtk/theme/Adwaita/gtk-contained.css | 12 ++------ 3 files changed, 6 insertions(+), 54 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index fdf449f6e4..063b8dffbf 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -9,23 +9,6 @@ $button_transition: all 200ms $ease-out-quad; * { padding: 0; - -GtkToolButton-icon-spacing: 4; - -GtkTextView-error-underline-color: $error_color; - - // The size for scrollbars. The slider is 2px smaller, but we keep it - // up so that the whole area is sensitive to button presses for the - // slider. The stepper button is larger in both directions, the slider - // only in the width - - -GtkScrolledWindow-scrollbar-spacing: 0; - - -GtkToolItemGroup-expander-size: 11; - - -GtkWidget-text-handle-width: 20; - -GtkWidget-text-handle-height: 24; - - -GtkDialog-button-spacing: 4; - -GtkDialog-action-area-border: 0; // We use the outline properties to signal the focus properties // to the adwaita engine: using real CSS properties is faster, @@ -1332,7 +1315,6 @@ combobox { * Toolbars * ************/ %toolbar { - -GtkWidget-window-dragging: true; padding: 4px; background-color: $bg_color; } @@ -1557,8 +1539,6 @@ headerbar { padding-left: 10px; padding-right: 10px; - GtkArrow { -GtkArrow-arrow-scaling: 1; } - .arrow { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); color: transparentize($selected_fg_color,0.5); @@ -1689,15 +1669,6 @@ headerbar { // headerbar border rounding * Tree Views * **************/ treeview.view { - @at-root * { - -GtkTreeView-horizontal-separator: 4; - -GtkTreeView-grid-line-width: 1; - -GtkTreeView-grid-line-pattern: ''; - -GtkTreeView-tree-line-width: 1; - -GtkTreeView-tree-line-pattern: ''; - -GtkTreeView-expander-size: 16; - } - border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color, border-top-color: $bg_color; // while this is the grid lines color, better then nothing @@ -1920,7 +1891,6 @@ treeview.view { *********/ menubar, .menubar { - -GtkWidget-window-dragging: true; padding: 0px; box-shadow: inset 0 -1px transparentize(black, 0.9); @@ -2367,12 +2337,6 @@ notebook { scrollbar { $_slider_min_length: 40px; - // disable steppers - @at-root * { - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; - } - background-color: $scrollbar_bg_color; transition: 300ms $ease-out-quad; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 64d25db679..cd3f82cf7b 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1,4 +1,4 @@ -* { padding: 0; -GtkToolButton-icon-spacing: 4; -GtkTextView-error-underline-color: #cc0000; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkToolItemGroup-expander-size: 11; -GtkWidget-text-handle-width: 20; -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; -gtk-secondary-caret-color: #215d9c; } +* { padding: 0; outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; -gtk-secondary-caret-color: #215d9c; } /*************** Base States * */ .background { color: #eeeeec; background-color: #33393b; } @@ -553,7 +553,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig combobox:drop(active) { box-shadow: none; } /************ Toolbars * */ -toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #33393b; } +toolbar, .inline-toolbar, searchbar, .location-bar { padding: 4px; background-color: #33393b; } toolbar { padding: 4px 3px 3px 4px; } @@ -644,8 +644,6 @@ searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; } .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode.titlebar:not(headerbar) .selection-menu, headerbar.selection-mode .selection-menu:backdrop, headerbar.selection-mode .selection-menu { border-color: rgba(33, 93, 156, 0); background-color: rgba(33, 93, 156, 0); background-image: none; box-shadow: none; padding-left: 10px; padding-right: 10px; } -.selection-mode.titlebar:not(headerbar) .selection-menu:backdrop GtkArrow, .selection-mode.titlebar:not(headerbar) .selection-menu GtkArrow, headerbar.selection-mode .selection-menu:backdrop GtkArrow, headerbar.selection-mode .selection-menu GtkArrow { -GtkArrow-arrow-scaling: 1; } - .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop .arrow, .selection-mode.titlebar:not(headerbar) .selection-menu .arrow, headerbar.selection-mode .selection-menu:backdrop .arrow, headerbar.selection-mode .selection-menu .arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); color: rgba(255, 255, 255, 0.5); -gtk-icon-shadow: none; } .tiled .titlebar:backdrop:not(headerbar), .tiled .titlebar:not(headerbar), .maximized .titlebar:backdrop:not(headerbar), .maximized .titlebar:not(headerbar), .fullscreen .titlebar:backdrop:not(headerbar), .fullscreen .titlebar:not(headerbar), .tiled headerbar:backdrop, .tiled headerbar, .maximized headerbar:backdrop, .maximized headerbar, .fullscreen headerbar:backdrop, .fullscreen headerbar { border-radius: 0; } @@ -688,8 +686,6 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen /************** Tree Views * */ treeview.view { border-left-color: #898b8b; border-top-color: #33393b; } -* { -GtkTreeView-horizontal-separator: 4; -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 16; } - treeview.view:selected:focus, treeview.view:selected { border-radius: 0; } treeview.view:selected:backdrop, treeview.view:selected { border-left-color: #90aece; border-top-color: rgba(238, 238, 236, 0.1); } @@ -763,7 +759,7 @@ treeview.view header button:backdrop:disabled { border-color: #33393b; backgroun treeview.view header button:last-child:backdrop, treeview.view header button:last-child { border-right-style: none; } /********* Menus * */ -menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } +menubar, .menubar { padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } menubar:backdrop, .menubar:backdrop { background-color: #33393b; } @@ -972,8 +968,6 @@ notebook box > stack:not(:only-child):backdrop { background-color: #252a2c; } /************** Scrollbars * */ scrollbar { background-color: #2b3032; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } -* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } - scrollbar.top { border-bottom: 1px solid #1b1f20; } scrollbar.bottom { border-top: 1px solid #1b1f20; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 9824b1f5f0..eea058a0c5 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1,4 +1,4 @@ -* { padding: 0; -GtkToolButton-icon-spacing: 4; -GtkTextView-error-underline-color: #cc0000; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkToolItemGroup-expander-size: 11; -GtkWidget-text-handle-width: 20; -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; -gtk-secondary-caret-color: #4a90d9; } +* { padding: 0; outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; -gtk-secondary-caret-color: #4a90d9; } /*************** Base States * */ .background { color: #2e3436; background-color: #e8e8e7; } @@ -561,7 +561,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig combobox:drop(active) { box-shadow: none; } /************ Toolbars * */ -toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #e8e8e7; } +toolbar, .inline-toolbar, searchbar, .location-bar { padding: 4px; background-color: #e8e8e7; } toolbar { padding: 4px 3px 3px 4px; } @@ -652,8 +652,6 @@ searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; } .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode.titlebar:not(headerbar) .selection-menu, headerbar.selection-mode .selection-menu:backdrop, headerbar.selection-mode .selection-menu { border-color: rgba(74, 144, 217, 0); background-color: rgba(74, 144, 217, 0); background-image: none; box-shadow: none; padding-left: 10px; padding-right: 10px; } -.selection-mode.titlebar:not(headerbar) .selection-menu:backdrop GtkArrow, .selection-mode.titlebar:not(headerbar) .selection-menu GtkArrow, headerbar.selection-mode .selection-menu:backdrop GtkArrow, headerbar.selection-mode .selection-menu GtkArrow { -GtkArrow-arrow-scaling: 1; } - .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop .arrow, .selection-mode.titlebar:not(headerbar) .selection-menu .arrow, headerbar.selection-mode .selection-menu:backdrop .arrow, headerbar.selection-mode .selection-menu .arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); color: rgba(255, 255, 255, 0.5); -gtk-icon-shadow: none; } .tiled .titlebar:backdrop:not(headerbar), .tiled .titlebar:not(headerbar), .maximized .titlebar:backdrop:not(headerbar), .maximized .titlebar:not(headerbar), .fullscreen .titlebar:backdrop:not(headerbar), .fullscreen .titlebar:not(headerbar), .tiled headerbar:backdrop, .tiled headerbar, .maximized headerbar:backdrop, .maximized headerbar, .fullscreen headerbar:backdrop, .fullscreen headerbar { border-radius: 0; } @@ -696,8 +694,6 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen /************** Tree Views * */ treeview.view { border-left-color: #979a9b; border-top-color: #e8e8e7; } -* { -GtkTreeView-horizontal-separator: 4; -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 16; } - treeview.view:selected:focus, treeview.view:selected { border-radius: 0; } treeview.view:selected:backdrop, treeview.view:selected { border-left-color: #a5c8ec; border-top-color: rgba(46, 52, 54, 0.1); } @@ -771,7 +767,7 @@ treeview.view header button:backdrop:disabled { border-color: #e8e8e7; backgroun treeview.view header button:last-child:backdrop, treeview.view header button:last-child { border-right-style: none; } /********* Menus * */ -menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } +menubar, .menubar { padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } menubar:backdrop, .menubar:backdrop { background-color: #e8e8e7; } @@ -980,8 +976,6 @@ notebook box > stack:not(:only-child):backdrop { background-color: #fcfcfc; } /************** Scrollbars * */ scrollbar { background-color: #c3c4c4; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } -* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } - scrollbar.top { border-bottom: 1px solid #b6b6b3; } scrollbar.bottom { border-top: 1px solid #b6b6b3; }