diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
index 7e2659eaa..7397f770e 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
@@ -5,8 +5,7 @@ class App.TicketCreate extends App.Controller
events:
'click .type-tabs .tab': 'changeFormType'
'submit form': 'submit'
- 'click .submit': 'submit'
- 'click .cancel': 'cancel'
+ 'click .js-cancel': 'cancel'
constructor: (params) ->
super
diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
index 7de2b4b98..2eaba6877 100644
--- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee
+++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
@@ -1501,4 +1501,16 @@ class calendarSubscriptionsRef extends App.ControllerContent
App.Config.set( 'layout_ref/calendar_subscriptions', calendarSubscriptionsRef, 'Routes' )
+class ButtonsRef extends App.ControllerContent
+
+ constructor: ->
+ super
+ @render()
+
+ render: ->
+ @html App.view('layout_ref/buttons')
+
+App.Config.set( 'layout_ref/buttons', ButtonsRef, 'Routes' )
+
+
App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', translate: true, target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' )
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
index 5212a9fe2..90686b7df 100644
--- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
@@ -36,9 +36,9 @@
-
@@ -147,7 +147,7 @@
diff --git a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
index 831b3129c..b99d8558b 100644
--- a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
@@ -8,7 +8,7 @@
diff --git a/app/assets/javascripts/app/views/agent_user_create.jst.eco b/app/assets/javascripts/app/views/agent_user_create.jst.eco
index 00d2373b6..08d301a53 100644
--- a/app/assets/javascripts/app/views/agent_user_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_user_create.jst.eco
@@ -9,7 +9,7 @@
diff --git a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
index 3d03a2f98..f88259c99 100644
--- a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
@@ -17,8 +17,8 @@
-
diff --git a/app/assets/javascripts/app/views/getting_started/channel.jst.eco b/app/assets/javascripts/app/views/getting_started/channel.jst.eco
index d45621c90..1ecb28a2c 100644
--- a/app/assets/javascripts/app/views/getting_started/channel.jst.eco
+++ b/app/assets/javascripts/app/views/getting_started/channel.jst.eco
@@ -17,7 +17,7 @@
diff --git a/app/assets/javascripts/app/views/getting_started/email.jst.eco b/app/assets/javascripts/app/views/getting_started/email.jst.eco
index 4aa2995a5..ffcf4a432 100644
--- a/app/assets/javascripts/app/views/getting_started/email.jst.eco
+++ b/app/assets/javascripts/app/views/getting_started/email.jst.eco
@@ -22,7 +22,7 @@
@@ -70,7 +70,7 @@
@@ -85,7 +85,7 @@
diff --git a/app/assets/javascripts/app/views/getting_started/email_pre_configured.jst.eco b/app/assets/javascripts/app/views/getting_started/email_pre_configured.jst.eco
index 1b6fa7c23..f88cd561f 100644
--- a/app/assets/javascripts/app/views/getting_started/email_pre_configured.jst.eco
+++ b/app/assets/javascripts/app/views/getting_started/email_pre_configured.jst.eco
@@ -13,7 +13,7 @@
<%- @T('If you want to use more email adresses, you can configure them later.') %>
diff --git a/app/assets/javascripts/app/views/import/index.jst.eco b/app/assets/javascripts/app/views/import/index.jst.eco
index f02019027..12cdbf8fa 100644
--- a/app/assets/javascripts/app/views/import/index.jst.eco
+++ b/app/assets/javascripts/app/views/import/index.jst.eco
@@ -11,7 +11,7 @@
diff --git a/app/assets/javascripts/app/views/import/otrs.jst.eco b/app/assets/javascripts/app/views/import/otrs.jst.eco
index a789ba295..0b00f7d8e 100644
--- a/app/assets/javascripts/app/views/import/otrs.jst.eco
+++ b/app/assets/javascripts/app/views/import/otrs.jst.eco
@@ -9,7 +9,7 @@
@@ -45,7 +45,7 @@
diff --git a/app/assets/javascripts/app/views/layout_ref/buttons.jst.eco b/app/assets/javascripts/app/views/layout_ref/buttons.jst.eco
new file mode 100644
index 000000000..2ca8bab23
--- /dev/null
+++ b/app/assets/javascripts/app/views/layout_ref/buttons.jst.eco
@@ -0,0 +1,57 @@
+
+
Buttons
+
+
Normal Buttons
+
Default
+
Default Button
+
Slim Button
+
Disabled Button
+
+
Primary
+
Primary Button
+
Secondary Button
+
+
Positive
+
Positive Button
+
Positive Secondary Button
+
+
Dangerous
+
Dangerous Button
+
Dangerous Secondary Button
+
+
Split
+
+
Split First Button
+
Split Button
+
Split Last Button
+
+
+
+
+
Text Buttons
+
+
Default
+
Text Button
+
Secondary Text Button
+
+
Positive
+
Positive Text Button
+
+
Dangerous
+
Dangerous Text Button
+
+
Subtle
+
Subtle Button
+
+
Action Buttons
+
+
Default
+
Action Button
+
+
Split
+
+
Split First
+
Split
+
Split Last
+
+
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco b/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco
index 250a9529a..0b27828a7 100644
--- a/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco
@@ -16,7 +16,7 @@
@@ -29,7 +29,7 @@
Personal Migration Plugin
@@ -52,7 +52,7 @@
diff --git a/app/assets/javascripts/app/views/layout_ref/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco
index facb2a3e4..483020575 100644
--- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco
@@ -4,6 +4,7 @@
+ 👇👉👈👆 All the Buttons
Calendar Subscription
Searchable Select
Schedulers
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 bb894677f..3dff17cd1 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
@@ -290,7 +290,7 @@
diff --git a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
index 91835b5a4..e4258bc26 100644
--- a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
@@ -41,7 +41,7 @@
@@ -67,7 +67,7 @@
@@ -91,7 +91,7 @@
@@ -115,7 +115,7 @@
@@ -161,7 +161,7 @@
@@ -195,8 +195,8 @@
-
Cancel
-
Go Back
+
Cancel
+
Go Back
Connect
@@ -263,7 +263,7 @@
diff --git a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
index 5dd2b5af4..bac83fa89 100644
--- a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
@@ -180,7 +180,7 @@
Schedule
-Business Hours in European Central Time (change)
+Business Hours in European Central Time (change )
diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco
index 3924d5bc0..46afc8241 100644
--- a/app/assets/javascripts/app/views/login.jst.eco
+++ b/app/assets/javascripts/app/views/login.jst.eco
@@ -24,11 +24,11 @@
<%- @T( 'Remember me' ) %>
-
diff --git a/app/assets/javascripts/app/views/password/reset_failed.jst.eco b/app/assets/javascripts/app/views/password/reset_failed.jst.eco
index 29662121b..83c9f5dc5 100644
--- a/app/assets/javascripts/app/views/password/reset_failed.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset_failed.jst.eco
@@ -3,7 +3,7 @@
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco
index a7e095378..4b5d84ae1 100644
--- a/app/assets/javascripts/app/views/signup.jst.eco
+++ b/app/assets/javascripts/app/views/signup.jst.eco
@@ -4,8 +4,8 @@
<%- @T( 'Join' ) %> <%= @C( 'product_name' ) %>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 038a81cdb..71bd3480b 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -317,7 +317,7 @@ span[data-tooltip]:hover:before {
text-transform: uppercase;
color: hsl(0,0%,60%);
font-size: 12px;
- letter-spacing: 0.1em;
+ letter-spacing: 0.05em;
height: 31px;
padding: 6px 11px !important;
display: inline-flex;
@@ -356,10 +356,13 @@ span[data-tooltip]:hover:before {
background: hsl(145,51%,35%);
}
- &.btn--secondary,
- &.btn--secondary:active {
+ &.btn--secondary {
background: white;
color: hsl(145,51%,45%);
+
+ &:active {
+ background: hsl(0,0%,98%);
+ }
}
}
@@ -370,10 +373,13 @@ span[data-tooltip]:hover:before {
background: hsl(0,65%,45%);
}
- &.btn--secondary,
- &.btn--secondary:active {
+ &.btn--secondary {
background: white;
color: hsl(0,65%,55%);
+
+ &:active {
+ background: hsl(0,0%,98%);
+ }
}
}
@@ -385,29 +391,44 @@ span[data-tooltip]:hover:before {
background: none;
vertical-align: baseline;
&:active {
- color: hsl(203,65%,45%);
- }
- }
-
- &.btn--subtle {
- padding-left: 0;
- padding-right: 0;
- border: none;
- color: rgba(0,0,0,.32);
- text-decoration: underline;
- background: none;
- @extend .u-clickable;
-
- &:active {
- color: rgba(0,0,0,.42);
- }
-
- &:hover {
- color: rgba(0,0,0,.5);
+ color: hsl(203,65%,40%);
}
- + .btn:not(.align-right) {
- margin-left: 20px;
+ &.btn--secondary {
+ color: hsl(0,0%,68%);
+ text-decoration: underline;
+
+ &:active {
+ color: hsl(0,0%,53%);
+ }
+ }
+
+ &.btn--positive {
+ color: hsl(145,51%,45%);
+
+ &:active {
+ color: hsl(145,51%,30%);
+ background: none;
+ }
+ }
+
+ &.btn--danger {
+ color: hsl(0,65%,55%);
+
+ &:active {
+ color: hsl(0,65%,40%);
+ background: none;
+ }
+ }
+
+ &.btn--subtle {
+ text-decoration: underline;
+ letter-spacing: 0.04em;
+ color: hsl(0,0%,85%);
+
+ &:active {
+ color: hsl(0,0%,75%);
+ }
}
}
@@ -418,7 +439,7 @@ span[data-tooltip]:hover:before {
&.btn--split--last {
border-radius: 0;
border-left: none;
- margin-left: 0;
+ margin-left: 0 !important;
}
&.btn--split--last {
border-radius: 0 3px 3px 0;
@@ -433,7 +454,6 @@ span[data-tooltip]:hover:before {
margin-left: auto;
}
-.subtle-link.align-right ~ .btn,
.btn.align-right ~ .btn {
margin-left: 15px;
}
@@ -1345,16 +1365,6 @@ kbd {
display: inline-block;
}
-.subtle-link {
- color: rgba(0,0,0,.32);
- text-decoration: underline;
- @extend .u-clickable;
-}
-
-.subtle-link:hover {
- color: rgba(0,0,0,.5);
-}
-
ol.tabs {
list-style: decimal inside;
}
@@ -1588,7 +1598,13 @@ form {
.form-controls {
@extend .clearfix;
+ display: flex;
+ align-items: center;
margin-top: 10px;
+
+ .btn + .btn:not(.align-right) {
+ margin-left: 20px;
+ }
}
form a.standalone {
@@ -3944,9 +3960,6 @@ footer {
.newTicket .form-control:not(:focus):not(.focus) {
border-color: hsl(0,0%,90%);
}
- .newTicket .subtle-link {
- color: hsl(0,0%,89%);
- }
.newTicket .article-form-top {
margin-top: 15px;
}