Commit 8be648df authored by Dries's avatar Dries
Browse files

Merge branch '8.x' of git.drupal.org:project/drupal into 8.x

parents 8bcecca1 b787545f
......@@ -1104,7 +1104,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
$table[$name]['settings_edit'] = $base_button + array(
'#type' => 'image_button',
'#name' => $name . '_formatter_settings_edit',
'#src' => 'core/misc/configure.png',
'#src' => 'core/misc/configure-dark.png',
'#attributes' => array('class' => array('field-formatter-settings-edit'), 'alt' => t('Edit')),
'#op' => 'edit',
// Do not check errors for the 'Edit' button, but make sure we get
......
......@@ -710,7 +710,7 @@ function file_get_content_headers(File $file) {
}
return array(
'Content-Type' => $type . '; name="' . $name . '"',
'Content-Type' => $type,
'Content-Length' => $file->filesize,
'Content-Disposition' => $disposition . '; filename="' . $name . '"',
'Cache-Control' => 'private',
......
......@@ -77,7 +77,7 @@ function _testImageFieldFormatters($scheme) {
if ($scheme == 'private') {
// Only verify HTTP headers when using private scheme and the headers are
// sent by Drupal.
$this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png; name="' . $test_image->filename . '"', t('Content-Type header was sent.'));
$this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', t('Content-Type header was sent.'));
$this->assertEqual($this->drupalGetHeader('Content-Disposition'), 'inline; filename="' . $test_image->filename . '"', t('Content-Disposition header was sent.'));
$this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'),'private') !== FALSE, t('Cache-Control header was sent.'));
......
core/themes/seven/images/buttons.png

786 Bytes | W: | H:

core/themes/seven/images/buttons.png

503 Bytes | W: | H:

core/themes/seven/images/buttons.png
core/themes/seven/images/buttons.png
core/themes/seven/images/buttons.png
core/themes/seven/images/buttons.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -361,10 +361,22 @@
background: url(images/buttons.png) 0 0 repeat-x;
border-radius: 20px;
}
.ui-dialog .ui-dialog-buttonpane button:hover,
.ui-dialog .ui-dialog-buttonpane button:focus {
background-position: 0 -40px;
border: 1px solid #bebebe;
border-left-color: #afafaf;
border-right-color: #afafaf;
border-bottom-color: #9b9b9b;
color: #2e2e2e;
}
.ui-dialog .ui-dialog-buttonpane button:active {
background: #666;
background-position: 0 -80px;
border: 1px solid #333;
border-left-color: #222;
border-right-color: #222;
border-bottom-color: #111;
color: #fff;
border-color: #555;
text-shadow: #222 0px -1px 0px;
}
.overlay {
......
......@@ -621,21 +621,26 @@ a.button:visited,
a.button:hover,
a.button:active {
text-decoration: none;
color: #5a5a5a;
}
.node-form input#edit-submit,
.node-form input#edit-submit-1 {
border: 1px solid #8eB7cd;
border-left-color: #8eB7cd;
border-right-color: #8eB7cd;
border-bottom-color: #7691a2;
background: url(images/buttons.png) 0 -40px repeat-x;
color: #133B54;
}
input.form-submit:active {
background: #666;
input.form-submit:hover,
input.form-submit:focus,
a.button:hover,
a.button:focus {
background-position: 0 -40px;
border: 1px solid #bebebe;
border-left-color: #afafaf;
border-right-color: #afafaf;
border-bottom-color: #9b9b9b;
color: #2e2e2e;
}
input.form-submit:active,
a.button:active {
background-position: 0 -80px;
border: 1px solid #333;
border-left-color: #222;
border-right-color: #222;
border-bottom-color: #111;
color: #fff;
border-color: #555;
text-shadow: #222 0 -1px 0;
}
input.form-button-disabled,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment