summaryrefslogtreecommitdiffstats
path: root/share/ui
diff options
context:
space:
mode:
authorMichael Soegtrop <MSoegtrop@yahoo.de>2017-06-05 13:01:17 +0000
committerMichael Soegtrop <MSoegtrop@yahoo.de>2017-06-05 13:01:17 +0000
commite7248b2fa042f42a5c4dd14cd86ab6a5b4524059 (patch)
tree9097520c54e355ded9bd0b4d6618af4e8dacdd91 /share/ui
parentupdated to latest trunk (diff)
parent[Bug #1695016] Xaml export misses some radialGradients. (diff)
downloadinkscape-e7248b2fa042f42a5c4dd14cd86ab6a5b4524059.tar.gz
inkscape-e7248b2fa042f42a5c4dd14cd86ab6a5b4524059.zip
updated to latest trunk
(bzr r14876.2.4)
Diffstat (limited to 'share/ui')
-rw-r--r--share/ui/CMakeLists.txt2
-rw-r--r--share/ui/Makefile.am11
-rw-r--r--share/ui/style.css4
3 files changed, 1 insertions, 16 deletions
diff --git a/share/ui/CMakeLists.txt b/share/ui/CMakeLists.txt
index 5e9db74cf..8cd974ad3 100644
--- a/share/ui/CMakeLists.txt
+++ b/share/ui/CMakeLists.txt
@@ -1,3 +1,3 @@
file(GLOB _FILES "*.xml" "*.rc" "*.css")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/ui)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/ui)
diff --git a/share/ui/Makefile.am b/share/ui/Makefile.am
deleted file mode 100644
index 1e55ea58f..000000000
--- a/share/ui/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-uidir = $(datadir)/inkscape/ui
-
-ui_DATA = \
- keybindings.rc \
- menus-bars.xml \
- style.css \
- toolbox.xml \
- units.xml
-
-EXTRA_DIST = $(ui_DATA)
diff --git a/share/ui/style.css b/share/ui/style.css
index 6729344d2..f2883fda4 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -79,13 +79,9 @@ SPCanvas {
}
combobox window.popup scrolledwindow treeview separator {
- -GtkWidget-wide-separators: true;
- -GtkWidget-separator-height: 6;
}
#font_selector_family {
- -GtkWidget-wide-separators: true;
- -GtkWidget-separator-height: 6;
}
#TextFontFamilyAction_combobox {