From 283e4de201eb0f659912e16a9e2ef928b738ada6 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 4 May 2015 19:02:24 +0200 Subject: [PATCH 01/11] fix notifications language problem --- app/assets/stylesheets/zammad.css.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 2db2417f5..1f8cc0936 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2905,10 +2905,12 @@ footer { .popover--notifications { min-height: 100px; + width: auto; + min-width: 372px; @extend .zIndex-5; - &.is-visible { - @extend .vertical; + &.fade { + display: inline-block !important; } .arrow { @@ -2949,10 +2951,10 @@ footer { @extend .btn; @extend .btn--subtle; @extend .align-right; - padding: 5px 0 0; + padding: 5px 0 0 10px; &:hover { - padding: 5px 0 0; + padding: 5px 0 0 10px; } } From 16eaa0af2584e544209ab388b7dc9b0eb2262042 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 7 May 2015 19:27:53 +0200 Subject: [PATCH 02/11] 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 @@
- - set to internal - - - reply - - - split - + + + set to internal + + + + reply + + + + split +
@@ -290,14 +296,15 @@ Oliver
- set to internal + + set to internal
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 c1f3494a0..b497d62a6 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 @@