Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
peterychuang committed Nov 15, 2018
2 parents f24c50c + 6d70410 commit 96c8d7c
Show file tree
Hide file tree
Showing 137 changed files with 110 additions and 26 deletions.
33 changes: 28 additions & 5 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
**NOTE: Before reporting a bug, please check whether it also occurs with other themes.**
> If the bug also occurs with other themes (especially upstream default theme),
it is very likely an upstream issue.
<!--
Before reporting a bug, please check whether it also occurs with the upstream default theme.
If the bug also occurs with the upstream default theme, it is very likely an upstream issue.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
If you submit an issue other than a bug or question, you can remove this template.
-->

#### Reporter Info
<!--
Please provide the following information as much as possible.
(GTK+ 3 version can be checked with `pkg-config --modversion gtk+-3.0`)
-->

If you report a bug or ask a question, please include the following information as required:
- Flat-Plat-Blue version
- GTK+ 3 version (You can check it with `pkg-config --modversion gtk+-3.0`)
- Distribution (and version)
Expand All @@ -13,3 +19,20 @@ If you report a bug or ask a question, please include the following information
- Steps to reproduce
- Screenshot(s)

#### Actual Issue
<!--
Please describe the actual issue here.
Screenshots or screen recordings are useful for visual issues.
-->



#### Steps to Reproduce
<!--
Please describe the steps to reproduce.
If you think it is unnecessary, you can remove this section.
-->

1.
2.
3.
9 changes: 3 additions & 6 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ if [[ "$(which gnome-shell 2> /dev/null)" ]]; then
if (( "$(bc <<< "$CURRENT_GS_VERSION <= $version")" )); then
GS_VERSION="$version"
break
elif (( "$(bc <<< "$CURRENT_GS_VERSION > $LATEST_GS_VERSION")" )); then
else
GS_VERSION="$LATEST_GS_VERSION"
break
fi
done
else
Expand Down Expand Up @@ -86,6 +85,7 @@ install() {
mkdir -p "$THEME_DIR/gnome-shell"
cp -r "$SRC_DIR/gnome-shell/"{*.svg,extensions,noise-texture.png,pad-osd.css} "$THEME_DIR/gnome-shell"
cp -r "$SRC_DIR/gnome-shell/gnome-shell-theme.gresource.xml" "$THEME_DIR/gnome-shell"
cp -r "$SRC_DIR/gnome-shell/README.md" "$THEME_DIR/gnome-shell"
cp -r "$SRC_DIR/gnome-shell/assets${ELSE_DARK:-}" "$THEME_DIR/gnome-shell/assets"
cp -r "$SRC_DIR/gnome-shell/$GS_VERSION/gnome-shell$color$size.css" "$THEME_DIR/gnome-shell/gnome-shell.css"

Expand Down Expand Up @@ -147,10 +147,7 @@ while [[ "$#" -gt 0 ]]; do
case "${1:-}" in
-d|--dest)
dest="$2"
if [[ ! -d "$dest" ]]; then
echo "ERROR: Destination directory does not exist."
exit 1
fi
mkdir -p "$dest"
shift 2
;;
-n|--name)
Expand Down
64 changes: 64 additions & 0 deletions src/gnome-shell/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# How to change the GDM theme

To change the GDM (lock/login screen) theme, you need to replace the system's _default_ GNOME Shell theme.

## :warning: Cautions :warning:

- If the replacement fails, your desktop environment will not work properly. So please **be careful** if doing this.
- When applying this, other third-party GNOME Shell themes would look broken until you restore to the original theme.
- If GNOME Shell has been updated and restored to the original theme, you will need to install this again.

## Requirements

- `glib-compile-resources` — The package name depends on the distro.
- `glib2` (Arch Linux)
- `glib2-devel` (Fedora, openSUSE, etc.)
- `libglib2.0-dev` (Debian, Ubuntu, etc.)
- `libxml2-utils` — Ubuntu users only.

## Installation

1. **Back up** the original theme file(s) first. If you are already using a custom GDM theme, skip this:

