Fix installation and distribution of stylesheet data
Install and distribute gnome-shell.css and theme images. They are moved down from $datadir to $datadir/theme to avoid a weirdness where we have images in $datadir and then also in $datadir/images. (Also moved in the source tree to avoid adding another difference between installed and uninstalled operation.)
@ -12,9 +12,8 @@ gnome-shell.desktop.in: gnome-shell.desktop.in.in
|
|||||||
gnome-shell.desktop: gnome-shell.desktop.in
|
gnome-shell.desktop: gnome-shell.desktop.in
|
||||||
$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
|
$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
|
||||||
|
|
||||||
imagedir = $(pkgdatadir)/images
|
imagesdir = $(pkgdatadir)/images
|
||||||
|
dist_images_DATA = \
|
||||||
dist_image_DATA = \
|
|
||||||
add-workspace.svg \
|
add-workspace.svg \
|
||||||
app-well-glow.png \
|
app-well-glow.png \
|
||||||
back.svg \
|
back.svg \
|
||||||
@ -24,6 +23,15 @@ dist_image_DATA = \
|
|||||||
magnifier.svg \
|
magnifier.svg \
|
||||||
remove-workspace.svg
|
remove-workspace.svg
|
||||||
|
|
||||||
|
themedir = $(pkgdatadir)/theme
|
||||||
|
dist_theme_DATA = \
|
||||||
|
theme/gnome-shell.css \
|
||||||
|
theme/scroll-button-down.png \
|
||||||
|
theme/scroll-button-down-hover.png \
|
||||||
|
theme/scroll-button-up.png \
|
||||||
|
theme/scroll-button-up-hover.png \
|
||||||
|
theme/scroll-vhandle.png
|
||||||
|
|
||||||
schemadir = @GCONF_SCHEMA_FILE_DIR@
|
schemadir = @GCONF_SCHEMA_FILE_DIR@
|
||||||
schema_DATA = gnome-shell.schemas
|
schema_DATA = gnome-shell.schemas
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 225 B |
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 225 B |
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 211 B |
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 211 B |
Before Width: | Height: | Size: 323 B After Width: | Height: | Size: 323 B |
@ -68,7 +68,7 @@ function start() {
|
|||||||
children[i].destroy();
|
children[i].destroy();
|
||||||
|
|
||||||
let style = Nbtk.Style.get_default();
|
let style = Nbtk.Style.get_default();
|
||||||
let stylesheetPath = global.datadir + "/gnome-shell.css";
|
let stylesheetPath = global.datadir + "/theme/gnome-shell.css";
|
||||||
style.load_from_file(stylesheetPath);
|
style.load_from_file(stylesheetPath);
|
||||||
|
|
||||||
global.connect('panel-run-dialog', function(panel) {
|
global.connect('panel-run-dialog', function(panel) {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
@import "../../data/gnome-shell.css";
|
@import "../../data/theme/gnome-shell.css";
|
||||||
|
|
||||||
*.red {
|
*.red {
|
||||||
background-color: red;
|
background-color: red;
|
||||||
|