diff --git a/.gitignore b/.gitignore index 5236e1e..be9493f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ +# Ignore Backup Copies from Text Editor *~ - diff --git a/TODO b/TODO index f8a03fb..82705bf 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,6 @@ +DEPRECATED +lets use Issues instead + Graphical assets - the current ones are fat and round. We must avoid round (for everything but radios) and fat. They have to be with very think square border (or REALLY super tiny rounded one). Also - we miss assets for anything, but GTK 3. GTK 2 theme progress - there isn't one. Not gonna even bother to describe what's left to do there. @@ -10,3 +13,5 @@ GTK 3 theme: - [won't fix] Inline toolbar has that huge grey border over it that needs exterminating. The joined buttons in it should look like the ones Google uses - [done] Our srollbars are SUPER SEXY (legacy and overlay - both). Or in British - I am quite found of the look of how the scrolling widgets look. - + + diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css index 5d7eaf2..cc4aaa1 100644 --- a/gtk-3.0/apps/granite-widgets.css +++ b/gtk-3.0/apps/granite-widgets.css @@ -176,13 +176,10 @@ GraniteWidgetsPopOver { .popover_bg { background-color: transparent; -<<<<<<< HEAD background-image: none; background-color: @menu_bg_color; -======= background-color: @menu_bg_color; background-image: none; ->>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3 } GraniteWidgetsPopOver .sidebar.view, @@ -205,13 +202,8 @@ GraniteWidgetsPopOver .button:hover:active { } GraniteWidgetsPopOver .entry { -<<<<<<< HEAD background-image: none; background-color: @theme_base_color; -======= - background-color: @theme_base_color; - background-image: none; ->>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3 color: @theme_text_color; } @@ -223,13 +215,8 @@ GraniteWidgetsPopOver .entry { .app:hover, .app:focus { border-color: shade(@theme_selected_bg_color, 0.90); -<<<<<<< HEAD - background-image: none; - background-color: @theme_selected_bg_color; -======= background-color: @theme_selected_bg_color; background-image: none; ->>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3 color: @theme_selected_fg_color; } diff --git a/unity/close.png b/unity/close.png index fb017e9..6608e95 100644 Binary files a/unity/close.png and b/unity/close.png differ diff --git a/unity/close_focused_normal.png b/unity/close_focused_normal.png index 8fa955d..6608e95 100644 Binary files a/unity/close_focused_normal.png and b/unity/close_focused_normal.png differ diff --git a/unity/close_focused_prelight.png b/unity/close_focused_prelight.png index 056b1d9..980a80e 100644 Binary files a/unity/close_focused_prelight.png and b/unity/close_focused_prelight.png differ diff --git a/unity/close_focused_pressed.png b/unity/close_focused_pressed.png index 3798e1e..e2d55a2 100644 Binary files a/unity/close_focused_pressed.png and b/unity/close_focused_pressed.png differ diff --git a/unity/close_unfocused.png b/unity/close_unfocused.png index 71860a6..7320bd6 100644 Binary files a/unity/close_unfocused.png and b/unity/close_unfocused.png differ diff --git a/unity/close_unfocused_prelight.png b/unity/close_unfocused_prelight.png index d323210..980a80e 100644 Binary files a/unity/close_unfocused_prelight.png and b/unity/close_unfocused_prelight.png differ diff --git a/unity/close_unfocused_pressed.png b/unity/close_unfocused_pressed.png index 7caec78..7e20728 100644 Binary files a/unity/close_unfocused_pressed.png and b/unity/close_unfocused_pressed.png differ diff --git a/unity/maximize.png b/unity/maximize.png index c5c248c..a329af9 100644 Binary files a/unity/maximize.png and b/unity/maximize.png differ diff --git a/unity/maximize_focused_normal.png b/unity/maximize_focused_normal.png index 76ec8cc..a329af9 100644 Binary files a/unity/maximize_focused_normal.png and b/unity/maximize_focused_normal.png differ diff --git a/unity/maximize_focused_prelight.png b/unity/maximize_focused_prelight.png index 091a132..3a51c72 100644 Binary files a/unity/maximize_focused_prelight.png and b/unity/maximize_focused_prelight.png differ diff --git a/unity/maximize_focused_pressed.png b/unity/maximize_focused_pressed.png index e1bd167..2b4dad5 100644 Binary files a/unity/maximize_focused_pressed.png and b/unity/maximize_focused_pressed.png differ diff --git a/unity/maximize_unfocused.png b/unity/maximize_unfocused.png index 0c1ba81..357924e 100644 Binary files a/unity/maximize_unfocused.png and b/unity/maximize_unfocused.png differ diff --git a/unity/maximize_unfocused_prelight.png b/unity/maximize_unfocused_prelight.png index b48d4da..3a51c72 100644 Binary files a/unity/maximize_unfocused_prelight.png and b/unity/maximize_unfocused_prelight.png differ diff --git a/unity/maximize_unfocused_pressed.png b/unity/maximize_unfocused_pressed.png index 2c8469d..2b4dad5 100644 Binary files a/unity/maximize_unfocused_pressed.png and b/unity/maximize_unfocused_pressed.png differ diff --git a/unity/minimize.png b/unity/minimize.png index 673a4b2..865ee9c 100644 Binary files a/unity/minimize.png and b/unity/minimize.png differ diff --git a/unity/minimize_focused_normal.png b/unity/minimize_focused_normal.png index 53a147e..865ee9c 100644 Binary files a/unity/minimize_focused_normal.png and b/unity/minimize_focused_normal.png differ diff --git a/unity/minimize_focused_prelight.png b/unity/minimize_focused_prelight.png index 16a22b0..2e86e18 100644 Binary files a/unity/minimize_focused_prelight.png and b/unity/minimize_focused_prelight.png differ diff --git a/unity/minimize_focused_pressed.png b/unity/minimize_focused_pressed.png index 8d8b16a..b7a3aca 100644 Binary files a/unity/minimize_focused_pressed.png and b/unity/minimize_focused_pressed.png differ diff --git a/unity/minimize_unfocused.png b/unity/minimize_unfocused.png index a9c77bd..40de23e 100644 Binary files a/unity/minimize_unfocused.png and b/unity/minimize_unfocused.png differ diff --git a/unity/minimize_unfocused_prelight.png b/unity/minimize_unfocused_prelight.png index f5561b0..2e86e18 100644 Binary files a/unity/minimize_unfocused_prelight.png and b/unity/minimize_unfocused_prelight.png differ diff --git a/unity/minimize_unfocused_pressed.png b/unity/minimize_unfocused_pressed.png index 0b4ca8c..b7a3aca 100644 Binary files a/unity/minimize_unfocused_pressed.png and b/unity/minimize_unfocused_pressed.png differ diff --git a/unity/unmaximize.png b/unity/unmaximize.png index 972e334..1557fa8 100644 Binary files a/unity/unmaximize.png and b/unity/unmaximize.png differ diff --git a/unity/unmaximize_focused_normal.png b/unity/unmaximize_focused_normal.png index 24073a9..1557fa8 100644 Binary files a/unity/unmaximize_focused_normal.png and b/unity/unmaximize_focused_normal.png differ diff --git a/unity/unmaximize_focused_prelight.png b/unity/unmaximize_focused_prelight.png index ebaae22..f27f67d 100644 Binary files a/unity/unmaximize_focused_prelight.png and b/unity/unmaximize_focused_prelight.png differ diff --git a/unity/unmaximize_focused_pressed.png b/unity/unmaximize_focused_pressed.png index 53d865f..a132c2f 100644 Binary files a/unity/unmaximize_focused_pressed.png and b/unity/unmaximize_focused_pressed.png differ diff --git a/unity/unmaximize_unfocused.png b/unity/unmaximize_unfocused.png index a9182ac..68649d6 100644 Binary files a/unity/unmaximize_unfocused.png and b/unity/unmaximize_unfocused.png differ diff --git a/unity/unmaximize_unfocused_prelight.png b/unity/unmaximize_unfocused_prelight.png index 884331c..f27f67d 100644 Binary files a/unity/unmaximize_unfocused_prelight.png and b/unity/unmaximize_unfocused_prelight.png differ diff --git a/unity/unmaximize_unfocused_pressed.png b/unity/unmaximize_unfocused_pressed.png index 5c02969..a132c2f 100644 Binary files a/unity/unmaximize_unfocused_pressed.png and b/unity/unmaximize_unfocused_pressed.png differ