Skip to content

Commit

Permalink
Merge branch 'branch/1.9.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Screenfeed committed Jun 17, 2019
2 parents f7de7a2 + a432402 commit 7e88030
Show file tree
Hide file tree
Showing 40 changed files with 2,745 additions and 752 deletions.
54 changes: 42 additions & 12 deletions assets/css/options.css
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,6 @@ p.imagify-api-key-invite-title {
padding-top: 35px;
}

.imagify-settings input[type="text"] {
color: #4A4A4A;
font-weight: 600;
box-shadow: none;
}

.imagify-settings div.submit.submit {
border-top: 1px solid #D9D9D9;
margin-top: 2em;
Expand Down Expand Up @@ -242,12 +236,14 @@ label + .imagify-info,
margin-left: 38px;
padding-right: 25px;
}
.imagify-options-line {
-webkit-transition: opacity .3s;
transition: opacity .3s;
}
label ~ .imagify-options-line {
display: block;
margin: 8px 0 20px 40px;
font-size: 14px;
-webkit-transition: opacity .3s;
transition: opacity .3s;
}
.imagify-options-line + .imagify-info {
margin-left: 38px;
Expand All @@ -266,21 +262,30 @@ label[for="imagify_sizes_full"] + .imagify-info {
}

.imagify-settings.imagify-settings [type="checkbox"]:not(:checked) + label ~ .imagify-options-line,
.imagify-settings.imagify-settings [type="checkbox"]:not(:checked) + label .imagify-visual-label {
.imagify-settings.imagify-settings [type="checkbox"]:not(:checked) + label .imagify-visual-label,
:checked + label ~ .imagify-options-line :checked + label ~ .imagify-options-line .imagify-faded {
opacity: .5;
}
.imagify-settings.imagify-settings [type="checkbox"]:checked + label ~ .imagify-options-line,
.imagify-settings.imagify-settings [type="checkbox"]:checked + label .imagify-visual-label {
.imagify-settings.imagify-settings [type="checkbox"]:checked + label .imagify-visual-label,
.imagify-settings.imagify-settings :not(:checked) + label ~ .imagify-options-line :not(:checked) + label ~ .imagify-options-line {
opacity: 1;
}

.imagify-radio-group + .imagify-options-line {
display: block;
margin: 0 0 0 1.7em;
font-size: 14px;
}

.imagify-checkbox-marged {
max-width: 500px;
margin-left: 45px;
}

#imagify_resize_larger_w {
width: 5em;
.imagify-settings [type="text"],
.imagify-settings [type="number"] {
width: 20em;
height: auto;
padding: 6px;
margin: 0 6px;
Expand All @@ -290,6 +295,31 @@ label[for="imagify_sizes_full"] + .imagify-info {
color: #338EA6;
font-weight: bold;
}
.imagify-settings [type="number"] {
width: 5em;
}
.imagify-settings ::-webkit-input-placeholder {
color: #B1B1B1;
font-weight: 400;
}
.imagify-settings ::-moz-placeholder {
color: #B1B1B1;
font-weight: 400;
opacity: 1;
}
.imagify-settings :-ms-input-placeholder {
color: #B1B1B1;
font-weight: 400;
}
.imagify-settings :-moz-placeholder {
color: #B1B1B1;
font-weight: 400;
opacity: 1;
}
.imagify-settings ::placeholder {
color: #B1B1B1;
font-weight: 400;
}

.imagify-menu-bar-img {
box-sizing: border-box;
Expand Down
2 changes: 1 addition & 1 deletion assets/css/options.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit 7e88030

Please sign in to comment.