diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-01-26 19:24:01 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-01-27 00:41:20 +0000 |
| commit | 8383fcabb598df319ed8a1a13964633fe16ba6c8 (patch) | |
| tree | f946bdca32ad9e5a2d67cf6e4ba52752021713e8 /src/inkscape.cpp | |
| parent | Add desktop function to know we are on dark theme (diff) | |
| download | inkscape-8383fcabb598df319ed8a1a13964633fe16ba6c8.tar.gz inkscape-8383fcabb598df319ed8a1a13964633fe16ba6c8.zip | |
Remove not rebased parts
Diffstat (limited to 'src/inkscape.cpp')
| -rw-r--r-- | src/inkscape.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index d6a0b8aff..fd185649a 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -386,7 +386,6 @@ Application::add_gtk_css() int colorset_inverse = colorset ^ 0xffffff00; sp_svg_write_color(colornamed_inverse, sizeof(colornamed_inverse), colorset_inverse); if (prefs->getBool("/theme/symbolicIcons", false)) { -<<<<<<< HEAD int colorset = prefs->getInt("/theme/symbolicColor", 0x000000ff); gchar colornamed[64]; sp_svg_write_color(colornamed, sizeof(colornamed), colorset); @@ -409,12 +408,6 @@ Application::add_gtk_css() css_str += ";}"; css_str += "#iconregular{ -gtk-icon-style: regular;}"; } -======= - css_str += "*{ -gtk-icon-style: symbolic;}"; - css_str += "image{ color:"; - css_str += colornamed; - css_str += ";}"; ->>>>>>> Adding styling refactoring, moving after to other branch the CSS part } else { css_str += "*{-gtk-icon-style: regular;}"; } |