Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

css: refactor controls--emailSwitch to generic --button

Browse source
This commit is contained in:
Felix Niklas 2016-02-16 09:28:56 +01:00
parent e3fd680c46
commit 9c01acee9b
4 changed files with 202 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/app/views/layout_ref/inputs.jst.eco
View file

@ -2,6 +2,21 @@
<h1>Inputs</h1> <h1>Inputs</h1>
<div style="max-width: 500px"> <div style="max-width: 500px">
<h2>Color</h2>
<div class="color form-group">
<div class="formGroup-label">
<label for="background-color"><%- @T('Background color') %></label>
</div>
<div class="controls controls--button">
<input type="text" id="background-color" value="">
<div class="controls-button">
<div class="controls-button-inner u-clickable">
<%- @Icon('eyedropper') %>
</div>
</div>
</div>
</div>
<h2>Time</h2> <h2>Time</h2>
<p>A time of the day</p> <p>A time of the day</p>
<input type="text" value="14:40" class="time js-timepicker1"> <input type="text" value="14:40" class="time js-timepicker1">

4
app/assets/javascripts/app/views/layout_ref/merge_customer.jst.eco
View file

@ -103,13 +103,13 @@
<div class="merge-target"> <div class="merge-target">
<label>Email</label> <label>Email</label>
<div class="merge-value"> <div class="merge-value">
<div class="primary-email-switch-holder"> <div class="controls-button">
<span class="primary-email-switch-label">nicole.braun@zammad.org</span> <span class="primary-email-switch-label">nicole.braun@zammad.org</span>
<input class="primary-email-switch" type="radio" name="merge-primary-email" id="input-1" checked><label for="input-1">main</label> <input class="primary-email-switch" type="radio" name="merge-primary-email" id="input-1" checked><label for="input-1">main</label>
</div> </div>
</div> </div>
<div class="merge-value"> <div class="merge-value">
<div class="primary-email-switch-holder"> <div class="controls-button">
<span class="primary-email-switch-label">nicole.mueller@zammad.org</span> <span class="primary-email-switch-label">nicole.mueller@zammad.org</span>
<input class="primary-email-switch" type="radio" name="merge-primary-email" id="input-2"><label for="input-2">main</label> <input class="primary-email-switch" type="radio" name="merge-primary-email" id="input-2"><label for="input-2">main</label>
</div> </div>

12
app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco
View file

@ -38,14 +38,16 @@
<span class="formGroup-metaControl js-addEmail" title="Add Email Address">+</span> <span class="formGroup-metaControl js-addEmail" title="Add Email Address">+</span>
</div> </div>
<div class="controls controls--emailSwitch"> <div class="controls controls--button">
<input class="form-control" id="User_510389_email1" name="email" required="" type="email" value=""> <input class="form-control" id="User_510389_email1" name="email" required="" type="email" value="">
<div class="primary-email-switch-holder"> <div class="controls-button">
<div class="controls-button-inner">
<input class="primary-email-switch" type="radio" name="merge-primary-email" id="User_510389_email1_switch" checked> <input class="primary-email-switch" type="radio" name="merge-primary-email" id="User_510389_email1_switch" checked>
<label for="User_510389_email1_switch">primary</label> <label for="User_510389_email1_switch">primary</label>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="input form-group formGroup--halfSize"> <div class="input form-group formGroup--halfSize">
<div class="formGroup-label"> <div class="formGroup-label">
@ -53,14 +55,16 @@
<span class="formGroup-metaControl js-removeEmail" title="Remove Email Address">&times;</span> <span class="formGroup-metaControl js-removeEmail" title="Remove Email Address">&times;</span>
</div> </div>
<div class="controls controls--emailSwitch"> <div class="controls controls--button">
<input class="form-control" id="User_510389_email2" name="email" required="" type="email" value=""> <input class="form-control" id="User_510389_email2" name="email" required="" type="email" value="">
<div class="primary-email-switch-holder"> <div class="controls-button">
<div class="controls-button-inner">
<input class="primary-email-switch" type="radio" name="merge-primary-email" id="User_510389_email2_switch" checked> <input class="primary-email-switch" type="radio" name="merge-primary-email" id="User_510389_email2_switch" checked>
<label for="User_510389_email2_switch">primary</label> <label for="User_510389_email2_switch">primary</label>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="input form-group formGroup--halfSize"> <div class="input form-group formGroup--halfSize">
<div class="formGroup-label"> <div class="formGroup-label">

135
app/assets/stylesheets/zammad.scss
View file

