Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Merge changes appeared after the review in Phabricator

parent fc112fae
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
@import url("../../Breeze-Dark/gtk-3.18/gtk.css");
This source diff could not be displayed because it is too large. You can view the blob instead.
@import url("../../Breeze-Dark/gtk-3.20/gtk.css");
......@@ -9,6 +9,13 @@ include(FeatureSummary)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_SOURCE_DIR}/cmake")
find_package(GTKEngine)
find_package(Sass REQUIRED)
if(${CMAKE_VERSION} GREATER_EQUAL 3.12.0)
find_package(Python3 COMPONENTS Interpreter REQUIRED)
else()
find_package(PythonInterp 3 REQUIRED)
endif()
include(KDEInstallDirs)
......@@ -23,5 +30,6 @@ set(directory_EXCLUDES
add_subdirectory(Breeze-dark-gtk)
add_subdirectory(Breeze-gtk)
add_subdirectory(kconf_update)
add_subdirectory(src)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
set_package_properties(Sass PROPERTIES
DESCRIPTION "SASS compiler"
URL "https://sass-lang.com/"
PURPOSE "Required for building GTK themes")
find_program(Sass_EXECUTABLE NAMES sassc)
if(Sass_EXECUTABLE)
set(Sass_COMPILER_TYPE sassc)
else()
find_program(Sass_EXECUTABLE NAMES sass)
set(Sass_COMPILER_TYPE sass)
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Sass
FOUND_VAR
Sass_FOUND
REQUIRED_VARS
Sass_EXECUTABLE
)
mark_as_advanced(Sass_EXECUTABLE)
if (Sass_FOUND)
if (NOT TARGET Sass::Sass)
add_executable(Sass::Sass IMPORTED)
set_target_properties(Sass::Sass PROPERTIES
IMPORTED_LOCATION "${Sass_EXECUTABLE}"
)
endif()
endif()
#!/bin/sh
cd src
./build_theme.sh BreezeDark ../Breeze-dark-gtk
./build_theme.sh Breeze ../Breeze-gtk
add_custom_target(
Breeze-dark-gtk ALL
COMMAND ./build_theme.sh BreezeDark ../Breeze-dark-gtk
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/src"
)
add_custom_target(
Breeze-gtk ALL
COMMAND ./build_theme.sh Breeze ../Breeze-gtk
COMMAND cp gtk-dark-3.18.css ../Breeze-gtk/gtk-3.18/gtk-dark.css
COMMAND cp gtk-dark-3.20.css ../Breeze-gtk/gtk-3.20/gtk-dark.css
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/src"
)
$ButtonBackgroundAlternate:rgb(189,195,199);
$ButtonBackgroundNormal:rgb(239,240,241);
$ButtonBackgroundAlternate:rgb(77,77,77);
$ButtonBackgroundNormal:rgb(49,54,59);
$ButtonDecorationFocus:rgb(61,174,233);
$ButtonDecorationHover:rgb(147,206,233);
$ButtonDecorationHover:rgb(61,174,233);
$ButtonForegroundActive:rgb(61,174,233);
$ButtonForegroundInactive:127,140,141;
$ButtonForegroundInactive:189,195,199;
$ButtonForegroundLink:rgb(41,128,185);
$ButtonForegroundNegative:rgb(218,68,83);
$ButtonForegroundNeutral:rgb(246,116,0);
$ButtonForegroundNormal:rgb(35,38,39);
$ButtonForegroundNormal:rgb(239,240,241);
$ButtonForegroundPositive:rgb(39,174,96);
$ButtonForegroundVisited:rgb(127,140,141);
$DisabledColor:rgb(56,56,56);
......@@ -29,54 +29,54 @@ $InactiveIntensityEffect:0;
$SelectionBackgroundAlternate:rgb(29,153,243);
$SelectionBackgroundNormal:rgb(61,174,233);
$SelectionDecorationFocus:rgb(61,174,233);
$SelectionDecorationHover:rgb(147,206,233);
$SelectionDecorationHover:rgb(61,174,233);
$SelectionForegroundActive:rgb(252,252,252);
$SelectionForegroundInactive:239,240,241;
$SelectionForegroundLink:rgb(253,188,75);
$SelectionForegroundNegative:rgb(218,68,83);
$SelectionForegroundNeutral:rgb(246,116,0);
$SelectionForegroundNormal:rgb(252,252,252);
$SelectionForegroundNormal:rgb(239,240,241);
$SelectionForegroundPositive:rgb(39,174,96);
$SelectionForegroundVisited:rgb(189,195,199);
$TooltipBackgroundAlternate:rgb(77,77,77);
$TooltipBackgroundNormal:rgb(35,38,39);
$TooltipBackgroundNormal:rgb(49,54,59);
$TooltipDecorationFocus:rgb(61,174,233);
$TooltipDecorationHover:rgb(147,206,233);
$TooltipDecorationHover:rgb(61,174,233);
$TooltipForegroundActive:rgb(61,174,233);
$TooltipForegroundInactive:189,195,199;
$TooltipForegroundLink:rgb(41,128,185);
$TooltipForegroundNegative:rgb(218,68,83);
$TooltipForegroundNeutral:rgb(246,116,0);
$TooltipForegroundNormal:rgb(252,252,252);
$TooltipForegroundNormal:rgb(239,240,241);
$TooltipForegroundPositive:rgb(39,174,96);
$TooltipForegroundVisited:rgb(127,140,141);
$ViewBackgroundAlternate:rgb(239,240,241);
$ViewBackgroundNormal:rgb(252,252,252);
$ViewBackgroundAlternate:rgb(49,54,59);
$ViewBackgroundNormal:rgb(35,38,41);
$ViewDecorationFocus:rgb(61,174,233);
$ViewDecorationHover:rgb(147,206,233);
$ViewDecorationHover:rgb(61,174,233);
$ViewForegroundActive:rgb(61,174,233);
$ViewForegroundInactive:127,140,141;
$ViewForegroundInactive:189,195,199;
$ViewForegroundLink:rgb(41,128,185);
$ViewForegroundNegative:rgb(218,68,83);
$ViewForegroundNeutral:rgb(246,116,0);
$ViewForegroundNormal:rgb(35,38,39);
$ViewForegroundNormal:rgb(239,240,241);
$ViewForegroundPositive:rgb(39,174,96);
$ViewForegroundVisited:rgb(127,140,141);
$WMactiveBackground:rgb(71,80,87);
$WMactiveBlend:rgb(252,252,252);
$WMactiveForeground:rgb(252,252,252);
$WMinactiveBackground:rgb(239,240,241);
$WMactiveBackground:rgb(49,54,59);
$WMactiveBlend:rgb(255,255,255);
$WMactiveForeground:rgb(239,240,241);
$WMinactiveBackground:rgb(49,54,59);
$WMinactiveBlend:rgb(75,71,67);
$WMinactiveForeground:rgb(189,195,199);
$WindowBackgroundAlternate:rgb(189,195,199);
$WindowBackgroundNormal:rgb(239,240,241);
$WMinactiveForeground:rgb(127,140,141);
$WindowBackgroundAlternate:rgb(77,77,77);
$WindowBackgroundNormal:rgb(49,54,59);
$WindowDecorationFocus:rgb(61,174,233);
$WindowDecorationHover:rgb(147,206,233);
$WindowDecorationHover:rgb(61,174,233);
$WindowForegroundActive:rgb(61,174,233);
$WindowForegroundInactive:127,140,141;
$WindowForegroundInactive:189,195,199;
$WindowForegroundLink:rgb(41,128,185);
$WindowForegroundNegative:rgb(218,68,83);
$WindowForegroundNeutral:rgb(246,116,0);
$WindowForegroundNormal:rgb(35,38,39);
$WindowForegroundNormal:rgb(239,240,241);
$WindowForegroundPositive:rgb(39,174,96);
$WindowForegroundVisited:rgb(127,140,141);
......@@ -2,9 +2,10 @@
# Usage: build_theme.sh [<colorscheme> [<install-target>]]
# If <colorscheme> is unset or empty, colors from kdeglobals are used
# If <install-target> is unset or empty, the theme is installed into ~/.local/share/themes/<theme name>
set -e
create_folders () {
for j in gtk-2.0 gtk-3.0 gtk-3.20; do
for j in gtk-2.0 gtk-3.18 gtk-3.20; do
if ! [ -d "$1/$j" ]; then
mkdir -p "$1/$j"
fi
......@@ -26,7 +27,7 @@ install_theme () {
INSTALL_TARGET="$HOME/.local/share/themes/$COLOR_SCHEME"
fi
mkdir -p "$INSTALL_TARGET"
for dir in assets gtk-2.0 gtk-3.0 gtk-3.20; do
for dir in assets gtk-2.0 gtk-3.18 gtk-3.20; do
if [ -d "$INSTALL_TARGET/$dir" ]; then
rm -rf "${INSTALL_TARGET:?}/$dir"
fi
......@@ -38,7 +39,7 @@ install_theme () {
render_theme () {
python3 render_assets.py "$1"
create_folders "$2"
build_sass gtk318/gtk.scss "$2/gtk-3.0/gtk.css"
build_sass gtk318/gtk.scss "$2/gtk-3.18/gtk.css"
build_sass gtk320/gtk.scss "$2/gtk-3.20/gtk.css"
mv assets "$2/"
cp -R gtk2/* "$2/gtk-2.0/"
......
@import url("../../Breeze-Dark/gtk-3.18/gtk.css");
@import url("../../Breeze-Dark/gtk-3.20/gtk.css");
# Theme: Breeze-gtk
# Description: Breeze theme for GTK+2.0
gtk-color-scheme = "text_color:#232627"
gtk-color-scheme = "base_color:#fcfcfc"
gtk-color-scheme = "insensitive_base_color:#e5e5e5"
gtk-color-scheme = "fg_color:#232627"
gtk-color-scheme = "bg_color:#eff0f1"
gtk-color-scheme = "selected_fg_color:#fcfcfc"
gtk-color-scheme = "text_color:#eff0f1"
gtk-color-scheme = "base_color:#232629"
gtk-color-scheme = "insensitive_base_color:#1f2225"
gtk-color-scheme = "fg_color:#eff0f1"
gtk-color-scheme = "bg_color:#31363b"
gtk-color-scheme = "selected_fg_color:#eff0f1"
gtk-color-scheme = "selected_bg_color:#3daee9"
gtk-color-scheme = "button_fg_color:#232627"
gtk-color-scheme = "tooltip_fg_color:#fcfcfc"
gtk-color-scheme = "tooltip_bg_color:#232627"
gtk-color-scheme = "insensitive_fg_color:#a6a8a9"
gtk-color-scheme = "insensitive_text_color:#aeafb0"
gtk-color-scheme = "button_insensitive_fg_color:#a6a8a9"
gtk-color-scheme = "button_fg_color:#eff0f1"
gtk-color-scheme = "tooltip_fg_color:#eff0f1"
gtk-color-scheme = "tooltip_bg_color:#31363b"
gtk-color-scheme = "insensitive_fg_color:#6b6f73"
gtk-color-scheme = "insensitive_text_color:#626567"
gtk-color-scheme = "button_insensitive_fg_color:#6b6f73"
gtk-color-scheme = "button_active:#3daee9"
gtk-color-scheme = "border_color:#bcbdbe"
gtk-color-scheme = "border_color:#606468"
include "widgets/default"
include "widgets/buttons"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment