upgrades core to 8.4.2
This commit is contained in:
@@ -46,8 +46,8 @@ regions:
|
||||
footer_fourth: 'Footer fourth'
|
||||
footer_fifth: 'Footer fifth'
|
||||
|
||||
# Information added by Drupal.org packaging script on 2017-08-16
|
||||
version: '8.3.7'
|
||||
# Information added by Drupal.org packaging script on 2017-11-03
|
||||
version: '8.4.2'
|
||||
core: '8.x'
|
||||
project: 'drupal'
|
||||
datestamp: 1502903957
|
||||
datestamp: 1509719929
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
}
|
||||
[dir="rtl"] .color-preview-sidebar,
|
||||
[dir="rtl"] .color-preview-content {
|
||||
float: right;
|
||||
float: right;
|
||||
}
|
||||
.color-preview-sidebar {
|
||||
margin-left: 15px; /* LTR */
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
/**
|
||||
* @file
|
||||
* Preview for the Bartik theme.
|
||||
*/
|
||||
(function ($, Drupal, drupalSettings) {
|
||||
Drupal.color = {
|
||||
logoChanged: false,
|
||||
callback(context, settings, $form) {
|
||||
// Change the logo to be the real one.
|
||||
if (!this.logoChanged) {
|
||||
$('.color-preview .color-preview-logo img').attr('src', drupalSettings.color.logo);
|
||||
this.logoChanged = true;
|
||||
}
|
||||
// Remove the logo if the setting is toggled off.
|
||||
if (drupalSettings.color.logo === null) {
|
||||
$('div').remove('.color-preview-logo');
|
||||
}
|
||||
|
||||
const $colorPreview = $form.find('.color-preview');
|
||||
const $colorPalette = $form.find('.js-color-palette');
|
||||
|
||||
// Solid background.
|
||||
$colorPreview.css('backgroundColor', $colorPalette.find('input[name="palette[bg]"]').val());
|
||||
|
||||
// Text preview.
|
||||
$colorPreview.find('.color-preview-main h2, .color-preview .preview-content').css('color', $colorPalette.find('input[name="palette[text]"]').val());
|
||||
$colorPreview.find('.color-preview-content a').css('color', $colorPalette.find('input[name="palette[link]"]').val());
|
||||
|
||||
// Sidebar block.
|
||||
const $colorPreviewBlock = $colorPreview.find('.color-preview-sidebar .color-preview-block');
|
||||
$colorPreviewBlock.css('background-color', $colorPalette.find('input[name="palette[sidebar]"]').val());
|
||||
$colorPreviewBlock.css('border-color', $colorPalette.find('input[name="palette[sidebarborders]"]').val());
|
||||
|
||||
// Footer wrapper background.
|
||||
$colorPreview.find('.color-preview-footer-wrapper').css('background-color', $colorPalette.find('input[name="palette[footer]"]').val());
|
||||
|
||||
// CSS3 Gradients.
|
||||
const gradient_start = $colorPalette.find('input[name="palette[top]"]').val();
|
||||
const gradient_end = $colorPalette.find('input[name="palette[bottom]"]').val();
|
||||
|
||||
$colorPreview.find('.color-preview-header').attr('style', `background-color: ${gradient_start}; background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(${gradient_start}), to(${gradient_end})); background-image: -moz-linear-gradient(-90deg, ${gradient_start}, ${gradient_end});`);
|
||||
|
||||
$colorPreview.find('.color-preview-site-name').css('color', $colorPalette.find('input[name="palette[titleslogan]"]').val());
|
||||
},
|
||||
};
|
||||
}(jQuery, Drupal, drupalSettings));
|
||||
@@ -1,20 +1,19 @@
|
||||
/**
|
||||
* @file
|
||||
* Preview for the Bartik theme.
|
||||
*/
|
||||
* DO NOT EDIT THIS FILE.
|
||||
* See the following change record for more information,
|
||||
* https://www.drupal.org/node/2815083
|
||||
* @preserve
|
||||
**/
|
||||
|
||||
(function ($, Drupal, drupalSettings) {
|
||||
|
||||
'use strict';
|
||||
|
||||
Drupal.color = {
|
||||
logoChanged: false,
|
||||
callback: function (context, settings, $form) {
|
||||
// Change the logo to be the real one.
|
||||
callback: function callback(context, settings, $form) {
|
||||
if (!this.logoChanged) {
|
||||
$('.color-preview .color-preview-logo img').attr('src', drupalSettings.color.logo);
|
||||
this.logoChanged = true;
|
||||
}
|
||||
// Remove the logo if the setting is toggled off.
|
||||
|
||||
if (drupalSettings.color.logo === null) {
|
||||
$('div').remove('.color-preview-logo');
|
||||
}
|
||||
@@ -22,22 +21,17 @@
|
||||
var $colorPreview = $form.find('.color-preview');
|
||||
var $colorPalette = $form.find('.js-color-palette');
|
||||
|
||||
// Solid background.
|
||||
$colorPreview.css('backgroundColor', $colorPalette.find('input[name="palette[bg]"]').val());
|
||||
|
||||
// Text preview.
|
||||
$colorPreview.find('.color-preview-main h2, .color-preview .preview-content').css('color', $colorPalette.find('input[name="palette[text]"]').val());
|
||||
$colorPreview.find('.color-preview-content a').css('color', $colorPalette.find('input[name="palette[link]"]').val());
|
||||
|
||||
// Sidebar block.
|
||||
var $colorPreviewBlock = $colorPreview.find('.color-preview-sidebar .color-preview-block');
|
||||
$colorPreviewBlock.css('background-color', $colorPalette.find('input[name="palette[sidebar]"]').val());
|
||||
$colorPreviewBlock.css('border-color', $colorPalette.find('input[name="palette[sidebarborders]"]').val());
|
||||
|
||||
// Footer wrapper background.
|
||||
$colorPreview.find('.color-preview-footer-wrapper').css('background-color', $colorPalette.find('input[name="palette[footer]"]').val());
|
||||
|
||||
// CSS3 Gradients.
|
||||
var gradient_start = $colorPalette.find('input[name="palette[top]"]').val();
|
||||
var gradient_end = $colorPalette.find('input[name="palette[bottom]"]').val();
|
||||
|
||||
@@ -46,4 +40,4 @@
|
||||
$colorPreview.find('.color-preview-site-name').css('color', $colorPalette.find('input[name="palette[titleslogan]"]').val());
|
||||
}
|
||||
};
|
||||
})(jQuery, Drupal, drupalSettings);
|
||||
})(jQuery, Drupal, drupalSettings);
|
||||
@@ -132,7 +132,8 @@ img {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
ul, ol {
|
||||
ul,
|
||||
ol {
|
||||
margin: 0;
|
||||
padding: 0 0 0.25em 1em; /* LTR */
|
||||
}
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 0.733em;
|
||||
line-height: 1.2;
|
||||
|
||||
}
|
||||
.comment__permalink {
|
||||
font-size: 0.733em;
|
||||
|
||||
@@ -172,6 +172,14 @@ input.form-submit:focus {
|
||||
.node-form .form-wrapper {
|
||||
margin-bottom: 2em;
|
||||
}
|
||||
.node-form .node-form-footer,
|
||||
.node-form .field--name-status {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.node-form .form-actions {
|
||||
padding-top: 0;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* Contact Form */
|
||||
.contact-form #edit-name {
|
||||
@@ -316,7 +324,9 @@ input.form-submit:focus {
|
||||
-moz-box-sizing: border-box;
|
||||
}
|
||||
|
||||
.js .dropbutton .dropbutton-action > input, .js .dropbutton .dropbutton-action > a, .js .dropbutton .dropbutton-action > button {
|
||||
.js .dropbutton .dropbutton-action > input,
|
||||
.js .dropbutton .dropbutton-action > a,
|
||||
.js .dropbutton .dropbutton-action > button {
|
||||
text-align: center;
|
||||
padding-left: 3em;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
}
|
||||
.region-header .site-branding {
|
||||
float: left; /* LTR */
|
||||
/* margin-bottom: 1.857em;*/
|
||||
/* margin-bottom: 1.857em; */
|
||||
}
|
||||
[dir="rtl"] .region-header .site-branding {
|
||||
float: right;
|
||||
|
||||
@@ -49,7 +49,7 @@ body.maintenance-page {
|
||||
.maintenance-page .site-branding-text a:focus {
|
||||
color: #777;
|
||||
}
|
||||
.maintenance-page .page-title {
|
||||
.maintenance-page .page-title {
|
||||
line-height: 1em;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user