diff --git a/.gitignore b/.gitignore index e64d58766d85e..b2ce2b4308091 100644 --- a/.gitignore +++ b/.gitignore @@ -188,7 +188,6 @@ CPackSourceConfig.cmake compile_commands.json convert.exe .dir-locals.el -*-icon.png *-icon-win-folder.png *-sidebar.png *-w10startmenu.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a9c91deae16b..07241232b9acf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,9 @@ endif() set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") +set(NMC_RCC_FILE "nmctheme_v1.rcc") +configure_file(${CMAKE_SOURCE_DIR}/${NMC_RCC_FILE} "${BIN_OUTPUT_DIRECTORY}/${NMC_RCC_FILE}" COPYONLY) + include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake) set(QT_VERSION_MAJOR "6") @@ -368,6 +371,7 @@ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) if(BUILD_OWNCLOUD_OSX_BUNDLE) install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/) configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY) + install(FILES nmctheme_v1.rcc DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/) elseif(BUILD_CLIENT) install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} ) configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY) diff --git a/magenta_theme.qrc.in b/magenta_theme.qrc.in new file mode 100644 index 0000000000000..dcbfa6be2f52b --- /dev/null +++ b/magenta_theme.qrc.in @@ -0,0 +1,326 @@ + + + theme/colored/16-@APPLICATION_ICON_NAME@-icon.png + theme/colored/24-@APPLICATION_ICON_NAME@-icon.png + theme/colored/32-@APPLICATION_ICON_NAME@-icon.png + theme/colored/48-@APPLICATION_ICON_NAME@-icon.png + theme/colored/64-@APPLICATION_ICON_NAME@-icon.png + theme/colored/128-@APPLICATION_ICON_NAME@-icon.png + theme/colored/256-@APPLICATION_ICON_NAME@-icon.png + theme/colored/512-@APPLICATION_ICON_NAME@-icon.png + theme/colored/1024-@APPLICATION_ICON_NAME@-icon.png + + + + theme/colored/@STATE_SUBDIR@state-error.svg + theme/colored/@STATE_SUBDIR@state-error-16.png + theme/colored/@STATE_SUBDIR@state-error-32.png + theme/colored/@STATE_SUBDIR@state-error-64.png + theme/colored/@STATE_SUBDIR@state-error-128.png + theme/colored/@STATE_SUBDIR@state-error-256.png + + theme/colored/@STATE_SUBDIR@state-ok.svg + theme/colored/@STATE_SUBDIR@state-ok-16.png + theme/colored/@STATE_SUBDIR@state-ok-32.png + theme/colored/@STATE_SUBDIR@state-ok-64.png + theme/colored/@STATE_SUBDIR@state-ok-128.png + theme/colored/@STATE_SUBDIR@state-ok-256.png + + theme/colored/@STATE_SUBDIR@state-pause.svg + theme/colored/@STATE_SUBDIR@state-pause-16.png + theme/colored/@STATE_SUBDIR@state-pause-32.png + theme/colored/@STATE_SUBDIR@state-pause-64.png + theme/colored/@STATE_SUBDIR@state-pause-128.png + theme/colored/@STATE_SUBDIR@state-pause-256.png + + theme/colored/@STATE_SUBDIR@state-sync.svg + theme/colored/@STATE_SUBDIR@state-sync-16.png + theme/colored/@STATE_SUBDIR@state-sync-32.png + theme/colored/@STATE_SUBDIR@state-sync-64.png + theme/colored/@STATE_SUBDIR@state-sync-128.png + theme/colored/@STATE_SUBDIR@state-sync-256.png + + theme/colored/@STATE_SUBDIR@state-offline.svg + theme/colored/@STATE_SUBDIR@state-offline-16.png + theme/colored/@STATE_SUBDIR@state-offline-32.png + theme/colored/@STATE_SUBDIR@state-offline-64.png + theme/colored/@STATE_SUBDIR@state-offline-128.png + theme/colored/@STATE_SUBDIR@state-offline-256.png + + theme/colored/@STATE_SUBDIR@state-warning.svg + theme/colored/@STATE_SUBDIR@state-warning-16.png + theme/colored/@STATE_SUBDIR@state-warning-32.png + theme/colored/@STATE_SUBDIR@state-warning-64.png + theme/colored/@STATE_SUBDIR@state-warning-128.png + theme/colored/@STATE_SUBDIR@state-warning-256.png + + + theme/white/@STATE_SUBDIR@state-error.svg + theme/white/@STATE_SUBDIR@state-error-16.png + theme/white/@STATE_SUBDIR@state-error-32.png + theme/white/@STATE_SUBDIR@state-error-64.png + theme/white/@STATE_SUBDIR@state-error-128.png + theme/white/@STATE_SUBDIR@state-error-256.png + + theme/white/@STATE_SUBDIR@state-ok.svg + theme/white/@STATE_SUBDIR@state-ok-16.png + theme/white/@STATE_SUBDIR@state-ok-32.png + theme/white/@STATE_SUBDIR@state-ok-64.png + theme/white/@STATE_SUBDIR@state-ok-128.png + theme/white/@STATE_SUBDIR@state-ok-256.png + + theme/white/@STATE_SUBDIR@state-pause.svg + theme/white/@STATE_SUBDIR@state-pause-16.png + theme/white/@STATE_SUBDIR@state-pause-32.png + theme/white/@STATE_SUBDIR@state-pause-64.png + theme/white/@STATE_SUBDIR@state-pause-128.png + theme/white/@STATE_SUBDIR@state-pause-256.png + + theme/white/@STATE_SUBDIR@state-sync.svg + theme/white/@STATE_SUBDIR@state-sync-16.png + theme/white/@STATE_SUBDIR@state-sync-32.png + theme/white/@STATE_SUBDIR@state-sync-64.png + theme/white/@STATE_SUBDIR@state-sync-128.png + theme/white/@STATE_SUBDIR@state-sync-256.png + + theme/white/@STATE_SUBDIR@state-offline.svg + theme/white/@STATE_SUBDIR@state-offline-16.png + theme/white/@STATE_SUBDIR@state-offline-32.png + theme/white/@STATE_SUBDIR@state-offline-64.png + theme/white/@STATE_SUBDIR@state-offline-128.png + theme/white/@STATE_SUBDIR@state-offline-256.png + + theme/white/@STATE_SUBDIR@state-warning.svg + theme/white/@STATE_SUBDIR@state-warning-16.png + theme/white/@STATE_SUBDIR@state-warning-32.png + theme/white/@STATE_SUBDIR@state-warning-64.png + theme/white/@STATE_SUBDIR@state-warning-128.png + theme/white/@STATE_SUBDIR@state-warning-256.png + + theme/white/@STATE_SUBDIR@state-info.svg + + + theme/black/@STATE_SUBDIR@state-error.svg + theme/black/@STATE_SUBDIR@state-error-16.png + theme/black/@STATE_SUBDIR@state-error-32.png + theme/black/@STATE_SUBDIR@state-error-64.png + theme/black/@STATE_SUBDIR@state-error-128.png + theme/black/@STATE_SUBDIR@state-error-256.png + + theme/black/@STATE_SUBDIR@state-ok.svg + theme/black/@STATE_SUBDIR@state-ok-16.png + theme/black/@STATE_SUBDIR@state-ok-32.png + theme/black/@STATE_SUBDIR@state-ok-64.png + theme/black/@STATE_SUBDIR@state-ok-128.png + theme/black/@STATE_SUBDIR@state-ok-256.png + + theme/black/@STATE_SUBDIR@state-pause.svg + theme/black/@STATE_SUBDIR@state-pause-16.png + theme/black/@STATE_SUBDIR@state-pause-32.png + theme/black/@STATE_SUBDIR@state-pause-64.png + theme/black/@STATE_SUBDIR@state-pause-128.png + theme/black/@STATE_SUBDIR@state-pause-256.png + + theme/black/@STATE_SUBDIR@state-sync.svg + theme/black/@STATE_SUBDIR@state-sync-16.png + theme/black/@STATE_SUBDIR@state-sync-32.png + theme/black/@STATE_SUBDIR@state-sync-64.png + theme/black/@STATE_SUBDIR@state-sync-128.png + theme/black/@STATE_SUBDIR@state-sync-256.png + + theme/black/@STATE_SUBDIR@state-offline.svg + theme/black/@STATE_SUBDIR@state-offline-16.png + theme/black/@STATE_SUBDIR@state-offline-32.png + theme/black/@STATE_SUBDIR@state-offline-64.png + theme/black/@STATE_SUBDIR@state-offline-128.png + theme/black/@STATE_SUBDIR@state-offline-256.png + + theme/black/@STATE_SUBDIR@state-warning.svg + theme/black/@STATE_SUBDIR@state-warning-16.png + theme/black/@STATE_SUBDIR@state-warning-32.png + theme/black/@STATE_SUBDIR@state-warning-64.png + theme/black/@STATE_SUBDIR@state-warning-128.png + theme/black/@STATE_SUBDIR@state-warning-256.png + + theme/black/@STATE_SUBDIR@state-info.svg + + + + + theme/colored/wizard_logo.png + theme/colored/wizard_logo@2x.png + theme/colored/wizard_logo.svg + theme/colored/folder.png + theme/colored/folder@2x.png + theme/colored/wizard-files.png + theme/colored/wizard-files@2x.png + theme/colored/wizard-groupware.png + theme/colored/wizard-groupware@2x.png + theme/colored/wizard-nextcloud.png + theme/colored/wizard-nextcloud@2x.png + theme/colored/wizard-talk.png + theme/colored/wizard-talk@2x.png + theme/colored/external.png + theme/colored/external@2x.png + theme/colored/change-bordered.svg + theme/colored/add.svg + theme/colored/add-bordered.svg + theme/colored/delete.svg + theme/colored/delete-bordered.svg + theme/colored/talk-bordered.svg + theme/colored/@APPLICATION_ICON_NAME@-icon.svg + theme/colored/user-status-online.svg + theme/colored/user-status-invisible.svg + theme/colored/user-status-away.svg + theme/colored/user-status-busy.svg + theme/colored/user-status-dnd.svg + theme/colored/ok.svg + theme/colored/error.svg + theme/colored/info.svg + theme/colored/offline.svg + theme/colored/pause.svg + theme/colored/warning.svg + theme/colored/sync.svg + + + theme/black/account-group.svg + theme/black/activity.svg + theme/black/add.svg + theme/black/bell.svg + theme/black/calendar.svg + theme/black/caret-down.svg + theme/black/change.svg + theme/black/clear.svg + theme/black/close.svg + theme/black/comment.svg + theme/black/confirm.svg + theme/black/control-next.svg + theme/black/control-prev.svg + theme/black/deck.svg + theme/black/edit.svg + theme/black/email.svg + theme/black/expand-less-black.svg + theme/black/external.png + theme/black/external@2x.png + theme/black/folder.png + theme/black/folder@2x.png + theme/black/folder.svg + theme/black/folder-group.svg + theme/black/label.svg + theme/black/more-apps.svg + theme/black/search.svg + theme/black/settings.svg + theme/black/user.svg + theme/black/wizard-files.png + theme/black/wizard-files@2x.png + theme/black/wizard-groupware.png + theme/black/wizard-groupware@2x.png + theme/black/wizard-groupware.svg + theme/black/wizard-nextcloud.png + theme/black/wizard-nextcloud@2x.png + theme/black/wizard-talk.png + theme/black/wizard-talk@2x.png + theme/black/wizard-talk.svg + theme/black/info.svg + theme/black/warning.svg + theme/black/error.svg + + + theme/white/activity.svg + theme/white/add.svg + theme/white/bell.svg + theme/white/calendar.svg + theme/white/caret-down.svg + theme/white/change.svg + theme/white/close.svg + theme/white/comment.svg + theme/white/confirm.svg + theme/white/control-next.svg + theme/white/control-prev.svg + theme/white/deck.svg + theme/white/edit.svg + theme/white/email.svg + theme/white/external.png + theme/white/external@2x.png + theme/white/folder.png + theme/white/folder@2x.png + theme/white/folder.svg + theme/white/label.svg + theme/white/more-apps.svg + theme/white/nc-assistant-app.svg + theme/white/settings.svg + theme/white/talk-app.svg + theme/white/user.svg + theme/white/wizard-files.png + theme/white/wizard-files@2x.png + theme/white/wizard-groupware.png + theme/white/wizard-groupware@2x.png + theme/white/wizard-groupware.svg + theme/white/wizard-nextcloud.png + theme/white/wizard-nextcloud@2x.png + theme/white/wizard-talk.png + theme/white/wizard-talk@2x.png + theme/white/info.svg + theme/white/warning.svg + theme/white/error.svg + + + theme/sync-arrow.svg + theme/close.svg + theme/files.svg + theme/public.svg + theme/settings.svg + theme/confirm.svg + theme/copy.svg + theme/more.svg + theme/change.svg + theme/lock.svg + theme/lock-http.svg + theme/lock-https.svg + theme/lock-broken.svg + theme/network.svg + theme/account.svg + theme/add.svg + theme/share.svg + theme/reply.svg + theme/magnifying-glass.svg + theme/external.svg + theme/delete.svg + theme/send.svg + theme/talk-app.svg + theme/chevron-double-up.svg + theme/call-notification.wav + theme/info.svg + + + theme/NMCIcons/accountAvatarIcon.svg + theme/NMCIcons/action-add.svg + theme/NMCIcons/cloud-security.svg + theme/NMCIcons/collapse-down.svg + theme/NMCIcons/collapse-right.svg + theme/NMCIcons/configuration1.png + theme/NMCIcons/configuration2.png + theme/NMCIcons/configuration3.png + theme/NMCIcons/logout.svg + theme/NMCIcons/navigation-left.svg + theme/NMCIcons/navigation-right.svg + theme/NMCIcons/pause.svg + theme/NMCIcons/remove.svg + theme/NMCIcons/website.svg + + + theme/NMCIcons/accountAvatarIcon-white.svg + theme/NMCIcons/logout-white.svg + theme/NMCIcons/pause-white.svg + theme/NMCIcons/remove-white.svg + theme/NMCIcons/website-white.svg + theme/close-white.svg + theme/more-white.svg + theme/settings-white.svg + + + theme/NMCIcons/ApplicationLogo.svg + theme/NMCIcons/folderLogo.svg + theme/NMCIcons/tlogocarrier.svg + + diff --git a/nmctheme_v1.rcc b/nmctheme_v1.rcc new file mode 100644 index 0000000000000..1e673f886e4f5 Binary files /dev/null and b/nmctheme_v1.rcc differ diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 54d32c3580e86..6bafc11d0a95c 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -23,6 +23,9 @@ endif() configure_file(${CMAKE_SOURCE_DIR}/theme.qrc.in ${CMAKE_SOURCE_DIR}/theme.qrc) set(theme_dir ${CMAKE_SOURCE_DIR}/theme) +#NMC customization: needed to find the ui file in a different location than the header file +set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/src/gui") + set(client_UI_SRCS accountsettings.ui conflictdialog.ui @@ -260,6 +263,10 @@ set(client_SRCS wizard/wizardproxysettingsdialog.cpp ) +file(GLOB NMC_FILES "nmcgui/*") +set(NMC_SRCS ${NMC_FILES}) +list(APPEND client_SRCS ${NMC_SRCS}) + if (NOT DISABLE_ACCOUNT_MIGRATION) list(APPEND client_SRCS legacyaccountselectiondialog.h @@ -610,6 +617,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) install(FILES ${VISUAL_ELEMENTS} DESTINATION bin/visualelements) install(FILES "${theme_dir}/${APPLICATION_EXECUTABLE}.VisualElementsManifest.xml" DESTINATION bin) install(FILES ${client_I18N} DESTINATION i18n) + install(FILES ${CMAKE_SOURCE_DIR}/nmctheme_v1.rcc DESTINATION bin) endif() # we may not add MACOSX_BUNDLE here, if not building one diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 073630d9dc9bf..cf01372e19c24 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -56,6 +56,17 @@ int main(int argc, char **argv) qputenv("QML_IMPORT_PATH", (QDir::currentPath() + QStringLiteral("/qml")).toLatin1()); #endif + bool resourceLoaded = false; + const QString currentPath = QDir::currentPath(); + + if (Utility::isMac()) { + resourceLoaded = QResource::registerResource(QDir::toNativeSeparators("/Applications/MagentaCLOUD.app/Contents/Resources/nmctheme_v1.rcc")); + } + + if (Utility::isWindows() || !resourceLoaded) { + resourceLoaded = QResource::registerResource(QDir::toNativeSeparators(currentPath + "/nmctheme_v1.rcc")); + } + Q_INIT_RESOURCE(resources); Q_INIT_RESOURCE(theme); diff --git a/theme.qrc.in b/theme.qrc.in index 4bf77d90807bc..dcbfa6be2f52b 100644 --- a/theme.qrc.in +++ b/theme.qrc.in @@ -291,5 +291,36 @@ theme/chevron-double-up.svg theme/call-notification.wav theme/info.svg + + + theme/NMCIcons/accountAvatarIcon.svg + theme/NMCIcons/action-add.svg + theme/NMCIcons/cloud-security.svg + theme/NMCIcons/collapse-down.svg + theme/NMCIcons/collapse-right.svg + theme/NMCIcons/configuration1.png + theme/NMCIcons/configuration2.png + theme/NMCIcons/configuration3.png + theme/NMCIcons/logout.svg + theme/NMCIcons/navigation-left.svg + theme/NMCIcons/navigation-right.svg + theme/NMCIcons/pause.svg + theme/NMCIcons/remove.svg + theme/NMCIcons/website.svg + + + theme/NMCIcons/accountAvatarIcon-white.svg + theme/NMCIcons/logout-white.svg + theme/NMCIcons/pause-white.svg + theme/NMCIcons/remove-white.svg + theme/NMCIcons/website-white.svg + theme/close-white.svg + theme/more-white.svg + theme/settings-white.svg + + + theme/NMCIcons/ApplicationLogo.svg + theme/NMCIcons/folderLogo.svg + theme/NMCIcons/tlogocarrier.svg diff --git a/theme/NMCIcons/ApplicationLogo.svg b/theme/NMCIcons/ApplicationLogo.svg new file mode 100644 index 0000000000000..efc8c94e1df28 --- /dev/null +++ b/theme/NMCIcons/ApplicationLogo.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/theme/NMCIcons/accountAvatarIcon-white.svg b/theme/NMCIcons/accountAvatarIcon-white.svg new file mode 100644 index 0000000000000..1071c83ea6ef8 --- /dev/null +++ b/theme/NMCIcons/accountAvatarIcon-white.svg @@ -0,0 +1,7 @@ + + + icon/user_file/user/default@svg + + + + \ No newline at end of file diff --git a/theme/NMCIcons/accountAvatarIcon.svg b/theme/NMCIcons/accountAvatarIcon.svg new file mode 100644 index 0000000000000..ba966999fc6cf --- /dev/null +++ b/theme/NMCIcons/accountAvatarIcon.svg @@ -0,0 +1,7 @@ + + + icon/user_file/user/default@svg + + + + diff --git a/theme/NMCIcons/action-add.svg b/theme/NMCIcons/action-add.svg new file mode 100644 index 0000000000000..46df2f888cc15 --- /dev/null +++ b/theme/NMCIcons/action-add.svg @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/theme/NMCIcons/cloud-security.svg b/theme/NMCIcons/cloud-security.svg new file mode 100644 index 0000000000000..bfa4b9cfc802a --- /dev/null +++ b/theme/NMCIcons/cloud-security.svg @@ -0,0 +1,7 @@ + + + /svg/icon/content/cloud-security/default + + + + \ No newline at end of file diff --git a/theme/NMCIcons/collapse-down.svg b/theme/NMCIcons/collapse-down.svg new file mode 100644 index 0000000000000..b63406256c813 --- /dev/null +++ b/theme/NMCIcons/collapse-down.svg @@ -0,0 +1,7 @@ + + + /svg/icon/navigation/collapse-down/default + + + + \ No newline at end of file diff --git a/theme/NMCIcons/collapse-right.svg b/theme/NMCIcons/collapse-right.svg new file mode 100644 index 0000000000000..c353781f763c1 --- /dev/null +++ b/theme/NMCIcons/collapse-right.svg @@ -0,0 +1,7 @@ + + + /svg/icon/navigation/right/default + + + + \ No newline at end of file diff --git a/theme/NMCIcons/configuration1.png b/theme/NMCIcons/configuration1.png new file mode 100644 index 0000000000000..7a20bc1a11347 Binary files /dev/null and b/theme/NMCIcons/configuration1.png differ diff --git a/theme/NMCIcons/configuration2.png b/theme/NMCIcons/configuration2.png new file mode 100644 index 0000000000000..dbdac7d23fca2 Binary files /dev/null and b/theme/NMCIcons/configuration2.png differ diff --git a/theme/NMCIcons/configuration3.png b/theme/NMCIcons/configuration3.png new file mode 100644 index 0000000000000..66d2d513c8ad3 Binary files /dev/null and b/theme/NMCIcons/configuration3.png differ diff --git a/theme/NMCIcons/folderLogo.svg b/theme/NMCIcons/folderLogo.svg new file mode 100644 index 0000000000000..45f4cb770d6bb --- /dev/null +++ b/theme/NMCIcons/folderLogo.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/theme/NMCIcons/logout-white.svg b/theme/NMCIcons/logout-white.svg new file mode 100644 index 0000000000000..f449764e1a279 --- /dev/null +++ b/theme/NMCIcons/logout-white.svg @@ -0,0 +1,7 @@ + + + /svg/icon/action/logout/default + + + + \ No newline at end of file diff --git a/theme/NMCIcons/logout.svg b/theme/NMCIcons/logout.svg new file mode 100644 index 0000000000000..babca11ccf863 --- /dev/null +++ b/theme/NMCIcons/logout.svg @@ -0,0 +1,7 @@ + + + /svg/icon/action/logout/default + + + + \ No newline at end of file diff --git a/theme/NMCIcons/navigation-left.svg b/theme/NMCIcons/navigation-left.svg new file mode 100644 index 0000000000000..bfa5fa38304b4 --- /dev/null +++ b/theme/NMCIcons/navigation-left.svg @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/theme/NMCIcons/navigation-right.svg b/theme/NMCIcons/navigation-right.svg new file mode 100644 index 0000000000000..a008c1d637d63 --- /dev/null +++ b/theme/NMCIcons/navigation-right.svg @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/theme/NMCIcons/pause-white.svg b/theme/NMCIcons/pause-white.svg new file mode 100644 index 0000000000000..41fd92da98393 --- /dev/null +++ b/theme/NMCIcons/pause-white.svg @@ -0,0 +1,7 @@ + + + icon/action/pause/default@svg + + + + \ No newline at end of file diff --git a/theme/NMCIcons/pause.svg b/theme/NMCIcons/pause.svg new file mode 100644 index 0000000000000..7d8cc0999d9e9 --- /dev/null +++ b/theme/NMCIcons/pause.svg @@ -0,0 +1,7 @@ + + + icon/action/pause/default@svg + + + + \ No newline at end of file diff --git a/theme/NMCIcons/remove-white.svg b/theme/NMCIcons/remove-white.svg new file mode 100644 index 0000000000000..9a71790bcff30 --- /dev/null +++ b/theme/NMCIcons/remove-white.svg @@ -0,0 +1,7 @@ + + + /svg/icon/action/remove/default + + + + \ No newline at end of file diff --git a/theme/NMCIcons/remove.svg b/theme/NMCIcons/remove.svg new file mode 100644 index 0000000000000..9896ad3ca78a7 --- /dev/null +++ b/theme/NMCIcons/remove.svg @@ -0,0 +1,7 @@ + + + /svg/icon/action/remove/default + + + + \ No newline at end of file diff --git a/theme/NMCIcons/tlogocarrier.svg b/theme/NMCIcons/tlogocarrier.svg new file mode 100644 index 0000000000000..8fb2ff11a1050 --- /dev/null +++ b/theme/NMCIcons/tlogocarrier.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme/NMCIcons/website-white.svg b/theme/NMCIcons/website-white.svg new file mode 100644 index 0000000000000..4db891a1afe17 --- /dev/null +++ b/theme/NMCIcons/website-white.svg @@ -0,0 +1,7 @@ + + + icon/content/news/default@svg + + + + \ No newline at end of file diff --git a/theme/NMCIcons/website.svg b/theme/NMCIcons/website.svg new file mode 100644 index 0000000000000..4cdf4813f3dbe --- /dev/null +++ b/theme/NMCIcons/website.svg @@ -0,0 +1,7 @@ + + + icon/content/news/default@svg + + + + diff --git a/theme/black/activity.svg b/theme/black/activity.svg index 39febf6a9e791..a9de5c7c5d073 100644 --- a/theme/black/activity.svg +++ b/theme/black/activity.svg @@ -1,7 +1,4 @@ - - - - - - + + + diff --git a/theme/close-white.svg b/theme/close-white.svg new file mode 100644 index 0000000000000..f4f3c0c23cc5e --- /dev/null +++ b/theme/close-white.svg @@ -0,0 +1,7 @@ + + + icon/action/circle-close/default@svg + + + + \ No newline at end of file diff --git a/theme/colored/MagentaCLOUD-icon.svg b/theme/colored/MagentaCLOUD-icon.svg new file mode 100644 index 0000000000000..d2b5a35f0c949 --- /dev/null +++ b/theme/colored/MagentaCLOUD-icon.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/theme/colored/MagentaCLOUD-macOS-icon.png b/theme/colored/MagentaCLOUD-macOS-icon.png new file mode 100644 index 0000000000000..2819a4247c964 Binary files /dev/null and b/theme/colored/MagentaCLOUD-macOS-icon.png differ diff --git a/theme/colored/MagentaCLOUD-macOS-icon.svg b/theme/colored/MagentaCLOUD-macOS-icon.svg new file mode 100644 index 0000000000000..0d8ea78253c53 --- /dev/null +++ b/theme/colored/MagentaCLOUD-macOS-icon.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/MagentaCLOUD-macOS-sidebar.svg b/theme/colored/MagentaCLOUD-macOS-sidebar.svg new file mode 100644 index 0000000000000..9bf1a0da46a71 --- /dev/null +++ b/theme/colored/MagentaCLOUD-macOS-sidebar.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/theme/more-white.svg b/theme/more-white.svg new file mode 100644 index 0000000000000..7efdfcbc6c514 --- /dev/null +++ b/theme/more-white.svg @@ -0,0 +1,7 @@ + + + /svg/icon/action/more/default + + + + \ No newline at end of file diff --git a/theme/settings-white.svg b/theme/settings-white.svg new file mode 100644 index 0000000000000..9004d38106663 --- /dev/null +++ b/theme/settings-white.svg @@ -0,0 +1,7 @@ + + + /svg/icon/service/settings/default + + + + \ No newline at end of file diff --git a/theme/white/activity.svg b/theme/white/activity.svg index 488934c812f28..e9bd3eb6de701 100644 --- a/theme/white/activity.svg +++ b/theme/white/activity.svg @@ -1,7 +1,4 @@ - - - - - - + + +