diff options
| -rw-r--r-- | ports/winit/build.rs | 2 | ||||
| -rw-r--r-- | ports/winit/headed_window.rs | 2 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | resources/Servo.ico | bin | 93633 -> 29332 bytes | |||
| -rw-r--r-- | resources/servo-100.png | bin | 1902 -> 0 bytes | |||
| -rw-r--r-- | resources/servo-1000.png | bin | 12494 -> 0 bytes | |||
| -rw-r--r-- | resources/servo-500.png | bin | 6274 -> 0 bytes | |||
| -rw-r--r-- | resources/servo.ico (renamed from resources/servo-500-icon.ico) | bin | 29332 -> 29332 bytes | |||
| -rw-r--r-- | resources/servo.png | bin | 578309 -> 0 bytes | |||
| -rw-r--r-- | resources/servo64.png | bin | 7952 -> 0 bytes | |||
| -rw-r--r-- | resources/servo_1024.png (renamed from resources/servo-1024.png) | bin | 12918 -> 12918 bytes | |||
| -rw-r--r-- | resources/servo_64.png (renamed from resources/servo-64.png) | bin | 1158 -> 1158 bytes |
12 files changed, 3 insertions, 3 deletions
diff --git a/ports/winit/build.rs b/ports/winit/build.rs index 9da6e9e53bd..5c173598eaf 100644 --- a/ports/winit/build.rs +++ b/ports/winit/build.rs @@ -12,7 +12,7 @@ fn main() { #[cfg(windows)] { let mut res = winres::WindowsResource::new(); - res.set_icon("../../resources/Servo.ico"); + res.set_icon("../../resources/servo.ico"); res.set_manifest_file("platform/windows/servo.exe.manifest"); res.compile().unwrap(); } diff --git a/ports/winit/headed_window.rs b/ports/winit/headed_window.rs index c4174551db7..4d306a79ad8 100644 --- a/ports/winit/headed_window.rs +++ b/ports/winit/headed_window.rs @@ -129,7 +129,7 @@ impl Window { #[cfg(any(target_os = "linux", target_os = "windows"))] { - let icon_bytes = include_bytes!("../../resources/servo64.png"); + let icon_bytes = include_bytes!("../../resources/servo_64.png"); winit_window.set_window_icon(Some(load_icon(icon_bytes))); } diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index e152c02683e..58ef42e68a1 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -739,7 +739,7 @@ class MachCommands(CommandBase): # like Instruments.app. try: import Cocoa - icon_path = path.join(self.get_top_dir(), "resources", "servo.png") + icon_path = path.join(self.get_top_dir(), "resources", "servo_1024.png") icon = Cocoa.NSImage.alloc().initWithContentsOfFile_(icon_path) if icon is not None: Cocoa.NSWorkspace.sharedWorkspace().setIcon_forFile_options_(icon, diff --git a/resources/Servo.ico b/resources/Servo.ico Binary files differindex 91df0b77c12..9272954736b 100644 --- a/resources/Servo.ico +++ b/resources/Servo.ico diff --git a/resources/servo-100.png b/resources/servo-100.png Binary files differdeleted file mode 100644 index 5ae47e5ddd6..00000000000 --- a/resources/servo-100.png +++ /dev/null diff --git a/resources/servo-1000.png b/resources/servo-1000.png Binary files differdeleted file mode 100644 index c0118ad5404..00000000000 --- a/resources/servo-1000.png +++ /dev/null diff --git a/resources/servo-500.png b/resources/servo-500.png Binary files differdeleted file mode 100644 index b86bc6338e0..00000000000 --- a/resources/servo-500.png +++ /dev/null diff --git a/resources/servo-500-icon.ico b/resources/servo.ico Binary files differindex 9272954736b..9272954736b 100644 --- a/resources/servo-500-icon.ico +++ b/resources/servo.ico diff --git a/resources/servo.png b/resources/servo.png Binary files differdeleted file mode 100644 index e2e9b673d6b..00000000000 --- a/resources/servo.png +++ /dev/null diff --git a/resources/servo64.png b/resources/servo64.png Binary files differdeleted file mode 100644 index 3511b723c4f..00000000000 --- a/resources/servo64.png +++ /dev/null diff --git a/resources/servo-1024.png b/resources/servo_1024.png Binary files differindex 840007ccad1..840007ccad1 100644 --- a/resources/servo-1024.png +++ b/resources/servo_1024.png diff --git a/resources/servo-64.png b/resources/servo_64.png Binary files differindex 8c7ad53a32e..8c7ad53a32e 100644 --- a/resources/servo-64.png +++ b/resources/servo_64.png |