```sh
sudo cp -av /usr/share/gnome-shell/gnome-shell-theme.gresource{,~}

# For Ubuntu 17.10 or 18.04, you also need the following:
sudo cp -av /usr/share/gnome-shell/theme/ubuntu.css{,~}

# For Ubuntu 18.10, you also need the following:
sudo cp -av /usr/share/gnome-shell/theme/Yaru/gnome-shell.css{,~}
```

2. Select a **GTK+** theme to decide which variant to install.
3. Replace the default theme file(s):

```sh
GTK_THEME=$(gsettings get org.gnome.desktop.interface gtk-theme | sed "s/'//g")
cd /usr/share/themes/${GTK_THEME}/gnome-shell
sudo glib-compile-resources --target=/usr/share/gnome-shell/gnome-shell-theme.gresource gnome-shell-theme.gresource.xml
# For Ubuntu 17.10 or 18.04, you also need the following:
sudo cp -av gnome-shell.css /usr/share/gnome-shell/theme/ubuntu.css
# For Ubuntu 18.10, you also need the following:
sudo cp -av gnome-shell.css /usr/share/gnome-shell/theme/Yaru/gnome-shell.css
```

4. Reload the theme. If you are running GNOME Shell, press <kbd>Alt</kbd> + <kbd>F2</kbd> then type `rt`.

## Uninstallation

1. Restore to the original theme file(s) from the backup:

```sh
sudo mv -av /usr/share/gnome-shell/gnome-shell-theme.gresource{~,}
# For Ubuntu 17.10 or 18.04, you also need the following:
sudo mv -av /usr/share/gnome-shell/theme/ubuntu.css{~,}
# For Ubuntu 18.10, you also need the following:
sudo mv -av /usr/share/gnome-shell/theme/Yaru/gnome-shell.css{~,}
```

