diff options
| author | raveit65 <[email protected]> | 2014-10-18 14:44:23 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2014-10-18 14:46:41 +0200 |
| commit | aab8231841a9c99370a5d10925788ff0a2266183 (patch) | |
| tree | 1cac28cefab91675e46b5da00c4b4bdbfbcc4561 /desktop-themes | |
| parent | 330d5d0f54fcbd52c1c1e1510fb78921afed4cef (diff) | |
| download | mate-themes-aab8231841a9c99370a5d10925788ff0a2266183.tar.bz2 mate-themes-aab8231841a9c99370a5d10925788ff0a2266183.tar.xz | |
BlackMate GTK3: fix further merge conflict correctly
Diffstat (limited to 'desktop-themes')
| -rw-r--r-- | desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css index 5a91c225..d1ff59cd 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css @@ -108,15 +108,7 @@ color: @theme_tooltip_fg_color; } -<<<<<<< HEAD -.grip { - background-color: transparent; - background-image: url("assets/resize-grip.svg"); -} - .content-view.view.rubberband, -======= ->>>>>>> 0958588... BlackMate GTK3: use an image as resize grip .view.rubberband, .rubberband { background-color: alpha(@theme_selected_bg_color, 0.35); |