Commit 2432c021 authored by alexpott's avatar alexpott
Browse files

Issue #1987066 by Kevin Morse, JohnAlbin, rteijeiro, echoz, ry5n: Rename files...

Issue #1987066 by Kevin Morse, JohnAlbin, rteijeiro, echoz, ry5n: Rename files to match CSS file naming convention.
parent da63eafb
......@@ -3475,7 +3475,7 @@ function drupal_aggregate_js(&$js_groups) {
* @code
* $build['#attached'] = array(
* 'library' => array(array('taxonomy', 'taxonomy')),
* 'css' => array(drupal_get_path('module', 'taxonomy') . '/taxonomy.css'),
* 'css' => array(drupal_get_path('module', 'taxonomy') . '/css/taxonomy.module.css'),
* );
* @endcode
*
......
......@@ -95,10 +95,10 @@ function _drupal_maintenance_theme() {
// These are usually added from system_init() -except maintenance.css.
// When the database is inactive it's not called so we add it here.
$path = drupal_get_path('module', 'system');
drupal_add_css($path . '/system.base.css');
drupal_add_css($path . '/system.admin.css');
drupal_add_css($path . '/system.theme.css');
drupal_add_css($path . '/system.maintenance.css');
drupal_add_css($path . '/css/system.module.css');
drupal_add_css($path . '/css/system.theme.css');
drupal_add_css($path . '/css/system.admin.css');
drupal_add_css($path . '/css/system.maintenance.css');
}
/**
......
......@@ -16,7 +16,7 @@
function block_admin_demo($theme = NULL) {
return array(
'#attached' => array(
'css' => array(drupal_get_path('module', 'block') . '/block.admin.css'),
'css' => array(drupal_get_path('module', 'block') . '/css/block.admin.css'),
),
);
}
......@@ -86,4 +86,3 @@ function block_admin_edit(Block $entity) {
return entity_get_form($entity);
}
......@@ -106,7 +106,7 @@ public function getFormID() {
*/
public function buildForm(array $form, array &$form_state) {
$entities = $this->load();
$form['#attached']['css'][] = drupal_get_path('module', 'block') . '/block.admin.css';
$form['#attached']['css'][] = drupal_get_path('module', 'block') . '/css/block.admin.css';
$form['#attached']['library'][] = array('system', 'drupal.tableheader');
$form['#attached']['library'][] = array('block', 'drupal.block');
......
......@@ -322,7 +322,7 @@ function book_form_node_form_alter(&$form, &$form_state, $form_id) {
'#submit' => array('book_pick_book_nojs_submit'),
'#weight' => 20,
'#attached' => array(
'css' => array(drupal_get_path('module', 'book') . '/book.admin.css'),
'css' => array(drupal_get_path('module', 'book') . '/css/book.admin.css'),
),
);
}
......@@ -986,7 +986,7 @@ function template_preprocess_book_all_books_block(&$variables) {
* Properties used: bid, link_title, depth, plid, mlid.
*/
function template_preprocess_book_navigation(&$variables) {
drupal_add_css(drupal_get_path('module', 'book') . '/book.theme.css');
drupal_add_css(drupal_get_path('module', 'book') . '/css/book.theme.css');
$book_link = $variables['book_link'];
// Provide extra variables for themers. Not needed by default.
......
......@@ -194,7 +194,7 @@ function color_scheme_form($complete_form, &$form_state, $theme) {
),
// Add custom CSS.
'css' => array(
$base . '/color.admin.css' => array(),
$base . '/css/color.admin.css' => array(),
),
// Add custom JavaScript.
'js' => array(
......
......@@ -31,7 +31,7 @@
#palette .down,
#palette .up,
#palette .both {
background: url(images/hook-rtl.png) no-repeat 0 0;
background: url(../images/hook-rtl.png) no-repeat 0 0;
}
#palette .up {
background-position: 0 -27px;
......
......@@ -45,7 +45,7 @@
#palette .down,
#palette .up,
#palette .both {
background: url(images/hook.png) no-repeat 100% 0; /* LTR */
background: url(../images/hook.png) no-repeat 100% 0; /* LTR */
}
#palette .up {
background-position: 100% -27px; /* LTR */
......@@ -61,7 +61,7 @@
left: -10px; /* LTR */
width: 20px;
height: 25px;
background: url(images/lock.png) no-repeat 50% 2px;
background: url(../images/lock.png) no-repeat 50% 2px;
cursor: pointer;
}
#palette .unlocked {
......
......@@ -86,7 +86,7 @@ protected function alterBuild(array &$build, EntityInterface $comment, EntityDis
// Add indentation div or close open divs as needed.
if ($is_threaded) {
$build['#attached']['css'][] = drupal_get_path('module', 'comment') . '/comment.theme.css';
$build['#attached']['css'][] = drupal_get_path('module', 'comment') . '/css/comment.theme.css';
$prefix .= $comment->divs <= 0 ? str_repeat('</div>', abs($comment->divs)) : "\n" . '<div class="indented">';
}
......
......@@ -63,7 +63,7 @@ public function __construct(StorageInterface $target_storage, StorageInterface $
*/
public function diff($config_file) {
// Add the CSS for the inline diff.
$output['#attached']['css'][] = drupal_get_path('module', 'system') . '/system.diff.css';
$output['#attached']['css'][] = drupal_get_path('module', 'system') . '/css/system.diff.css';
$diff = config_diff($this->targetStorage, $this->sourceStorage, $config_file);
$formatter = new \DrupalDiffFormatter();
......
......@@ -112,8 +112,8 @@ function contextual_library_info() {
$path . '/contextual.js' => array('group' => JS_LIBRARY, 'weight' => -2),
),
'css' => array(
$path . '/contextual.base.css' => array(),
$path . '/contextual.theme.css' => array(),
$path . '/css/contextual.module.css' => array(),
$path . '/css/contextual.theme.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......@@ -133,7 +133,7 @@ function contextual_library_info() {
$path . '/contextual.toolbar.js' => array('group' => JS_LIBRARY, 'weight' => -1),
),
'css' => array(
$path . '/contextual.toolbar.css' => array(),
$path . '/css/contextual.toolbar.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......
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