From 84c2fe85b72a0ef2c3b56075316f75153ba07ae7 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 8 Apr 2015 19:25:28 +0200 Subject: add icons to files sidebar, fix shade, fix position of settings icon and text --- apps/files/css/files.css | 21 +++++++++++++++++++++ apps/files/img/delete.png | Bin 0 -> 209 bytes apps/files/img/delete.svg | 4 ++++ apps/files/img/external.png | Bin 0 -> 369 bytes apps/files/img/external.svg | 4 ++++ apps/files/img/folder.png | Bin 0 -> 160 bytes apps/files/img/folder.svg | 6 ++++++ apps/files/img/public.png | Bin 0 -> 297 bytes apps/files/img/public.svg | 7 +++++++ apps/files/img/share.png | Bin 0 -> 365 bytes apps/files/img/share.svg | 6 ++++++ apps/files/img/star.png | Bin 0 -> 373 bytes apps/files/img/star.svg | 6 ++++++ apps/files/templates/appnavigation.php | 9 +++++++-- core/css/apps.css | 9 +++++++-- core/img/actions/info.png | Bin 325 -> 315 bytes core/img/actions/info.svg | 2 +- core/img/actions/search.png | Bin 306 -> 293 bytes core/img/actions/search.svg | 2 +- core/img/actions/settings.png | Bin 257 -> 256 bytes core/img/actions/settings.svg | 6 +++--- core/img/actions/star.png | Bin 565 -> 496 bytes core/img/actions/star.svg | 4 ++-- core/img/places/file.png | Bin 178 -> 174 bytes core/img/places/file.svg | 2 +- core/img/places/home.png | Bin 195 -> 191 bytes core/img/places/home.svg | 2 +- 27 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 apps/files/img/delete.png create mode 100644 apps/files/img/delete.svg create mode 100644 apps/files/img/external.png create mode 100644 apps/files/img/external.svg create mode 100644 apps/files/img/folder.png create mode 100644 apps/files/img/folder.svg create mode 100644 apps/files/img/public.png create mode 100644 apps/files/img/public.svg create mode 100644 apps/files/img/share.png create mode 100644 apps/files/img/share.svg create mode 100644 apps/files/img/star.png create mode 100644 apps/files/img/star.svg diff --git a/apps/files/css/files.css b/apps/files/css/files.css index d34013db499..455ccae3f96 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -103,6 +103,27 @@ min-height: 100%; } +/* icons for sidebar */ +.nav-icon-files { + background-image: url('../img/folder.svg'); +} +.nav-icon-favorites { + background-image: url('../img/star.svg'); +} +.nav-icon-sharingin, +.nav-icon-sharingout { + background-image: url('../img/share.svg'); +} +.nav-icon-sharinglinks { + background-image: url('../img/public.svg'); +} +.nav-icon-extstoragemounts { + background-image: url('../img/external.svg'); +} +.nav-icon-trashbin { + background-image: url('../img/delete.svg'); +} + /* move Deleted Files to bottom of sidebar */ .nav-trashbin { position: fixed !important; diff --git a/apps/files/img/delete.png b/apps/files/img/delete.png new file mode 100644 index 00000000000..b2ab8c5efef Binary files /dev/null and b/apps/files/img/delete.png differ diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg new file mode 100644 index 00000000000..b6dc2cc4173 --- /dev/null +++ b/apps/files/img/delete.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/files/img/external.png b/apps/files/img/external.png new file mode 100644 index 00000000000..2ac5e9344c3 Binary files /dev/null and b/apps/files/img/external.png differ diff --git a/apps/files/img/external.svg b/apps/files/img/external.svg new file mode 100644 index 00000000000..d1940f2f1b3 --- /dev/null +++ b/apps/files/img/external.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png new file mode 100644 index 00000000000..ada4c4c2f88 Binary files /dev/null and b/apps/files/img/folder.png differ diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg new file mode 100644 index 00000000000..1a97808443d --- /dev/null +++ b/apps/files/img/folder.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/files/img/public.png b/apps/files/img/public.png new file mode 100644 index 00000000000..f49c5fb1ee5 Binary files /dev/null and b/apps/files/img/public.png differ diff --git a/apps/files/img/public.svg b/apps/files/img/public.svg new file mode 100644 index 00000000000..23ac51d8367 --- /dev/null +++ b/apps/files/img/public.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/apps/files/img/share.png b/apps/files/img/share.png new file mode 100644 index 00000000000..61c87e78b6c Binary files /dev/null and b/apps/files/img/share.png differ diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg new file mode 100644 index 00000000000..97f52f2e783 --- /dev/null +++ b/apps/files/img/share.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/files/img/star.png b/apps/files/img/star.png new file mode 100644 index 00000000000..6b0ec67ec1c Binary files /dev/null and b/apps/files/img/star.png differ diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg new file mode 100644 index 00000000000..fb3eef1e452 --- /dev/null +++ b/apps/files/img/star.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 8e72fe63316..5521a5d44fa 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -1,7 +1,12 @@
-