From fbac00499cfaf235129c967c7220fb9748ae145e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 5 Jun 2022 22:08:18 +0300 Subject: [PATCH 36/36] Remove trailing spaces from client theme files See osdn #44681 Signed-off-by: Marko Lindqvist --- data/themes/gtk3.22/Freeciv/gtk-3.0/gtk.css | 4 ++-- .../themes/gtk3.22/Freeciv/gtk-3.0/menubar.css | 4 ++-- data/themes/gtk4/Freeciv/gtk-4.0/gtk.css | 4 ++-- data/themes/gtk4/Freeciv/gtk-4.0/menubar.css | 4 ++-- data/themes/gui-qt/Classic/resource.qss | 18 +++++++++--------- data/themes/gui-qt/Necrophos/resource.qss | 18 +++++++++--------- data/themes/gui-qt/NightStalker/resource.qss | 16 ++++++++-------- .../gui-sdl2/human/small_theme_buttons.tspec | 2 +- data/themes/gui-sdl2/human/theme.themespec | 10 +++++----- data/themes/gui-sdl2/human/theme_buttons.tspec | 4 ++-- .../gui-sdl2/human/theme_orders_buttons.tspec | 6 +++--- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/data/themes/gtk3.22/Freeciv/gtk-3.0/gtk.css b/data/themes/gtk3.22/Freeciv/gtk-3.0/gtk.css index 2b46c6de61..8e355611db 100644 --- a/data/themes/gtk3.22/Freeciv/gtk-3.0/gtk.css +++ b/data/themes/gtk3.22/Freeciv/gtk-3.0/gtk.css @@ -2,11 +2,11 @@ -GtkWidget-outline-style: auto; -GtkButton-margin: 1; -GtkButton-padding: 2; - + -GtkRange-margin: 1; -GtkRange-min-width: 15; -GtkRange-min-height: 15; - + -GtkScale-min-width: 11; -GtkScale-min-height: 21; diff --git a/data/themes/gtk3.22/Freeciv/gtk-3.0/menubar.css b/data/themes/gtk3.22/Freeciv/gtk-3.0/menubar.css index d1ed4fb314..c030d9a094 100644 --- a/data/themes/gtk3.22/Freeciv/gtk-3.0/menubar.css +++ b/data/themes/gtk3.22/Freeciv/gtk-3.0/menubar.css @@ -1,6 +1,6 @@ /* #################### MENUBAR ################### */ -.menubar, +.menubar, .menubar * { color : #000000; @@ -8,7 +8,7 @@ padding : 1px 2px; background-image : url("Menu-Menubar/menubar.png"); background-size: cover; - + border-width : 1px; } diff --git a/data/themes/gtk4/Freeciv/gtk-4.0/gtk.css b/data/themes/gtk4/Freeciv/gtk-4.0/gtk.css index 2b46c6de61..8e355611db 100644 --- a/data/themes/gtk4/Freeciv/gtk-4.0/gtk.css +++ b/data/themes/gtk4/Freeciv/gtk-4.0/gtk.css @@ -2,11 +2,11 @@ -GtkWidget-outline-style: auto; -GtkButton-margin: 1; -GtkButton-padding: 2; - + -GtkRange-margin: 1; -GtkRange-min-width: 15; -GtkRange-min-height: 15; - + -GtkScale-min-width: 11; -GtkScale-min-height: 21; diff --git a/data/themes/gtk4/Freeciv/gtk-4.0/menubar.css b/data/themes/gtk4/Freeciv/gtk-4.0/menubar.css index d1ed4fb314..c030d9a094 100644 --- a/data/themes/gtk4/Freeciv/gtk-4.0/menubar.css +++ b/data/themes/gtk4/Freeciv/gtk-4.0/menubar.css @@ -1,6 +1,6 @@ /* #################### MENUBAR ################### */ -.menubar, +.menubar, .menubar * { color : #000000; @@ -8,7 +8,7 @@ padding : 1px 2px; background-image : url("Menu-Menubar/menubar.png"); background-size: cover; - + border-width : 1px; } diff --git a/data/themes/gui-qt/Classic/resource.qss b/data/themes/gui-qt/Classic/resource.qss index be57c41e6d..eb253adb2d 100644 --- a/data/themes/gui-qt/Classic/resource.qss +++ b/data/themes/gui-qt/Classic/resource.qss @@ -31,7 +31,7 @@ qfc_dialog::title { background-color: #a1936e; } -close_widget +close_widget { background: #ddca97; } @@ -99,10 +99,10 @@ QLineEdit { background-color: #e7ddba; border: 1px solid #c3b48e; border-radius: 2px; - color: black; + color: black;5; } -QTabWidget { +QTabWidget { background: #efddb5; } @@ -183,11 +183,11 @@ QSplitter::handle:horizontal { width: 8px; } -QMenuBar { +QMenuBar { background-image:url(LittleFingerpattern.png); } -QMenuBar::item { +QMenuBar::item { spacing: 3px; padding: 1px 4px; color: black; @@ -195,7 +195,7 @@ QMenuBar::item { border-radius: none } -QMenuBar::item:selected { +QMenuBar::item:selected { color: black; background: #b6a785; } @@ -314,7 +314,7 @@ QTabBar::tab { QTabBar::tab:!selected { margin-top: 3px; -} +} QTabBar::tab:first { border-left: 1px solid #c3b48e; @@ -322,7 +322,7 @@ QTabBar::tab:first { border-bottom: 1px solid #c3b48e; border-right: 1px solid #c3b48e; border-top-right-radius: 15; - border-top-left-radius: 5; + border-top-left-radius: 5; color:black; padding:5px; } @@ -333,7 +333,7 @@ QTabBar::tab::selected { border-bottom: 1px solid #c3b48e; border-right: 2px solid #c3b48e; border-top-right-radius: 15; - border-top-left-radius: 5; + border-top-left-radius: 5; color: black; padding:5px; } diff --git a/data/themes/gui-qt/Necrophos/resource.qss b/data/themes/gui-qt/Necrophos/resource.qss index 682a1850da..bdb4d5375e 100644 --- a/data/themes/gui-qt/Necrophos/resource.qss +++ b/data/themes/gui-qt/Necrophos/resource.qss @@ -3,9 +3,9 @@ * Necrophos theme for * freeciv-qt by * Pennart Loettering - * + * * Credits: - * systemctl restart dbus + * systemctl restart dbus */ @@ -37,7 +37,7 @@ QMainWindow { border: 2px solid black; } -close_widget +close_widget { background: #006633; } @@ -118,7 +118,7 @@ QLineEdit { color: black; } -QTabWidget { +QTabWidget { background: #e3e3e3; } @@ -194,11 +194,11 @@ QSplitter::handle:horizontal { width: 3px; } -QMenuBar { +QMenuBar { background-color: #3A3A3A; } -QMenuBar::item { +QMenuBar::item { spacing: 3px; padding: 1px 4px; color: #FFFFFF; @@ -206,7 +206,7 @@ QMenuBar::item { border-radius: none } -QMenuBar::item:selected { +QMenuBar::item:selected { color: white; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #595f63, stop:1 #4f5458); } @@ -336,7 +336,7 @@ QTabBar::tab { QTabBar::tab:!selected { margin-top: 3px; -} +} QTabBar::tab:first { border-left: 1px solid #a5a5a5; @@ -344,7 +344,7 @@ QTabBar::tab:first { border-bottom: 1px solid #a5a5a5; border-right: 1px solid #a5a5a5; border-top-right-radius: 15; - border-top-left-radius: 5; + border-top-left-radius: 5; color: black; padding:5px; } diff --git a/data/themes/gui-qt/NightStalker/resource.qss b/data/themes/gui-qt/NightStalker/resource.qss index fe5b9d4324..de28318555 100644 --- a/data/themes/gui-qt/NightStalker/resource.qss +++ b/data/themes/gui-qt/NightStalker/resource.qss @@ -43,7 +43,7 @@ QMainWindow { border-radius: none; } -close_widget +close_widget { background: #1155BB; } @@ -196,7 +196,7 @@ QLineEdit { color: rgb( 210, 210, 210); } -QTabWidget { +QTabWidget { background: #343446; } @@ -272,11 +272,11 @@ QSplitter::handle:horizontal { width: 8px; } -QMenuBar { +QMenuBar { background-color: #3A3A3A; } -QMenuBar::item { +QMenuBar::item { spacing: 3px; padding: 1px 4px; color: #FFFFFF; @@ -284,7 +284,7 @@ QMenuBar::item { border-radius: none } -QMenuBar::item:selected { +QMenuBar::item:selected { color: #3399FF; background: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #111111,stop:0.89 #111111 stop: 0.9 #3399FF,stop: 1 #3399FF); } @@ -442,7 +442,7 @@ QTabBar::tab { QTabBar::tab:!selected { margin-top: 3px; -} +} QTabBar::tab:first { border-left: 1px solid #3399FF; @@ -450,7 +450,7 @@ QTabBar::tab:first { border-bottom: 1px solid #3399FF; border-right: 1px solid #3399FF; border-top-right-radius: 15; - border-top-left-radius: 5; + border-top-left-radius: 5; color:white; padding:5px; } @@ -462,7 +462,7 @@ QTabBar::tab::selected { border-bottom: 1px solid #2c84dc; border-right: 2px solid #2c84dc; border-top-right-radius: 15; - border-top-left-radius: 5; + border-top-left-radius: 5; color:white; padding:5px; } diff --git a/data/themes/gui-sdl2/human/small_theme_buttons.tspec b/data/themes/gui-sdl2/human/small_theme_buttons.tspec index dc7db0e912..9f1602e48b 100644 --- a/data/themes/gui-sdl2/human/small_theme_buttons.tspec +++ b/data/themes/gui-sdl2/human/small_theme_buttons.tspec @@ -26,5 +26,5 @@ tiles = { "row", "column","tag" 0, 0, "theme.SMALL_FAIL_button" 1, 0, "theme.SMALL_OK_button" - + } diff --git a/data/themes/gui-sdl2/human/theme.themespec b/data/themes/gui-sdl2/human/theme.themespec index 85812ed7db..b5e241e2e7 100644 --- a/data/themes/gui-sdl2/human/theme.themespec +++ b/data/themes/gui-sdl2/human/theme.themespec @@ -17,11 +17,11 @@ font_file_ja = "themes/gui-sdl2/human/sazanami-gothic.ttf" font_file_ko = "themes/gui-sdl2/human/UnDotum.ttf" default_font_size = 18 -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). -files = +files = "themes/gui-sdl2/human/city.tspec", "themes/gui-sdl2/human/city_fist.tspec", "themes/gui-sdl2/human/dip_icons.tspec", @@ -29,8 +29,8 @@ files = "themes/gui-sdl2/human/small_theme_buttons.tspec", "themes/gui-sdl2/human/tech_tree.tspec", "themes/gui-sdl2/human/theme_boxs.tspec", - "themes/gui-sdl2/human/theme_buttons.tspec", - "themes/gui-sdl2/human/theme_orders_buttons.tspec", + "themes/gui-sdl2/human/theme_buttons.tspec", + "themes/gui-sdl2/human/theme_orders_buttons.tspec", "themes/gui-sdl2/human/theme_scrolls.tspec" ; Include background image definitions diff --git a/data/themes/gui-sdl2/human/theme_buttons.tspec b/data/themes/gui-sdl2/human/theme_buttons.tspec index 82b396637c..015bb214b3 100644 --- a/data/themes/gui-sdl2/human/theme_buttons.tspec +++ b/data/themes/gui-sdl2/human/theme_buttons.tspec @@ -13,7 +13,7 @@ artists = " Hogne Håskjold Icons from Ubuntu Human Theme: next arrow, back arrow, left arrow, right arrow, up arrow, down arrow, new turn gear, CMA monitor - lock icon and floppy disk (modified by Hogne Håskjold) from gnome-icon-theme + lock icon and floppy disk (modified by Hogne Håskjold) from gnome-icon-theme (http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/) " @@ -50,7 +50,7 @@ tiles = { "row", "column","tag" 17, 0, "theme.BUY_button" 18, 0, "theme.PROD_button" 19, 0, "theme.WORK_LIST_button" - + 0, 1, "theme.CMA_button" 1, 1, "theme.UNLOCK_button" 2, 1, "theme.LOCK_button" diff --git a/data/themes/gui-sdl2/human/theme_orders_buttons.tspec b/data/themes/gui-sdl2/human/theme_orders_buttons.tspec index 4d4a8543c5..5eb22e99de 100644 --- a/data/themes/gui-sdl2/human/theme_orders_buttons.tspec +++ b/data/themes/gui-sdl2/human/theme_orders_buttons.tspec @@ -36,9 +36,9 @@ tiles = { "row", "column","tag" 5, 0, "theme.order_cutdown_forest" 6, 0, "theme.order_plant_forest" 7, 0, "theme.order_build_mining" - 8, 0, "theme.order_irrigation" + 8, 0, "theme.order_irrigation" 9, 0, "theme.order_done" - 10, 0, "theme.order_disband" + 10, 0, "theme.order_disband" 11, 0, "theme.order_fortify" 12, 0, "theme.order_goto" 13, 0, "theme.order_goto_city" @@ -68,5 +68,5 @@ tiles = { "row", "column","tag" ; 37, 0, "theme.order_" ; 38, 0, "theme.order_" 39, 0, "theme.order_empty" - + } -- 2.35.1