Customizer: Enhance Background Image/Upload controls.
* Adopt the Header Image layout to the Background Image/Upload control. * Remove templates for interactive audio/video previews. They haven't worked yet. * Don't show a "Remove" button when the default value is set. * Avoid calculating of container/placeholder heights which are unrelated to custom headers. see #21483. Built from https://develop.svn.wordpress.org/trunk@30712 git-svn-id: http://core.svn.wordpress.org/trunk@30702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling
parent
f1dcfa9712
commit
3db8b08686
|
|
@ -420,32 +420,18 @@ p.customize-section-description {
|
|||
|
||||
.customize-control .attachment-thumb.type-icon {
|
||||
float: right;
|
||||
margin-left: 12px;
|
||||
margin: 10px;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.customize-control .attachment-title {
|
||||
font-weight: bold;
|
||||
margin: 0 0 12px 0;
|
||||
margin: 0;
|
||||
padding: 5px 10px;
|
||||
}
|
||||
|
||||
.customize-control .remove-button {
|
||||
margin-right: 8px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.customize-control .thumbnail-audio .attachment-title,
|
||||
.customize-control .thumbnail.thumbnail-audio,
|
||||
.customize-control .thumbnail.thumbnail-video,
|
||||
.customize-control .thumbnail.thumbnail-image {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.customize-control .placeholder-text {
|
||||
font-size: 18px;
|
||||
font-weight: 300;
|
||||
text-align: center;
|
||||
color: #aaa;
|
||||
cursor: default;
|
||||
.customize-control .thumbnail-image {
|
||||
line-height: 0;
|
||||
}
|
||||
|
||||
.customize-control .thumbnail-image img {
|
||||
|
|
@ -563,129 +549,6 @@ p.customize-section-description {
|
|||
border-color: rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
|
||||
/*
|
||||
* Image Picker
|
||||
*/
|
||||
.customize-control-image .library,
|
||||
.customize-control-image .actions {
|
||||
display: none;
|
||||
float: right;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.customize-control-image.open .library,
|
||||
.customize-control-image.open .actions {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .dropdown-content {
|
||||
height: auto;
|
||||
min-height: 24px;
|
||||
min-width: 40px;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .dropdown-status {
|
||||
padding: 4px 5px;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .preview-thumbnail img {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 122px;
|
||||
max-height: 98px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .actions {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library ul {
|
||||
border-bottom: 1px solid #ddd;
|
||||
float: right;
|
||||
width: 100%;
|
||||
margin: 10px 0 0;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library li {
|
||||
color: #ccc;
|
||||
float: right;
|
||||
padding: 3px 15px;
|
||||
margin: 0;
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library li.library-selected {
|
||||
margin-bottom: -1px;
|
||||
padding-bottom: 4px;
|
||||
color: #666666;
|
||||
border-color: #ddd;
|
||||
border-bottom-color: #fff;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library .thumbnail {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library .thumbnail img {
|
||||
display: block;
|
||||
max-width: 90%;
|
||||
max-height: 80px;
|
||||
margin: 5px auto;
|
||||
padding: 2px;
|
||||
background: #666666;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library .thumbnail:hover img {
|
||||
background-color: #2ea2cc;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library-content {
|
||||
display: none;
|
||||
width: 100%;
|
||||
float: right;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library-content.library-selected {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .upload-fallback,
|
||||
.accordion-section .customize-control-image .upload-fallback {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .upload-dropzone,
|
||||
.accordion-section .customize-control-image .upload-dropzone {
|
||||
display: none;
|
||||
padding: 15px 10px;
|
||||
border: 3px dashed #dfdfdf;
|
||||
margin: 5px auto;
|
||||
text-align: center;
|
||||
position: relative;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop,
|
||||
.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop {
|
||||
display: block;
|
||||
-webkit-transition: border-color 0.1s;
|
||||
transition: border-color 0.1s;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .library ul li,
|
||||
.accordion-section .customize-control-image .library ul li {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over,
|
||||
.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over {
|
||||
border-color: #83b4d8;
|
||||
}
|
||||
|
||||
/**
|
||||
* iOS can't scroll iframes,
|
||||
* instead it expands the iframe size to match the size of the content
|
||||
|
|
@ -704,16 +567,18 @@ p.customize-section-description {
|
|||
|
||||
/** Header control **/
|
||||
|
||||
#customize-control-header_image .current {
|
||||
.customize-control-upload .current,
|
||||
.customize-control-image .current,
|
||||
.customize-control-header .current {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .uploaded {
|
||||
.customize-control-header .uploaded {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .uploaded button:not(.random),
|
||||
#customize-control-header_image .default button:not(.random) {
|
||||
.customize-control-header .uploaded button:not(.random),
|
||||
.customize-control-header .default button:not(.random) {
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
|
@ -723,21 +588,24 @@ p.customize-section-description {
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
#customize-control-header_image button img {
|
||||
.customize-control-header button img {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#customize-control-header_image button.new,
|
||||
#customize-control-header_image button.remove {
|
||||
.customize-control-upload .remove-button,
|
||||
.customize-control-upload .upload-button,
|
||||
.customize-control-image .remove-button,
|
||||
.customize-control-image .upload-button,
|
||||
.customize-control-header button.new,
|
||||
.customize-control-header button.remove {
|
||||
white-space: normal;
|
||||
width: 48%;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
|
||||
/* Header control: current image container */
|
||||
|
||||
#customize-control-header_image .current .container {
|
||||
.customize-control-upload .current .container,
|
||||
.customize-control-image .current .container,
|
||||
.customize-control-header .current .container {
|
||||
overflow: hidden;
|
||||
-webkit-border-radius: 2px;
|
||||
border: 1px solid #eee;
|
||||
|
|
@ -745,14 +613,23 @@ p.customize-section-description {
|
|||
border-radius: 2px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .placeholder {
|
||||
.customize-control-upload .current .container,
|
||||
.customize-control-image .current .container {
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.customize-control-upload .placeholder,
|
||||
.customize-control-image .placeholder,
|
||||
.customize-control-header .placeholder {
|
||||
width: 100%;
|
||||
position: relative;
|
||||
text-align: center;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
#customize-control-header_image .inner {
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner,
|
||||
.customize-control-header .inner {
|
||||
display: none;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
|
|
@ -762,31 +639,40 @@ p.customize-section-description {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
#customize-control-header_image .inner,
|
||||
#customize-control-header_image .inner .dashicons {
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner {
|
||||
display: block;
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner,
|
||||
.customize-control-header .inner,
|
||||
.customize-control-header .inner .dashicons {
|
||||
line-height: 20px;
|
||||
top: 10px;
|
||||
}
|
||||
#customize-control-header_image .list .inner,
|
||||
#customize-control-header_image .list .inner .dashicons {
|
||||
|
||||
.customize-control-header .list .inner,
|
||||
.customize-control-header .list .inner .dashicons {
|
||||
top: 9px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .header-view {
|
||||
.customize-control-header .header-view {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .header-view:last-child {
|
||||
.customize-control-header .header-view:last-child {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
/* Convoluted, but 'outline' support isn't good enough yet */
|
||||
#customize-control-header_image .header-view:after {
|
||||
.customize-control-header .header-view:after {
|
||||
border: 0;
|
||||
}
|
||||
#customize-control-header_image .header-view.selected:after {
|
||||
.customize-control-header .header-view.selected:after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
height: auto;
|
||||
|
|
@ -795,13 +681,13 @@ p.customize-section-description {
|
|||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
#customize-control-header_image .header-view.button.selected {
|
||||
.customize-control-header .header-view.button.selected {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
/* Header control: overlay "close" button */
|
||||
|
||||
#customize-control-header_image .uploaded .header-view .close {
|
||||
.customize-control-header .uploaded .header-view .close {
|
||||
font-size: 2em;
|
||||
color: grey;
|
||||
position: absolute;
|
||||
|
|
@ -814,7 +700,7 @@ p.customize-section-description {
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
#customize-control-header_image .uploaded .header-view .close:hover {
|
||||
.customize-control-header .uploaded .header-view .close:hover {
|
||||
color: black;
|
||||
text-shadow:
|
||||
-1px -1px 0 #fff,
|
||||
|
|
@ -823,32 +709,32 @@ p.customize-section-description {
|
|||
1px 1px 0 #fff;
|
||||
}
|
||||
|
||||
#customize-control-header_image .header-view:hover .close {
|
||||
.customize-control-header .header-view:hover .close {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
/* Header control: randomiz(s)er */
|
||||
|
||||
#customize-control-header_image .random.placeholder {
|
||||
.customize-control-header .random.placeholder {
|
||||
cursor: pointer;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
#customize-control-header_image button.random {
|
||||
.customize-control-header button.random {
|
||||
width: 100%;
|
||||
height: auto;
|
||||
min-height: 40px;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
#customize-control-header_image button.random .dice {
|
||||
.customize-control-header button.random .dice {
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .placeholder:hover .dice,
|
||||
#customize-control-header_image .header-view:hover > button.random .dice {
|
||||
.customize-control-header .placeholder:hover .dice,
|
||||
.customize-control-header .header-view:hover > button.random .dice {
|
||||
-webkit-animation: dice-color-change 3s infinite;
|
||||
-ms-animation: dice-color-change 3s infinite;
|
||||
animation: dice-color-change 3s infinite;
|
||||
|
|
@ -875,34 +761,40 @@ p.customize-section-description {
|
|||
100% { color: #d4b146; }
|
||||
}
|
||||
|
||||
/* Header control: actions and choices */
|
||||
|
||||
#customize-control-header_image .actions {
|
||||
.customize-control-upload .actions,
|
||||
.customize-control-image .actions,
|
||||
.customize-control-header .actions {
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .choice {
|
||||
.customize-control-header .choice {
|
||||
position: relative;
|
||||
display: block;
|
||||
margin-bottom: 9px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .uploaded div:last-child > .choice {
|
||||
.customize-control-header .uploaded div:last-child > .choice {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
#customize-control-header_image img {
|
||||
.customize-control-upload img,
|
||||
.customize-control-image img,
|
||||
.customize-control-header img {
|
||||
width: 100%;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .remove {
|
||||
.customize-control-upload .remove-button
|
||||
.customize-control-image .remove-button
|
||||
.customize-control-header .remove {
|
||||
float: right;
|
||||
margin-left: 3px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .new {
|
||||
.customize-control-upload .upload-button,
|
||||
.customize-control-image .upload-button,
|
||||
.customize-control-header .new {
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -420,32 +420,18 @@ p.customize-section-description {
|
|||
|
||||
.customize-control .attachment-thumb.type-icon {
|
||||
float: left;
|
||||
margin-right: 12px;
|
||||
margin: 10px;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.customize-control .attachment-title {
|
||||
font-weight: bold;
|
||||
margin: 0 0 12px 0;
|
||||
margin: 0;
|
||||
padding: 5px 10px;
|
||||
}
|
||||
|
||||
.customize-control .remove-button {
|
||||
margin-left: 8px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.customize-control .thumbnail-audio .attachment-title,
|
||||
.customize-control .thumbnail.thumbnail-audio,
|
||||
.customize-control .thumbnail.thumbnail-video,
|
||||
.customize-control .thumbnail.thumbnail-image {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.customize-control .placeholder-text {
|
||||
font-size: 18px;
|
||||
font-weight: 300;
|
||||
text-align: center;
|
||||
color: #aaa;
|
||||
cursor: default;
|
||||
.customize-control .thumbnail-image {
|
||||
line-height: 0;
|
||||
}
|
||||
|
||||
.customize-control .thumbnail-image img {
|
||||
|
|
@ -563,129 +549,6 @@ p.customize-section-description {
|
|||
border-color: rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
|
||||
/*
|
||||
* Image Picker
|
||||
*/
|
||||
.customize-control-image .library,
|
||||
.customize-control-image .actions {
|
||||
display: none;
|
||||
float: left;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.customize-control-image.open .library,
|
||||
.customize-control-image.open .actions {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .dropdown-content {
|
||||
height: auto;
|
||||
min-height: 24px;
|
||||
min-width: 40px;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .dropdown-status {
|
||||
padding: 4px 5px;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .preview-thumbnail img {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 122px;
|
||||
max-height: 98px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .actions {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library ul {
|
||||
border-bottom: 1px solid #ddd;
|
||||
float: left;
|
||||
width: 100%;
|
||||
margin: 10px 0 0;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library li {
|
||||
color: #ccc;
|
||||
float: left;
|
||||
padding: 3px 15px;
|
||||
margin: 0;
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library li.library-selected {
|
||||
margin-bottom: -1px;
|
||||
padding-bottom: 4px;
|
||||
color: #666666;
|
||||
border-color: #ddd;
|
||||
border-bottom-color: #fff;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library .thumbnail {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library .thumbnail img {
|
||||
display: block;
|
||||
max-width: 90%;
|
||||
max-height: 80px;
|
||||
margin: 5px auto;
|
||||
padding: 2px;
|
||||
background: #666666;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library .thumbnail:hover img {
|
||||
background-color: #2ea2cc;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library-content {
|
||||
display: none;
|
||||
width: 100%;
|
||||
float: left;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-image .library-content.library-selected {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .upload-fallback,
|
||||
.accordion-section .customize-control-image .upload-fallback {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .upload-dropzone,
|
||||
.accordion-section .customize-control-image .upload-dropzone {
|
||||
display: none;
|
||||
padding: 15px 10px;
|
||||
border: 3px dashed #dfdfdf;
|
||||
margin: 5px auto;
|
||||
text-align: center;
|
||||
position: relative;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop,
|
||||
.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop {
|
||||
display: block;
|
||||
-webkit-transition: border-color 0.1s;
|
||||
transition: border-color 0.1s;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .library ul li,
|
||||
.accordion-section .customize-control-image .library ul li {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over,
|
||||
.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over {
|
||||
border-color: #83b4d8;
|
||||
}
|
||||
|
||||
/**
|
||||
* iOS can't scroll iframes,
|
||||
* instead it expands the iframe size to match the size of the content
|
||||
|
|
@ -704,16 +567,18 @@ p.customize-section-description {
|
|||
|
||||
/** Header control **/
|
||||
|
||||
#customize-control-header_image .current {
|
||||
.customize-control-upload .current,
|
||||
.customize-control-image .current,
|
||||
.customize-control-header .current {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .uploaded {
|
||||
.customize-control-header .uploaded {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .uploaded button:not(.random),
|
||||
#customize-control-header_image .default button:not(.random) {
|
||||
.customize-control-header .uploaded button:not(.random),
|
||||
.customize-control-header .default button:not(.random) {
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
|
@ -723,21 +588,24 @@ p.customize-section-description {
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
#customize-control-header_image button img {
|
||||
.customize-control-header button img {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#customize-control-header_image button.new,
|
||||
#customize-control-header_image button.remove {
|
||||
.customize-control-upload .remove-button,
|
||||
.customize-control-upload .upload-button,
|
||||
.customize-control-image .remove-button,
|
||||
.customize-control-image .upload-button,
|
||||
.customize-control-header button.new,
|
||||
.customize-control-header button.remove {
|
||||
white-space: normal;
|
||||
width: 48%;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
|
||||
/* Header control: current image container */
|
||||
|
||||
#customize-control-header_image .current .container {
|
||||
.customize-control-upload .current .container,
|
||||
.customize-control-image .current .container,
|
||||
.customize-control-header .current .container {
|
||||
overflow: hidden;
|
||||
-webkit-border-radius: 2px;
|
||||
border: 1px solid #eee;
|
||||
|
|
@ -745,14 +613,23 @@ p.customize-section-description {
|
|||
border-radius: 2px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .placeholder {
|
||||
.customize-control-upload .current .container,
|
||||
.customize-control-image .current .container {
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.customize-control-upload .placeholder,
|
||||
.customize-control-image .placeholder,
|
||||
.customize-control-header .placeholder {
|
||||
width: 100%;
|
||||
position: relative;
|
||||
text-align: center;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
#customize-control-header_image .inner {
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner,
|
||||
.customize-control-header .inner {
|
||||
display: none;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
|
|
@ -762,31 +639,40 @@ p.customize-section-description {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
#customize-control-header_image .inner,
|
||||
#customize-control-header_image .inner .dashicons {
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner {
|
||||
display: block;
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner,
|
||||
.customize-control-header .inner,
|
||||
.customize-control-header .inner .dashicons {
|
||||
line-height: 20px;
|
||||
top: 10px;
|
||||
}
|
||||
#customize-control-header_image .list .inner,
|
||||
#customize-control-header_image .list .inner .dashicons {
|
||||
|
||||
.customize-control-header .list .inner,
|
||||
.customize-control-header .list .inner .dashicons {
|
||||
top: 9px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .header-view {
|
||||
.customize-control-header .header-view {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .header-view:last-child {
|
||||
.customize-control-header .header-view:last-child {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
/* Convoluted, but 'outline' support isn't good enough yet */
|
||||
#customize-control-header_image .header-view:after {
|
||||
.customize-control-header .header-view:after {
|
||||
border: 0;
|
||||
}
|
||||
#customize-control-header_image .header-view.selected:after {
|
||||
.customize-control-header .header-view.selected:after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
height: auto;
|
||||
|
|
@ -795,13 +681,13 @@ p.customize-section-description {
|
|||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
#customize-control-header_image .header-view.button.selected {
|
||||
.customize-control-header .header-view.button.selected {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
/* Header control: overlay "close" button */
|
||||
|
||||
#customize-control-header_image .uploaded .header-view .close {
|
||||
.customize-control-header .uploaded .header-view .close {
|
||||
font-size: 2em;
|
||||
color: grey;
|
||||
position: absolute;
|
||||
|
|
@ -814,7 +700,7 @@ p.customize-section-description {
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
#customize-control-header_image .uploaded .header-view .close:hover {
|
||||
.customize-control-header .uploaded .header-view .close:hover {
|
||||
color: black;
|
||||
text-shadow:
|
||||
-1px -1px 0 #fff,
|
||||
|
|
@ -823,32 +709,32 @@ p.customize-section-description {
|
|||
1px 1px 0 #fff;
|
||||
}
|
||||
|
||||
#customize-control-header_image .header-view:hover .close {
|
||||
.customize-control-header .header-view:hover .close {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
/* Header control: randomiz(s)er */
|
||||
|
||||
#customize-control-header_image .random.placeholder {
|
||||
.customize-control-header .random.placeholder {
|
||||
cursor: pointer;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
#customize-control-header_image button.random {
|
||||
.customize-control-header button.random {
|
||||
width: 100%;
|
||||
height: auto;
|
||||
min-height: 40px;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
#customize-control-header_image button.random .dice {
|
||||
.customize-control-header button.random .dice {
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .placeholder:hover .dice,
|
||||
#customize-control-header_image .header-view:hover > button.random .dice {
|
||||
.customize-control-header .placeholder:hover .dice,
|
||||
.customize-control-header .header-view:hover > button.random .dice {
|
||||
-webkit-animation: dice-color-change 3s infinite;
|
||||
-ms-animation: dice-color-change 3s infinite;
|
||||
animation: dice-color-change 3s infinite;
|
||||
|
|
@ -875,34 +761,40 @@ p.customize-section-description {
|
|||
100% { color: #d4b146; }
|
||||
}
|
||||
|
||||
/* Header control: actions and choices */
|
||||
|
||||
#customize-control-header_image .actions {
|
||||
.customize-control-upload .actions,
|
||||
.customize-control-image .actions,
|
||||
.customize-control-header .actions {
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .choice {
|
||||
.customize-control-header .choice {
|
||||
position: relative;
|
||||
display: block;
|
||||
margin-bottom: 9px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .uploaded div:last-child > .choice {
|
||||
.customize-control-header .uploaded div:last-child > .choice {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
#customize-control-header_image img {
|
||||
.customize-control-upload img,
|
||||
.customize-control-image img,
|
||||
.customize-control-header img {
|
||||
width: 100%;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .remove {
|
||||
.customize-control-upload .remove-button
|
||||
.customize-control-image .remove-button
|
||||
.customize-control-header .remove {
|
||||
float: left;
|
||||
margin-right: 3px;
|
||||
}
|
||||
|
||||
#customize-control-header_image .new {
|
||||
.customize-control-upload .upload-button,
|
||||
.customize-control-image .upload-button,
|
||||
.customize-control-header .new {
|
||||
float: right;
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1008,7 +1008,7 @@
|
|||
* Reset the setting to the default value.
|
||||
*/
|
||||
restoreDefault: function( event ) {
|
||||
if ( event.type === 'keydown' && 13 !== event.which ) { // enter
|
||||
if ( event.type === 'keydown' && 13 !== event.which ) { // enter
|
||||
return;
|
||||
}
|
||||
event.preventDefault();
|
||||
|
|
@ -1023,7 +1023,7 @@
|
|||
* @param {object} event jQuery Event object
|
||||
*/
|
||||
removeFile: function( event ) {
|
||||
if ( event.type === 'keydown' && 13 !== event.which ) { // enter
|
||||
if ( event.type === 'keydown' && 13 !== event.which ) { // enter
|
||||
return;
|
||||
}
|
||||
event.preventDefault();
|
||||
|
|
@ -1075,17 +1075,17 @@
|
|||
|
||||
new api.HeaderTool.CurrentView({
|
||||
model: api.HeaderTool.currentHeader,
|
||||
el: '.current .container'
|
||||
el: '#customize-control-header_image .current .container'
|
||||
});
|
||||
|
||||
new api.HeaderTool.ChoiceListView({
|
||||
collection: api.HeaderTool.UploadsList = new api.HeaderTool.ChoiceList(),
|
||||
el: '.choices .uploaded .list'
|
||||
el: '#customize-control-header_image .choices .uploaded .list'
|
||||
});
|
||||
|
||||
new api.HeaderTool.ChoiceListView({
|
||||
collection: api.HeaderTool.DefaultsList = new api.HeaderTool.DefaultsList(),
|
||||
el: '.choices .default .list'
|
||||
el: '#customize-control-header_image .choices .default .list'
|
||||
});
|
||||
|
||||
api.HeaderTool.combinedList = api.HeaderTool.CombinedList = new api.HeaderTool.CombinedList([
|
||||
|
|
@ -2098,11 +2098,6 @@
|
|||
event.preventDefault();
|
||||
});
|
||||
|
||||
$('.upload-dropzone a.upload').keydown( function( event ) {
|
||||
if ( 13 === event.which ) // enter
|
||||
this.click();
|
||||
});
|
||||
|
||||
$('.collapse-sidebar').on( 'click keydown', function( event ) {
|
||||
if ( isKeydownButNotEnterEvent( event ) ) {
|
||||
return;
|
||||
|
|
@ -2115,7 +2110,7 @@
|
|||
// Bind site title display to the corresponding field.
|
||||
if ( title.length ) {
|
||||
$( '#customize-control-blogname input' ).on( 'input', function() {
|
||||
title.text( this.value );
|
||||
title.text( this.value );
|
||||
} );
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -747,58 +747,50 @@ class WP_Customize_Upload_Control extends WP_Customize_Control {
|
|||
}
|
||||
|
||||
if ( data.attachment && data.attachment.id ) { #>
|
||||
<div class="attachment-media-view {{ data.attachment.orientation }}">
|
||||
<div class="thumbnail thumbnail-{{ data.attachment.type }}">
|
||||
<# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
|
||||
<img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" />
|
||||
<# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
|
||||
<img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" />
|
||||
<# } else if ( -1 === jQuery.inArray( data.attachment.type, [ 'audio', 'video' ] ) ) { #>
|
||||
<img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" />
|
||||
<p class="attachment-title">{{ data.attachment.title }}</p>
|
||||
<# } #>
|
||||
|
||||
<# if ( 'audio' === data.attachment.type ) { #>
|
||||
<div class="wp-media-wrapper">
|
||||
<p class="attachment-title">{{ data.attachment.title }}</p>
|
||||
<audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
|
||||
<source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
|
||||
</audio>
|
||||
</div>
|
||||
<# } else if ( 'video' === data.attachment.type ) {
|
||||
var w_rule = h_rule = '';
|
||||
if ( data.attachment.width ) {
|
||||
w_rule = 'width: ' + data.attachment.width + 'px;';
|
||||
} else if ( wp.media.view.settings.contentWidth ) {
|
||||
w_rule = 'width: ' + wp.media.view.settings.contentWidth + 'px;';
|
||||
}
|
||||
if ( data.attachment.height ) {
|
||||
h_rule = 'height: ' + data.attachment.height + 'px;';
|
||||
}
|
||||
#>
|
||||
<div style="{{ w_rule }}{{ h_rule }}" class="wp-media-wrapper wp-video">
|
||||
<video controls="controls" class="wp-video-shortcode" preload="metadata"
|
||||
<# if ( data.attachment.width ) { #>width="{{ data.attachment.width }}"<# } #>
|
||||
<# if ( data.attachment.height ) { #>height="{{ data.attachment.height }}"<# } #>
|
||||
<# if ( data.attachment.image && data.attachment.image.src !== data.attachment.icon ) { #>poster="{{ data.attachment.image.src }}"<# } #>>
|
||||
<source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
|
||||
</video>
|
||||
<div class="current">
|
||||
<div class="container">
|
||||
<div class="attachment-media-view {{ data.attachment.orientation }}">
|
||||
<div class="thumbnail thumbnail-{{ data.attachment.type }}">
|
||||
<# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
|
||||
<img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" />
|
||||
<# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
|
||||
<img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" />
|
||||
<# } else { #>
|
||||
<img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" />
|
||||
<p class="attachment-title">{{ data.attachment.title }}</p>
|
||||
<# } #>
|
||||
</div>
|
||||
<# } #>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<a class="button upload-button" id="{{ data.settings.default }}-button" href="#"><?php echo $this->button_labels['change']; ?></a>
|
||||
<# if ( data.defaultAttachment && data.defaultAttachment.id !== data.attachment.id ) { #>
|
||||
<a class="default-button remove-button" href="#"><?php echo $this->button_labels['default']; ?></a>
|
||||
<# } else { #>
|
||||
<a class="remove-button" href="#"><?php echo $this->button_labels['remove']; ?></a>
|
||||
<# } #>
|
||||
<div class="actions">
|
||||
<# if ( data.defaultAttachment && data.defaultAttachment.id !== data.attachment.id ) { #>
|
||||
<button type="button" class="button default-button remove-button"><?php echo $this->button_labels['default']; ?></button>
|
||||
<# } else if ( ! data.defaultAttachment ) { #>
|
||||
<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
|
||||
<# } #>
|
||||
<button type="button" class="button upload-button" id="{{ data.settings.default }}-button"><?php echo $this->button_labels['change']; ?></button>
|
||||
<div style="clear:both"></div>
|
||||
</div>
|
||||
<# } else { #>
|
||||
<p class="placeholder-text"><?php echo $this->button_labels['placeholder']; ?></p>
|
||||
<a class="button upload-button" id="{{ data.settings.default }}-button" href="#"><?php echo $this->button_labels['select']; ?></a>
|
||||
<# if ( data.defaultAttachment ) { #>
|
||||
<a class="default-button remove-button" href="#"><?php echo $this->button_labels['default']; ?></a>
|
||||
<# } #>
|
||||
<div class="current">
|
||||
<div class="container">
|
||||
<div class="placeholder">
|
||||
<div class="inner">
|
||||
<span>
|
||||
<?php echo $this->button_labels['placeholder']; ?>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<# if ( data.defaultAttachment ) { #>
|
||||
<button type="button" class="button default-button remove-button"><?php echo $this->button_labels['default']; ?></button>
|
||||
<# } #>
|
||||
<button type="button" class="button upload-button" id="{{ data.settings.default }}-button"><?php echo $this->button_labels['select']; ?></button>
|
||||
<div style="clear:both"></div>
|
||||
</div>
|
||||
<# } #>
|
||||
<?php
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.1-beta2-30711';
|
||||
$wp_version = '4.1-beta2-30712';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
|
|||
Loading…
Reference in New Issue