2. Reload the theme. If you are running GNOME Shell, press <kbd>Alt</kbd> + <kbd>F2</kbd> then type `rt`.
8 changes: 4 additions & 4 deletions src/gtk-2.0/assets-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/button-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/button-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/button-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/checkbox-checked-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/checkbox-checked-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/checkbox-mixed-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/checkbox-mixed-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/checkbox-unchecked-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/checkbox-unchecked-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-ltr-button-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-ltr-button-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-ltr-button-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-ltr-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-ltr-entry-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-ltr-entry-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-ltr-entry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-rtl-button-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-rtl-button-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-rtl-button-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-rtl-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-rtl-entry-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-rtl-entry-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/combo-rtl-entry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/gtk-2.0/assets-dark/entry-active.png
Binary file modified src/gtk-2.0/assets-dark/entry-disabled.png
Binary file modified src/gtk-2.0/assets-dark/entry.png
Binary file modified src/gtk-2.0/assets-dark/flat-button-active.png
Binary file modified src/gtk-2.0/assets-dark/flat-button-hover.png
Binary file modified src/gtk-2.0/assets-dark/focus.png
Binary file modified src/gtk-2.0/assets-dark/notebook-combo-ltr-entry-active.png
Binary file modified src/gtk-2.0/assets-dark/notebook-combo-ltr-entry-disabled.png
Binary file modified src/gtk-2.0/assets-dark/notebook-combo-ltr-entry.png
Binary file modified src/gtk-2.0/assets-dark/notebook-combo-rtl-entry-active.png
Binary file modified src/gtk-2.0/assets-dark/notebook-combo-rtl-entry-disabled.png
Binary file modified src/gtk-2.0/assets-dark/notebook-combo-rtl-entry.png
Binary file modified src/gtk-2.0/assets-dark/notebook-entry-active.png
Binary file modified src/gtk-2.0/assets-dark/notebook-entry-disabled.png
Binary file modified src/gtk-2.0/assets-dark/notebook-entry.png
Binary file modified src/gtk-2.0/assets-dark/radio-checked-active.png
Binary file modified src/gtk-2.0/assets-dark/radio-checked-hover.png
Binary file modified src/gtk-2.0/assets-dark/radio-mixed-active.png
Binary file modified src/gtk-2.0/assets-dark/radio-mixed-hover.png
Binary file modified src/gtk-2.0/assets-dark/radio-unchecked-active.png
Binary file modified src/gtk-2.0/assets-dark/radio-unchecked-hover.png
Binary file modified src/gtk-2.0/assets-dark/spin-ltr-down-active.png
Binary file modified src/gtk-2.0/assets-dark/spin-ltr-down-disabled.png
Binary file modified src/gtk-2.0/assets-dark/spin-ltr-down-hover.png
Binary file modified src/gtk-2.0/assets-dark/spin-ltr-down.png
Binary file modified src/gtk-2.0/assets-dark/spin-ltr-up-active.png
Binary file modified src/gtk-2.0/assets-dark/spin-ltr-up-disabled.png
Binary file modified src/gtk-2.0/assets-dark/spin-ltr-up-hover.png
Binary file modified src/gtk-2.0/assets-dark/spin-ltr-up.png
Binary file modified src/gtk-2.0/assets-dark/spin-rtl-down-active.png
Binary file modified src/gtk-2.0/assets-dark/spin-rtl-down-disabled.png
Binary file modified src/gtk-2.0/assets-dark/spin-rtl-down-hover.png
Binary file modified src/gtk-2.0/assets-dark/spin-rtl-down.png
Binary file modified src/gtk-2.0/assets-dark/spin-rtl-up-active.png
Binary file modified src/gtk-2.0/assets-dark/spin-rtl-up-disabled.png
Binary file modified src/gtk-2.0/assets-dark/spin-rtl-up-hover.png
Binary file modified src/gtk-2.0/assets-dark/spin-rtl-up.png
8 changes: 4 additions & 4 deletions src/gtk-2.0/assets.svg
Binary file modified src/gtk-2.0/assets/button-active.png
Binary file modified src/gtk-2.0/assets/button-disabled.png
Binary file modified src/gtk-2.0/assets/button-hover.png
Binary file modified src/gtk-2.0/assets/button.png
Binary file modified src/gtk-2.0/assets/checkbox-checked-active.png
Binary file modified src/gtk-2.0/assets/checkbox-checked-hover.png
Binary file modified src/gtk-2.0/assets/checkbox-mixed-active.png
Binary file modified src/gtk-2.0/assets/checkbox-mixed-hover.png
Binary file modified src/gtk-2.0/assets/checkbox-unchecked-active.png
Binary file modified src/gtk-2.0/assets/checkbox-unchecked-hover.png
Binary file modified src/gtk-2.0/assets/combo-ltr-button-active.png
Binary file modified src/gtk-2.0/assets/combo-ltr-button-disabled.png
Binary file modified src/gtk-2.0/assets/combo-ltr-button-hover.png
Binary file modified src/gtk-2.0/assets/combo-ltr-button.png
Binary file modified src/gtk-2.0/assets/combo-ltr-entry-active.png
Binary file modified src/gtk-2.0/assets/combo-ltr-entry-disabled.png
Binary file modified src/gtk-2.0/assets/combo-ltr-entry.png
Binary file modified src/gtk-2.0/assets/combo-rtl-button-active.png
Binary file modified src/gtk-2.0/assets/combo-rtl-button-disabled.png
Binary file modified src/gtk-2.0/assets/combo-rtl-button-hover.png
Binary file modified src/gtk-2.0/assets/combo-rtl-button.png
Binary file modified src/gtk-2.0/assets/combo-rtl-entry-active.png
Binary file modified src/gtk-2.0/assets/combo-rtl-entry-disabled.png
Binary file modified src/gtk-2.0/assets/combo-rtl-entry.png
Binary file modified src/gtk-2.0/assets/entry-active.png
Binary file modified src/gtk-2.0/assets/entry-disabled.png
Binary file modified src/gtk-2.0/assets/entry.png
Binary file modified src/gtk-2.0/assets/flat-button-active.png
Binary file modified src/gtk-2.0/assets/flat-button-hover.png
Binary file modified src/gtk-2.0/assets/focus.png
Binary file modified src/gtk-2.0/assets/notebook-combo-ltr-entry-active.png
Binary file modified src/gtk-2.0/assets/notebook-combo-ltr-entry-disabled.png
Binary file modified src/gtk-2.0/assets/notebook-combo-ltr-entry.png
Binary file modified src/gtk-2.0/assets/notebook-combo-rtl-entry-active.png
Binary file modified src/gtk-2.0/assets/notebook-combo-rtl-entry-disabled.png
Binary file modified src/gtk-2.0/assets/notebook-combo-rtl-entry.png
Binary file modified src/gtk-2.0/assets/notebook-entry-active.png
Binary file modified src/gtk-2.0/assets/notebook-entry-disabled.png
Binary file modified src/gtk-2.0/assets/notebook-entry.png
Binary file modified src/gtk-2.0/assets/radio-checked-active.png
Binary file modified src/gtk-2.0/assets/radio-checked-hover.png
Binary file modified src/gtk-2.0/assets/radio-mixed-active.png
Binary file modified src/gtk-2.0/assets/radio-mixed-hover.png
Binary file modified src/gtk-2.0/assets/radio-unchecked-active.png
Binary file modified src/gtk-2.0/assets/radio-unchecked-hover.png
Binary file modified src/gtk-2.0/assets/spin-ltr-down-active.png
Binary file modified src/gtk-2.0/assets/spin-ltr-down-disabled.png
Binary file modified src/gtk-2.0/assets/spin-ltr-down-hover.png
Binary file modified src/gtk-2.0/assets/spin-ltr-down.png
Binary file modified src/gtk-2.0/assets/spin-ltr-up-active.png
Binary file modified src/gtk-2.0/assets/spin-ltr-up-disabled.png
Binary file modified src/gtk-2.0/assets/spin-ltr-up-hover.png
Binary file modified src/gtk-2.0/assets/spin-ltr-up.png
Binary file modified src/gtk-2.0/assets/spin-rtl-down-active.png
Binary file modified src/gtk-2.0/assets/spin-rtl-down-disabled.png
Binary file modified src/gtk-2.0/assets/spin-rtl-down-hover.png
Binary file modified src/gtk-2.0/assets/spin-rtl-down.png
Binary file modified src/gtk-2.0/assets/spin-rtl-up-active.png
Binary file modified src/gtk-2.0/assets/spin-rtl-up-disabled.png
Binary file modified src/gtk-2.0/assets/spin-rtl-up-hover.png
Binary file modified src/gtk-2.0/assets/spin-rtl-up.png
4 changes: 2 additions & 2 deletions src/gtk-2.0/main.rc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ style "default" {
GtkToolbar::internal-padding = 2
GtkToolButton::icon-spacing = 4

GtkWidget::tooltip-radius = 2
GtkWidget::tooltip-radius = 4
GtkWidget::tooltip-alpha = 230
GtkWidget::new-tooltip-style = 1 #for compatibility

Expand Down Expand Up @@ -681,7 +681,7 @@ style "default" {
image {
function = FOCUS
file = "assets/focus.png"
border = {2, 2, 2, 2}
border = {5, 5, 5, 5} # Super strange, {4, 4, 4, 4} does not work properly...
stretch = TRUE
}

Expand Down
10 changes: 5 additions & 5 deletions src/gtk/assets.svg
Binary file modified src/gtk/assets/selectionmode-checkbox-checked-dark.png
Binary file modified src/gtk/assets/selectionmode-checkbox-checked-dark@2.png
Binary file modified src/gtk/assets/selectionmode-checkbox-checked.png
Binary file modified src/gtk/assets/selectionmode-checkbox-checked@2.png
Binary file modified src/gtk/assets/selectionmode-checkbox-unchecked-dark.png
Binary file modified src/gtk/assets/selectionmode-checkbox-unchecked-dark@2.png
Binary file modified src/gtk/assets/selectionmode-checkbox-unchecked.png
Binary file modified src/gtk/assets/selectionmode-checkbox-unchecked@2.png

0 comments on commit 96c8d7c

Please sign in to comment.