Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
220
Merge Requests
220
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
e93b6852
Commit
e93b6852
authored
Mar 04, 2014
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2202671
by Mark Carver, tim.plunkett: Rename CSS_SKIN constant to CSS_THEME.
parent
2c9c01bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
core/includes/common.inc
core/includes/common.inc
+6
-6
core/modules/edit/edit.module
core/modules/edit/edit.module
+1
-1
No files found.
core/includes/common.inc
View file @
e93b6852
...
...
@@ -97,7 +97,7 @@
const
CSS_LAYOUT
=
-
100
;
/**
* The default weight for CSS rules that style design components (and their associated states and
skin
s.)
* The default weight for CSS rules that style design components (and their associated states and
theme
s.)
*/
const
CSS_COMPONENT
=
0
;
...
...
@@ -107,9 +107,9 @@
const
CSS_STATE
=
100
;
/**
* The default weight for CSS rules that style
skin
s and are not included with components.
* The default weight for CSS rules that style
theme
s and are not included with components.
*/
const
CSS_
SKIN
=
200
;
const
CSS_
THEME
=
200
;
/**
* The default group for JavaScript settings added to the page.
...
...
@@ -1457,9 +1457,9 @@ function drupal_add_html_head_link($attributes, $header = FALSE) {
* - CSS_BASE: Styles for HTML elements ("base" styles).
* - CSS_LAYOUT: Styles that layout a page.
* - CSS_COMPONENT: Styles for design components (and their associated
* states and
skin
s.)
* states and
theme
s.)
* - CSS_STATE: Styles for states that are not included with components.
* - CSS_
SKIN: Styles for skin
s that are not included with components.
* - CSS_
THEME: Styles for theme
s that are not included with components.
* The weight numbers follow the SMACSS convention of CSS categorization.
* See http://drupal.org/node/1887922
* - 'media': The media type for the stylesheet, e.g., all, print, screen.
...
...
@@ -2808,7 +2808,7 @@ function drupal_get_library($extension, $name = NULL) {
$options
[
'weight'
]
=
0
;
}
// Apply the corresponding weight defined by CSS_* constants.
$options
[
'weight'
]
+=
constant
(
'CSS_'
.
strtoupper
(
$category
==
'theme'
?
'skin'
:
$category
));
$options
[
'weight'
]
+=
constant
(
'CSS_'
.
strtoupper
(
$category
));
$library
[
$type
][
$source
]
=
$options
;
}
unset
(
$library
[
$type
][
$category
]);
...
...
core/modules/edit/edit.module
View file @
e93b6852
...
...
@@ -88,7 +88,7 @@ function edit_library_alter(array &$library, $extension, $name, $theme = NULL) {
foreach
(
$info
[
'edit_stylesheets'
]
as
$path
)
{
$library
[
'css'
][
$theme_path
.
'/'
.
$path
]
=
array
(
'group'
=>
CSS_AGGREGATE_THEME
,
'weight'
=>
CSS_
SKIN
,
'weight'
=>
CSS_
THEME
,
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment