From 4dbd7c8c21fbad588d53f8e087e832807f3cacaa Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 7 May 2015 19:27:53 +0200 Subject: [PATCH] add new icon technique --- .gitignore | 1 + Guardfile | 2 +- .../app/views/generic/actions.jst.eco | 2 +- .../app/views/generic/sidebar_tabs.jst.eco | 4 +- .../app/views/layout_ref/local_modal.jst.eco | 2 +- .../layout_ref/organization_profile.jst.eco | 2 +- .../app/views/layout_ref/user_profile.jst.eco | 2 +- .../javascripts/app/views/navigation.jst.eco | 7 +- .../app/views/navigation/menu.jst.eco | 4 +- .../app/views/navigation/personal.jst.eco | 10 +- .../views/widget/switch_back_to_user.jst.eco | 8 +- app/assets/stylesheets/zammad.css.scss | 100 +++++--- app/helpers/application_helper.rb | 5 + app/views/init/index.html.erb | 3 + gulpfile.js | 28 +++ package.json | 12 + public/assets/images/glyphicons-halflings.png | Bin 10586 -> 0 bytes public/assets/images/icons.svg | 1 + public/assets/images/icons/close.svg | 12 + public/assets/images/icons/cog.svg | 12 + public/assets/images/icons/dashboard.svg | 12 + public/assets/images/icons/group.svg | 12 + public/assets/images/icons/logo.svg | 32 +++ public/assets/images/icons/magnifier.svg | 12 + public/assets/images/icons/message.svg | 12 + public/assets/images/icons/overviews.svg | 12 + public/assets/images/icons/person.svg | 12 + public/assets/images/icons/plus.svg | 12 + public/assets/images/icons/signout.svg | 12 + public/assets/images/icons/switchView.svg | 12 + public/assets/images/icons/templates.svg | 12 + public/assets/images/icons/tools.svg | 12 + public/assets/images/sprite.svg | 216 ------------------ 33 files changed, 330 insertions(+), 267 deletions(-) create mode 100644 gulpfile.js create mode 100644 package.json delete mode 100644 public/assets/images/glyphicons-halflings.png create mode 100644 public/assets/images/icons.svg create mode 100644 public/assets/images/icons/close.svg create mode 100644 public/assets/images/icons/cog.svg create mode 100644 public/assets/images/icons/dashboard.svg create mode 100644 public/assets/images/icons/group.svg create mode 100644 public/assets/images/icons/logo.svg create mode 100644 public/assets/images/icons/magnifier.svg create mode 100644 public/assets/images/icons/message.svg create mode 100644 public/assets/images/icons/overviews.svg create mode 100644 public/assets/images/icons/person.svg create mode 100644 public/assets/images/icons/plus.svg create mode 100644 public/assets/images/icons/signout.svg create mode 100644 public/assets/images/icons/switchView.svg create mode 100644 public/assets/images/icons/templates.svg create mode 100644 public/assets/images/icons/tools.svg delete mode 100644 public/assets/images/sprite.svg diff --git a/.gitignore b/.gitignore index cf824eb70..a76e9d47d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ db/schema.rb # Ignore Rubymine config /.idea +node_modules diff --git a/Guardfile b/Guardfile index 481dbefa8..1ff367bc1 100644 --- a/Guardfile +++ b/Guardfile @@ -4,7 +4,7 @@ guard 'livereload', port: '35738' do watch(%r{app/views/.+\.(erb|haml|slim)$}) watch(%r{app/helpers/.+\.rb}) - watch(%r{public/.+\.(css|js|html)}) + watch(%r{public/.+\.(css|js|html|svg)}) watch(%r{config/locales/.+\.yml}) # Rails Assets Pipeline watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg|svg))).*}) { |m| "/assets/#{m[3]}" } diff --git a/app/assets/javascripts/app/views/generic/actions.jst.eco b/app/assets/javascripts/app/views/generic/actions.jst.eco index 4b8b873a5..7144ad932 100644 --- a/app/assets/javascripts/app/views/generic/actions.jst.eco +++ b/app/assets/javascripts/app/views/generic/actions.jst.eco @@ -1,7 +1,7 @@
@@ -16,7 +16,7 @@
<% for item in @items: %>
-
+
<% end %>
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco index 3f04093c2..0eb1249f0 100644 --- a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco @@ -302,7 +302,7 @@
diff --git a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco index d223fc81d..d0660d72f 100644 --- a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco @@ -4,7 +4,7 @@
diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco index 62d3f770d..602974e29 100644 --- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco @@ -4,7 +4,7 @@
diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index 9750c56ab..48fbc6c46 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -1,11 +1,12 @@
-
-
+ +
+
- + diff --git a/app/assets/javascripts/app/views/navigation/menu.jst.eco b/app/assets/javascripts/app/views/navigation/menu.jst.eco index 9c970cd74..1a752a829 100644 --- a/app/assets/javascripts/app/views/navigation/menu.jst.eco +++ b/app/assets/javascripts/app/views/navigation/menu.jst.eco @@ -3,7 +3,7 @@
  • - + <%- @T( item.name ) %> @@ -26,7 +26,7 @@
  • - + <%- @T( item.name ) %> diff --git a/app/assets/javascripts/app/views/navigation/personal.jst.eco b/app/assets/javascripts/app/views/navigation/personal.jst.eco index f93458b80..741ae9ea9 100644 --- a/app/assets/javascripts/app/views/navigation/personal.jst.eco +++ b/app/assets/javascripts/app/views/navigation/personal.jst.eco @@ -1,13 +1,12 @@ <% for item in @items: %> <% if item.child: %>
  • - + <% if item.class is 'user': %> <% else: %> - - + <% end %>