Skip to content

Commit

Permalink
Merge pull request #35 from catppuccin/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Sourcastic authored Feb 23, 2023
2 parents 1291c9c + bfcfb3a commit 06c8e8f
Show file tree
Hide file tree
Showing 102 changed files with 80 additions and 221 deletions.
14 changes: 6 additions & 8 deletions Installer/color-build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#!/usr/bin/env bash

# from github.com/skinatro/theme-tool/
# From github.com/skinatro/theme-tool/

####################
#Help and Arguments#
Expand Down Expand Up @@ -34,8 +34,6 @@ fi
#Script begin#
##############

#extract file extension
FILE_EXT="${SOURCE##*.}"
#function defined to build the file
build(){
#combine everything to get the output path
Expand All @@ -47,16 +45,16 @@ SCRIPT="Installer/Pallets/${PALETTE}.sed"
}

#no arrays due to posix compliancy
if [ $FLAVOURNAME = "Mocha" ]; then
if [ "$FLAVOURNAME" = "Mocha" ]; then
PALETTE=Mocha
build
elif [ $FLAVOURNAME = "Macchiato" ]; then
elif [ "$FLAVOURNAME" = "Macchiato" ]; then
PALETTE=Macchiato
build
elif [ $FLAVOURNAME = "Frappe" ]; then
elif [ "$FLAVOURNAME" = "Frappe" ]; then
PALETTE=Frappe
build
elif [ $FLAVOURNAME = "Latte" ]; then
elif [ "$FLAVOURNAME" = "Latte" ]; then
PALETTE=Latte
build
else clear && echo "Invalid pallet $FLAVOURNAME" && exit
Expand Down
16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,24 @@

## Installation

### For KDE Plasma Desktop:
1. `git clone https://github.com/catppuccin/kde catppuccin-kde && cd catppuccin-kde`
2. Run the install script using `./install.sh` and follow the instructions.

### Notes
To get a modern, more consistent look, install the [Lightly application style](https://github.com/Luwx/Lightly) and select it from System Settings > Appearance > Application Style > Lightly.
### For Krita:
1. Download the colour-scheme zip file for your preffered flavour from the [release](https://github.com/catppuccin/kde/releases/) tab.
2. Extract the file and move the theme(s) you wish to install into the following folders for your platform:
Windows: `%appdata%\krita\color-schemes`
Linux: `~/.local/share/krita/color-schemes`
3. Open Krita, and you can choose the theme from Settings > Themes.


## Notes
1. To get a modern, more consistent look, install the [Lightly application style](https://github.com/Luwx/Lightly) and select it from System Settings > Appearance > Application Style > Lightly.
2. If you encounter an error similar to 'connection refused' while running the installation script, it may be due to store.kde.org being down or issues with your internet connection.

## Licensing
The theme makes modifications to [doncsugar's](https://github.com/doncsugar) [lightly plasma style](https://github.com/doncsugar/lightly-plasma). It is licensed under GPL 3.0 and as such, all the changes to the plasma theme are also licensed under GPL. The MIT License still applies to the color scheme and the window decorations theme.
The theme makes modifications to [doncsugar's](https://github.com/doncsugar) [lightly plasma style](https://github.com/doncsugar/lightly-plasma). It is licensed under GPL 3.0 and as such, all the changes to the plasma theme are also licensed under GPL. The MIT License still applies to the color scheme, splash screen and the window decorations theme.


## 💝 Thanks to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ BorderLeft=0
BorderRight=0
BorderBottom=0

ButtonHeight=46
ButtonWidth=46
ButtonHeight=37
ButtonWidth=37

ButtonMarginTop=0
ButtonMarginLeft=0
Expand All @@ -38,4 +38,4 @@ TitleEdgeBottom=0
TitleEdgeLeft=0
TitleEdgeRight=0
TitleEdgeTop=0
TitleHeight=37
TitleHeight=26
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ BorderLeft=0
BorderRight=0
BorderBottom=0

ButtonHeight=46
ButtonWidth=46
ButtonHeight=37
ButtonWidth=37

ButtonMarginTop=0
ButtonMarginLeft=0
Expand All @@ -38,4 +38,4 @@ TitleEdgeBottom=0
TitleEdgeLeft=0
TitleEdgeRight=0
TitleEdgeTop=0
TitleHeight=37
TitleHeight=26
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 5 additions & 7 deletions Resources/splash/Splash.qml → Resources/Splash/Splash.qml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,15 @@ Rectangle {
anchors.fill: parent
opacity: 0

// TODO: Make DropShadow more Intense
DropShadow {
anchors.fill: logo
horizontalOffset: 20
verticalOffset: 0
radius: 30.0
horizontalOffset: 0
verticalOffset: 30
radius: 200.0
samples: 17
color: "$crust"
color: "#000000"
source: logo
opacity: 1
opacity: 0.1
}

Image {
Expand All @@ -52,7 +51,6 @@ Rectangle {
property real size: PlasmaCore.Units.gridUnit * 8

anchors.centerIn: parent

source: "images/Logo.png"

sourceSize.width: size
Expand Down
Binary file added Resources/Splash/images/Latte_Logo.png
File renamed without changes
File renamed without changes

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 06c8e8f

Please sign in to comment.