@ -1506,52 +1506,52 @@ input.time.time--12 {
width: 7.5ch; width: 7.5ch;
} }
.tokenfield.focus { .tokenfield.focus {
border-color: hsl(200,71%,59%); border-color: hsl(200,71%,59%);
box-shadow: 0 0 0 3px hsl(201,62%,90%); box-shadow: 0 0 0 3px hsl(201,62%,90%);
} }
.richtext.form-control { .richtext.form-control {
padding-bottom: 28px; padding-bottom: 28px;
} }
.richtext.form-control [contenteditable] { .richtext.form-control [contenteditable] {
height: auto; height: auto;
min-height: 82px; min-height: 82px;
background: none; background: none;
} }
.richtext.form-control .attachments.attachments--list:not(:empty) { .richtext.form-control .attachments.attachments--list:not(:empty) {
border-top: 1px solid rgba(0,0,0,.04); border-top: 1px solid rgba(0,0,0,.04);
white-space: normal; white-space: normal;
margin: 0 -12px -28px; margin: 0 -12px -28px;
padding: 25px 20px 21px 72px; padding: 25px 20px 21px 72px;
position: relative; position: relative;
line-height: 1; line-height: 1;
} }
textarea.form-control { textarea.form-control {
height: 118px; height: 118px;
} }
select.form-control:not([multiple]) { select.form-control:not([multiple]) {
padding-left: 10px; padding-left: 10px;
padding-right: 34px; padding-right: 34px;
word-wrap: normal; word-wrap: normal;
} }
.form-control.is-hidden { .form-control.is-hidden {
display: none; display: none;
} }
.form-control[disabled], .form-control.is-disabled { .form-control[disabled], .form-control.is-disabled {
cursor: not-allowed; cursor: not-allowed;
background-color: #fff; background-color: #fff;
color: #d5d5d5; color: #d5d5d5;
opacity: 1; opacity: 1;
} }
.form-control.form-control--borderless { .form-control.form-control--borderless {
border: none; border: none;
padding: 0; padding: 0;
line-height: inherit; line-height: inherit;
@ -1560,10 +1560,10 @@ input.time.time--12 {
&:focus { &:focus {
box-shadow: none; box-shadow: none;
} }
} }
.form-control + .icon-arrow-down, .form-control + .icon-arrow-down,
.dropdown-arrow { .dropdown-arrow {
position: absolute; position: absolute;
right: 12px; right: 12px;
top: 50%; top: 50%;
@ -1573,9 +1573,9 @@ input.time.time--12 {
width: 13px; width: 13px;
height: 7px; height: 7px;
@extend .u-unclickable; @extend .u-unclickable;
} }
/* /*
Firefox only hack Firefox only hack
----------------- -----------------
@ -1587,37 +1587,37 @@ input.time.time--12 {
The class is set via Javascript The class is set via Javascript
*/ */
html.ff-lt-35 .form-control + .icon-arrow-down, html.ff-lt-35 .form-control + .icon-arrow-down,
html.ff-lt-35 .dropdown-arrow { html.ff-lt-35 .dropdown-arrow {
display: none; display: none;
} }
select::-ms-expand { select::-ms-expand {
display: none; display: none;
} }
.has-error .form-control, .has-error .form-control,
.has-error .form-control:focus, .has-error .form-control:focus,
.has-error .form-control.focus { .has-error .form-control.focus {
box-shadow: none; box-shadow: none;
border-color: red !important; border-color: red !important;
} }
input.has-error { input.has-error {
box-shadow: none; box-shadow: none;
border-color: red !important; border-color: red !important;
} }
.help-inline:not(:empty) { .help-inline:not(:empty) {
color: red; color: red;
padding: 2px; padding: 2px;
font-size: 13px; font-size: 13px;
} }
/* use on input[type=radio] */ /* use on input[type=radio] */
.primary-email-switch { .primary-email-switch {
display: none; display: none;
& + label { & + label {
@ -1630,37 +1630,33 @@ input.time.time--12 {
&:checked + label { &:checked + label {
color: $highlight-color; color: $highlight-color;
} }
} }
.primary-email-switch-holder { .primary-email-switch-label {
position: relative;
display: flex;
.primary-email-switch-label {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
} }
.primary-email-switch + label { .primary-email-switch + label {
align-self: stretch; align-self: stretch;
padding: 0 5px; padding: 0 5px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
}
.controls--emailSwitch { .controls--button {
display: flex; display: flex;
input,
.form-control { .form-control {
flex: 1; flex: 1;
border-right: none; border-right: none;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
&:focus + .primary-email-switch-holder { &:focus + .controls-button {
label { .controls-button-inner {
border-color: hsl(200,71%,59%); border-color: hsl(200,71%,59%);
} }
@ -1681,15 +1677,27 @@ input.time.time--12 {
} }
} }
} }
}
.primary-email-switch-holder label { .controls-button {
padding: 0 9px; position: relative;
display: flex;
&.is-active .icon {
fill: $highlight-color;
}
}
.controls-button-inner {
display: flex;
justify-content: center;
align-items: center;
padding: 0 10px;
background: white; background: white;
position: relative; position: relative;
border: 1px solid hsl(0, 0%, 90%); border: 1px solid hsl(0, 0%, 90%);
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
} }
}
.searchfield { .searchfield {
position: relative; position: relative;
@ -7643,24 +7651,11 @@ output {
transform-origin: left top; transform-origin: left top;
overflow: hidden; overflow: hidden;
&[data-mode=screenshot] iframe, &.is-picking {
&[data-mode=iframe] img { cursor: image_url("/assets/images/eyedropper.gif") 0 15, auto;
display: none;
} }
} }
iframe {
position: absolute;
border: none;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: white;
border-radius: 0 0 5px 5px;
pointer-events: none;
}
img { img {
vertical-align: bottom; vertical-align: bottom;
} }