Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Sun, 08 Oct 2023 14:33:09 UTC Commit: 9c49eceec823f042ffc93bea6e11e1e72d85df90 https://github.com/geany/geany/commit/9c49eceec823f042ffc93bea6e11e1e72d85df...
Log Message: ----------- Remove geany-3.0.css and geany-3.20.css
Since we require GTK 3.24, the css will be the same everywhere. The stuff from geany-3.20.css can be moved directly to geany.css.
Modified Paths: -------------- data/Makefile.am data/geany-3.0.css data/geany-3.20.css data/geany.css data/meson.build geany.nsi.in src/ui_utils.c
Modified: data/Makefile.am 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -126,8 +126,6 @@ nobase_dist_pkgdata_DATA = \ snippets.conf \ ui_toolbar.xml \ geany.glade \ - geany-3.0.css \ - geany-3.20.css \ geany.css
nobase_pkgdata_DATA = \
Modified: data/geany-3.0.css 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -1,8 +0,0 @@ -/* make close button on the editor's tabs smaller */ -#geany-close-tab-button { - -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 0; - -GtkButton-default-border: 0; - -GtkButton-default-outside-border: 0; - -GtkButton-inner-border: 0; -}
Modified: data/geany-3.20.css 9 lines changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -1,9 +0,0 @@ -/* make close button on the editor's tabs smaller */ -#geany-close-tab-button { - outline-offset: 0; - outline-width: 0; - margin: 0; - margin-left: 0.5em; - min-width: 0; - min-height: 0; -}
Modified: data/geany.css 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,12 @@
/* make close button on the editor's tabs smaller */ #geany-close-tab-button { + outline-offset: 0; + outline-width: 0; + margin: 0; + margin-left: 0.5em; + min-width: 0; + min-height: 0; padding: 0; } #geany-close-tab-button image {
Modified: data/meson.build 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -15,8 +15,6 @@ misc = [ 'snippets.conf', 'ui_toolbar.xml', 'geany.glade', - 'geany-3.0.css', - 'geany-3.20.css', 'geany.css', ] install_data(sources: misc, install_dir: cdata.get('GEANY_DATA_DIR'))
Modified: geany.nsi.in 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -154,7 +154,6 @@ Section "!Program Files" SEC01 File "${GEANY_RELEASE_DIR}\data\GPL-2" File "${GEANY_RELEASE_DIR}\data\filetype_extensions.conf" File "${GEANY_RELEASE_DIR}\data\geany.glade" - File "${GEANY_RELEASE_DIR}\data\geany-3.20.css" File "${GEANY_RELEASE_DIR}\data\geany.css" File "${GEANY_RELEASE_DIR}\data\snippets.conf" File "${GEANY_RELEASE_DIR}\data\ui_toolbar.xml"
Modified: src/ui_utils.c 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -2585,8 +2585,10 @@ static void init_css_styles(void) } css_files[] = { - { 20, G_MAXUINT, "geany-3.20.css" }, - { 0, 19, "geany-3.0.css" }, + /* Unused now but can be used to load css for different GTK versions, such as + * { 20, G_MAXUINT, "geany-3.20.css" }, + * { 0, 19, "geany-3.0.css" }, + */ };
guint gtk_version = gtk_get_minor_version();
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).