Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal-3421017
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
drupal-3421017
Commits
e93b6852
Commit
e93b6852
authored
11 years ago
by
Alex Pott
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#2202671
by Mark Carver, tim.plunkett: Rename CSS_SKIN constant to CSS_THEME.
parent
2c9c01bf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/includes/common.inc
+6
-6
6 additions, 6 deletions
core/includes/common.inc
core/modules/edit/edit.module
+1
-1
1 addition, 1 deletion
core/modules/edit/edit.module
with
7 additions
and
7 deletions
core/includes/common.inc
+
6
−
6
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
]);
...
...
This diff is collapsed.
Click to expand it.
core/modules/edit/edit.module
+
1
−
1
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
,
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment