Skip to content
This repository has been archived by the owner on Jul 26, 2018. It is now read-only.

Rebase communitheme on GNOME Shell 3.27.92 and switch to bionic #77

Merged
merged 3 commits into from Mar 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -5,7 +5,7 @@ services:
- docker

env:
- TRAVIS_DEBIAN_DISTRIBUTION=artful TRAVIS_DEBIAN_BACKPORTS="artful-security artful-updates" TRAVIS_DEBIAN_INCREMENT_VERSION_NUMBER=true
- TRAVIS_DEBIAN_DISTRIBUTION=bionic TRAVIS_DEBIAN_BACKPORTS="bionic-security bionic-updates" TRAVIS_DEBIAN_INCREMENT_VERSION_NUMBER=true

script:
- wget -O- https://raw.githubusercontent.com/lamby/travis.debian.net/gh-pages/script.sh | sh -
Expand Down
11 changes: 4 additions & 7 deletions communitheme/README
@@ -1,12 +1,9 @@
Summary
-------

* Do not edit the CSS directly, edit the source SCSS files and process them with SASS (running
`make` should do that when you have the required software installed, as described below;
run `./parse-sass.sh` manually if it doesn't)
* Most SASS preprocessors should produce similar results, however the build system
integration and 'parse-sass.sh' script use sassc. You should be able to install
it with `pkcon install sassc` or your distribution's package manager.
* Do not edit the CSS directly, edit the source SCSS files and the CSS files will be generated
automatically when building with meson + ninja and left inside the build directory to be
incorporated into the gresource XML (you'll need to have sassc installed).

How to tweak the theme
----------------------
Expand All @@ -31,4 +28,4 @@ _common.scss - actual definitions of style for each widget. This is where
your changes.

You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the
_common.scss file, you can either run make or the ./parse-sass.sh script.
_common.scss file, you can run ninja to generate the final CSS files.
70 changes: 57 additions & 13 deletions communitheme/gnome-shell-sass/_common.scss
Expand Up @@ -749,7 +749,7 @@ StScrollBar {
}

.tile-preview-left.on-primary {
border-radius: $panel-corner-radius $panel-corner-radius 0 0;
border-radius: $panel-corner-radius 0 0 0;
}

.tile-preview-right.on-primary {
Expand Down Expand Up @@ -876,7 +876,7 @@ StScrollBar {
color: $_fg;
text-shadow: none;

&:hover {
&:hover, &:active, &:overview, &:focus, &:checked {
color: $hover_fg_color;
}
}
Expand Down Expand Up @@ -951,6 +951,7 @@ StScrollBar {

.datemenu-today-button .date-label {
font-size: 1.5em;
font-weight: 300;
}

.world-clocks-header,
Expand Down Expand Up @@ -1162,6 +1163,12 @@ StScrollBar {
.aggregate-menu {
min-width: 21em;
.popup-menu-icon { padding: 0 4px; }
.popup-sub-menu .popup-menu-item :first-child {
&:ltr { /* 12px spacing + 2*4px padding */
padding-left: 20px; margin-left: 1.09em; }
&:rtl { /* 12px spacing + 2*4px padding */
padding-right: 20px; margin-right: 1.09em; }
}
}

.system-menu-action {
Expand Down Expand Up @@ -1546,6 +1553,12 @@ StScrollBar {
border-radius: 9px 0 0 9px;
//border-width: 1px 0 1px 1px; //fixme: can't have non unoform borders :(
&:rtl { border-radius: 0 9px 9px 0;}

.placeholder {
background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
background-size: contain;
height: 24px;
}
}
.workspace-thumbnail-indicator {
border: 4px solid $selected_bg_color;
Expand Down Expand Up @@ -1699,27 +1712,31 @@ StScrollBar {

//Keyboard
/* On-screen Keyboard */
.word-suggestions {
font-size: 14pt;
spacing: 12px;
min-height: 20pt;
}

#keyboard {
background-color: transparentize($osd_bg_color, 0.3);
}

.keyboard-layout {
spacing: 10px;
padding: 10px;
.key-container {
padding: 4px;
spacing: 4px;
}

.keyboard-row { spacing: 15px; }

.keyboard-key {
@include button(normal);
background-color: #393f3f;
min-height: 2em;
min-width: 2em;
font-size: 14pt;
font-weight: bold;
border-radius: $small_radius;
border: 1px solid $borders-color;
color: white;
font-size: 16pt;
border-radius: 3px;
border: 1px solid #464d4d;
color: #e5e5e5;
&:focus { @include button(focus); }
&:hover,&:checked { @include button(hover); }
&:active { @include button(active);}
Expand All @@ -1728,11 +1745,35 @@ StScrollBar {
color: $osd_fg_color;
border-color: $osd_borders_color;
}
&.default-key {
border-color: #2d3232;
background-color: #1d2020;
background-size: 20px;
}
&.enter-key {
border-color: #005684;
background-color: #006098;
background-image: url("resource:///org/gnome/shell/theme/key-enter.svg");
}
&.shift-key-lowercase {
background-image: url("resource:///org/gnome/shell/theme/key-shift.svg");
}
&.shift-key-uppercase {
background-image: url("resource:///org/gnome/shell/theme/key-shift-uppercase.svg");
}
&.shift-key-uppercase:latched {
background-image: url("resource:///org/gnome/shell/theme/key-shift-latched-uppercase.svg");
}
&.hide-key {
background-image: url("resource:///org/gnome/shell/theme/key-hide.svg");
}
&.layout-key {
background-image: url("resource:///org/gnome/shell/theme/key-layout.svg");
}
}

.keyboard-subkeys { //long press on a key popup
color: white;
padding: 5px;
-arrow-border-radius: 10px;
-arrow-background-color: transparentize($osd_bg_color, 0.3);
-arrow-border-width: 2px;
Expand Down Expand Up @@ -1930,7 +1971,10 @@ StScrollBar {
text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
}

.screen-shield-clock-date { font-size: 28pt; }
.screen-shield-clock-date {
font-size: 28pt;
font-weight: normal;
}

.screen-shield-notifications-container {
spacing: 6px;
Expand Down
109 changes: 109 additions & 0 deletions communitheme/key-enter.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
114 changes: 114 additions & 0 deletions communitheme/key-hide.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.