[gnome-shell/wip/snwh/sass-cleanup: 2/4] theme: more variable based SASS in the css modules
- From: Sam Hewitt <snwh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/snwh/sass-cleanup: 2/4] theme: more variable based SASS in the css modules
- Date: Tue, 10 Sep 2019 19:27:10 +0000 (UTC)
commit 5afce382150f3a54fc79b038cbdbb634d0ef8e7a
Author: Sam Hewitt <sam snwh org>
Date: Tue Sep 10 12:32:37 2019 -0400
theme: more variable based SASS in the css modules
data/theme/gnome-shell-sass/_colors.scss | 2 +-
data/theme/gnome-shell-sass/_common.scss | 84 +++++---
data/theme/gnome-shell-sass/widgets/_app-grid.scss | 149 ++++++++++++-
.../theme/gnome-shell-sass/widgets/_app-icons.scss | 118 -----------
.../gnome-shell-sass/widgets/_app-switcher.scss | 69 +++---
data/theme/gnome-shell-sass/widgets/_buttons.scss | 4 +-
data/theme/gnome-shell-sass/widgets/_calendar.scss | 231 +++++++++++++--------
.../theme/gnome-shell-sass/widgets/_check-box.scss | 1 -
.../gnome-shell-sass/widgets/_corner-ripple.scss | 22 +-
data/theme/gnome-shell-sass/widgets/_dash.scss | 61 ++++--
data/theme/gnome-shell-sass/widgets/_dialogs.scss | 147 ++-----------
.../widgets/_end-session-dialog.scss | 80 +++++++
data/theme/gnome-shell-sass/widgets/_entries.scss | 3 +-
data/theme/gnome-shell-sass/widgets/_hotplug.scss | 4 +-
.../gnome-shell-sass/widgets/_ibus-popup.scss | 8 +-
data/theme/gnome-shell-sass/widgets/_keyboard.scss | 32 +--
.../gnome-shell-sass/widgets/_login-dialog.scss | 149 ++++++-------
.../gnome-shell-sass/widgets/_looking-glass.scss | 10 +-
.../gnome-shell-sass/widgets/_message-list.scss | 4 +-
.../gnome-shell-sass/widgets/_message-tray.scss | 12 +-
data/theme/gnome-shell-sass/widgets/_misc.scss | 17 ++
.../gnome-shell-sass/widgets/_network-dialog.scss | 57 +++++
data/theme/gnome-shell-sass/widgets/_osd.scss | 5 +-
data/theme/gnome-shell-sass/widgets/_overview.scss | 79 +------
data/theme/gnome-shell-sass/widgets/_panel.scss | 4 +-
data/theme/gnome-shell-sass/widgets/_popovers.scss | 42 ++--
.../gnome-shell-sass/widgets/_screen-shield.scss | 14 +-
.../gnome-shell-sass/widgets/_search-entry.scss | 33 +++
.../gnome-shell-sass/widgets/_search-results.scss | 93 +++++++--
data/theme/gnome-shell-sass/widgets/_slider.scss | 17 +-
data/theme/gnome-shell-sass/widgets/_switches.scss | 16 +-
.../gnome-shell-sass/widgets/_tiled-previews.scss | 2 +-
.../gnome-shell-sass/widgets/_window-picker.scss | 66 ++++++
.../widgets/_workspace-switcher.scss | 31 +--
34 files changed, 962 insertions(+), 704 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index 356d7bc4e6..b5f28c422c 100644
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -41,4 +41,4 @@ $backdrop_bg_color: $bg_color;
$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%),
lighten($backdrop_bg_color,15%));
$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
-$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index b2807e24dd..7c08cc353a 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -23,40 +23,45 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* GLOBALS */
+/* Global Values */
-// common values
+// padding, margin and spacing
$base_padding: 12px;
$base_margin: 4px;
$base_spacing: 4px;
-// common radii
-$base_radius: 5px;
+// border radii
+$base_border_radius: 5px;
-$modal_radius: $base_radius + 4px;
+$dialog_border_radius: $base_border_radius + 4px;
-$_trough_color: transparentize($fg_color, 0.9);
-$_bubble_borders_color: lighten($borders_color, if($variant=='light', 0%, 5%));
-$_hover_bg_color: lighten($bg_color,if($variant=='light', 5%, 3%));
-$_active_bg_color: if($variant == 'light', darken($bg_color, 14%), darken($bg_color, 9%));
+// non-standard colors
+$bubble_borders_color: lighten($borders_color, if($variant=='light', 0%, 5%));
-// common fonts
-$font_size: 11pt;
+$active_bg_color: if($variant == 'light', darken($bg_color, 14%), darken($bg_color, 9%));
+
+// hover
+$hover_bg_color: lighten($bg_color,if($variant=='light', 5%, 3%));
+$hover_fg_color: lighten($fg_color,if($variant=='light', 5%, 3%));
+$hover_borders_color: lighten($borders_color,if($variant=='light', 5%, 3%));
+
+// fonts
+$base_font_size: 11pt;
$font_family: Cantarell, Sans-Serif;
// icons
-$base_icon_size: 1.09em;
+// $base_icon_size: 1.09em;
+$base_icon_size: 16px;
-// stage
+// Stage
stage {
font-family: $font_family;
- @include fontsize($font_size);
+ @include fontsize($base_font_size);
color: $fg_color;
}
/* WIDGETS */
@import 'widgets/app-grid';
-@import 'widgets/app-icons';
@import 'widgets/app-switcher';
@import 'widgets/buttons';
@import 'widgets/calendar';
@@ -64,6 +69,7 @@ stage {
@import 'widgets/corner-ripple';
@import 'widgets/dash';
@import 'widgets/dialogs';
+@import 'widgets/end-session-dialog';
@import 'widgets/entries';
@import 'widgets/hotplug';
@import 'widgets/ibus-popup';
@@ -72,17 +78,20 @@ stage {
@import 'widgets/looking-glass';
@import 'widgets/message-tray';
@import 'widgets/misc';
+@import 'widgets/network-dialog';
@import 'widgets/osd';
@import 'widgets/overview';
@import 'widgets/panel';
@import 'widgets/popovers';
@import 'widgets/screen-shield';
@import 'widgets/scrollbars';
+@import 'widgets/search-entry';
@import 'widgets/search-results';
@import 'widgets/search-results';
@import 'widgets/slider';
@import 'widgets/switches';
@import 'widgets/tiled-previews';
+@import 'widgets/window-picker';
@import 'widgets/workspace-switcher';
// Common Stylings
@@ -92,16 +101,24 @@ stage {
color: $osd_fg_color;
background-color: $osd_bg_color;
border: 1px solid $osd_outer_borders_color;
- border-radius: $base_radius * 3;
+ border-radius: $base_border_radius * 3;
padding: $base_padding;
}
+// Overview panels
+%overview_panel {
+ color: $osd_fg_color;
+ background-color: transparentize($osd_bg_color, 0.1);
+ border: none;
+}
+
// icon tiles
%icon_tile {
+ background-color: transparent; // no background
color: $osd_fg_color;
- border-radius: $base_radius + 4px;
- padding: 6px;
- border: 1px solid transparent;
+ border-radius: $base_border_radius + 4px;
+ padding: $base_padding * 0.5;
+ border: 2px solid transparent;
transition-duration: 100ms;
text-align: center;
}
@@ -122,9 +139,9 @@ stage {
&, &:hover, &:focus, &:active, &:disabled {
box-shadow: none;
- border-color: $_bubble_borders_color;
+ border-color: $bubble_borders_color;
}
- &:hover { background-color: $_hover_bg_color; }
+ &:hover { background-color: $hover_bg_color; }
&:active {
background-color: $selected_bg_color;
color: $selected_fg_color;
@@ -137,7 +154,7 @@ stage {
%bubble_entry {
color: $fg_color;
background-color: darken($bg_color, 2%);
- border-color: $_bubble_borders_color;
+ border-color: $bubble_borders_color;
box-shadow: none;
&:focus { border: 2px solid $selected_bg_color; }
}
@@ -147,36 +164,35 @@ stage {
border-right-width: 1px;
@include button(normal, $c:$bg_color, $tc:$fg_color);
padding: $base_padding;
- border-top: 1px solid $_bubble_borders_color;
+ border-top: 1px solid $bubble_borders_color;
&:insensitive { @include button(insensitive, $c:$bg_color, $tc:$fg_color); }
- &:hover { @include button(hover, $c:$_hover_bg_color, $tc:$fg_color); }
- &:focus { @include button(focus, $c:$_hover_bg_color, $tc:$fg_color); }
- &:active { @include button(active, $c:$_active_bg_color, $tc:$fg_color); }
+ &:hover { @include button(hover, $c:$hover_bg_color, $tc:$fg_color); }
+ &:focus { @include button(focus, $c:$hover_bg_color, $tc:$fg_color); }
+ &:active { @include button(active, $c:$active_bg_color, $tc:$fg_color); }
&:first-child {
- border-radius: 0px 0px 0px $modal_radius;
+ border-radius: 0px 0px 0px $dialog_border_radius;
}
&:last-child {
border-right-width: 0px;
- border-radius: 0px 0px $modal_radius 0px;
+ border-radius: 0px 0px $dialog_border_radius 0px;
}
&:first-child:last-child {
border-right-width: 0px;
- border-radius: 0px 0px $modal_radius $modal_radius;
+ border-radius: 0px 0px $dialog_border_radius $dialog_border_radius;
}
}
-
// button styling
%button {
- border-radius: $base_radius;
+ border-radius: $base_border_radius;
border-width: 1px;
min-height: 22px;
padding: calc($base_padding * 0.25) calc($base_padding * 2);
@include button(normal);
- &:focus { @include button(focus, $c:$_hover_bg_color, $tc:$fg_color); }
- &:hover { @include button(hover, $c:$_hover_bg_color, $tc:$fg_color); }
+ &:focus { @include button(focus, $c:$hover_bg_color, $tc:$fg_color); }
+ &:hover { @include button(hover, $c:$hover_bg_color, $tc:$fg_color); }
&:insensitive { @include button(insensitive); }
- &:active { @include button(active, $c:$_active_bg_color, $tc:$fg_color); }
+ &:active { @include button(active, $c:$active_bg_color, $tc:$fg_color); }
}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
index 928281eefd..187cdd9f17 100644
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -1,31 +1,168 @@
-/* App Vault/Grid */
+/* App Grid */
$app_icon_size: 96px;
$app_icon_padding: 20px;
-
// app icons
.icon-grid {
spacing: 30px;
-shell-grid-horizontal-item-size: calc($app_icon_size + ($app_icon_padding * 2));
-shell-grid-vertical-item-size: calc($app_icon_size + ($app_icon_padding * 2));
- .overview-icon { icon-size: $app_icon_size; }
+ .overview-icon {
+ icon-size: $app_icon_size;
+ }
}
+
//.app-display { spacing: 20px; }
+/* App Icons */
+
+$app_grid_fg_color: #fff;
+
+// Outline for low res icons
+.lowres-icon {
+ icon-shadow: 0 1px 2px rgba(0,0,0,0.3);
+}
+
+// Dropshadow for large icons
+.icon-dropshadow {
+ icon-shadow: 0 1px 2px rgba(0,0,0,0.4);
+}
+
+// Icon tiles in the app grid
+.app-well-app,
+.app-folder {
+
+ .overview-icon {
+ color: $app_grid_fg_color !important;
+ @extend %icon_tile;
+ }
+
+ &:hover,
+ &:selected {
+ .overview-icon {
+ background-color: transparentize($osd_bg_color,0.7);
+ color: $app_grid_fg_color;
+ }
+ }
+
+ &:hover .overview-icon,
+ &:focus .overview-icon,
+ &:selected .overview-icon {
+ background-color: transparentize($osd_fg_color,0.9);
+ color: $osd_fg_color;
+ }
+
+ &:focus {
+ .overview-icon {
+ background-color: transparentize($selected_bg_color,0.5);
+ border-color: $selected_bg_color;
+ color: $app_grid_fg_color;
+ }
+ }
+
+ &:drop {
+ .overview-icon {
+ background-color: transparentize($selected_bg_color,.15);
+ }
+ }
+
+ &:active,
+ &:checked {
+ .overview-icon {
+ background-color: transparentize(darken($osd_bg_color,10%), 0.5);
+ }
+ }
+}
+
+/* App Folders */
+.app-folder {
+ .overview-icon {
+ @extend %icon_tile;
+ }
+}
+
+//expanded folder
+.app-folder-popup {
+ -arrow-border-radius: 8px;
+ -arrow-background-color: transparentize(darken($osd_bg_color,10%), 0.5);
+ -arrow-base: 24px;
+ -arrow-rise: 11px;
+}
+
+.app-folder-popup-bin { padding: 5px; }
+.app-folder-icon {
+ padding: 5px;
+ spacing-rows: 5px;
+ spacing-columns: 5px;
+}
+
+
+// Running app indicator (also shown in dash)
+.app-well-app-running-dot {
+ height: 5px;
+ width: 5px;
+ border-radius:5px;
+ background-color: $osd_fg_color;
+ margin-bottom: 1px;
+}
+
+// App Grid pagination indicators
+.page-indicator {
+ padding: 15px 20px;
+
+ .page-indicator-icon {
+ width: 12px;
+ height: 12px;
+ background-color: transparent;
+ border: 2px solid rgba(255, 255, 255, 0.4);
+ border-radius: 12px;
+ }
+
+ &:hover .page-indicator-icon { border-color: white; }
+ &:active .page-indicator-icon { border: none; margin: 2px; background-color: white; }
+ &:checked .page-indicator-icon,
+ &:checked:active .page-indicator-icon { background-color: white;}
+}
+
+
+// Some hacks I don't even know
+.all-apps,
+.frequent-apps > StBoxLayout {
+ // horizontal padding to make sure scrollbars or dash don't overlap content
+ padding: 0px 88px 10px 88px;
+}
+
+.app-well-app > .overview-icon.overview-icon-with-label {
+ padding: 10px 8px 5px 8px;
+ spacing: $base_spacing;
+}
+
+// Label when no frequent apps
+.no-frequent-applications-label {
+ font-size: 2em;
+ font-weight: bold;
+ color: $osd_fg_color;
+}
+
+// shutdown and other actions in the grid
.system-action-icon {
background-color: rgba(0,0,0,0.8);
- color: white;
+ color: #fff;
border-radius: 50%;
icon-size: calc($app_icon_size * 0.5);
}
-.app-view-controls { //favorties | all toggle container
+/* Frequent | All toggle */
+
+// container
+.app-view-controls {
padding-bottom: 32px;
}
-.app-view-control { //favorties | all toggle button
+// buttons
+.app-view-control {
padding: 4px 32px;
margin: 0 4px;
&, &:hover, &:checked { @include button(undecorated); }
diff --git a/data/theme/gnome-shell-sass/widgets/_app-switcher.scss
b/data/theme/gnome-shell-sass/widgets/_app-switcher.scss
index 4a5db140af..bdc66c0b46 100644
--- a/data/theme/gnome-shell-sass/widgets/_app-switcher.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-switcher.scss
@@ -5,39 +5,45 @@
spacing: $base_spacing * 4;
}
+// switcher onscreen panel
.switcher-list {
@extend %osd_panel;
-}
-
-.switcher-list-item-container { spacing: $base_spacing * 2; }
-
-.switcher-list .item-box {
- padding: 8px;
- border-radius: 4px;
-}
-.switcher-list .item-box:outlined {
- padding: 6px;
- border: 2px solid darken($borders_color,10%);
-}
+ .item-box {
+ padding: 8px;
+ border-radius: $base_border_radius + 1px;
+ border: 1px solid transparent;
+
+ &:outlined {
+ border: 1px solid darken($borders_color,5%);
+ background-color: transparentize($osd_fg_color, 0.9);
+ box-shadow: inset 0 2px 2px 0 rgba(0,0,0,0.4);
+ }
+
+ &:selected {
+ background-color: transparentize($osd_fg_color, 0.9);
+ color: $selected_fg_color;
+ }
+ }
-.switcher-list .item-box:selected {
- background-color: transparentize($osd_fg_color, 0.7);
- color: $selected_fg_color;
-}
+ // window thumbnails
+ .thumbnail-box {
+ padding: 2px;
+ spacing: $base_spacing;
+ }
-.switcher-list .thumbnail-box {
- padding: 2px;
- spacing: $base_spacing;
-}
+ .thumbnail {
+ width: 256px;
+ }
-.switcher-list .thumbnail {
- width: 256px;
-}
+ .separator {
+ width: 1px;
+ background: $borders_color;
+ }
-.switcher-list .separator {
- width: 1px;
- background: $borders_color;
+ .switcher-list-item-container {
+ spacing: $base_spacing * 2;
+ }
}
.switcher-arrow {
@@ -46,13 +52,4 @@
&:highlighted {
color: $fg_color;
}
-}
-
-.input-source-switcher-symbol {
- font-size: 34pt;
- width: 96px;
- height: 96px;
-}
-
-/* Window Cycler */
-.cycler-highlight { border: 5px solid $selected_bg_color; }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_buttons.scss
b/data/theme/gnome-shell-sass/widgets/_buttons.scss
index 6bbfd2474b..25d347122e 100644
--- a/data/theme/gnome-shell-sass/widgets/_buttons.scss
+++ b/data/theme/gnome-shell-sass/widgets/_buttons.scss
@@ -1,5 +1,5 @@
/* Buttons */
.button {
- @extend %button;
-}
\ No newline at end of file
+ @extend %button; // that's it
+}
diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss
b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index 8f07a21b37..6383135cbb 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -1,19 +1,21 @@
-/* Calendar */
+/* Date/Time Menu */
-// calendar popover
#calendarArea {
- padding: 0.75em 1.0em;
+ padding:$base_padding;
+ margin:0;
}
-.calendar {
- margin-bottom: 1em;
+// common style
+%calendar_box {
+ border: 1px solid $bubble_borders_color;
+ border-radius:$base_border_radius + 2px;
+ background-color: lighten($bg_color, 5%);
}
-.calendar,
+
.datemenu-today-button,
-.datemenu-displays-box,
-.message-list-sections {
- margin: 0 1.5em;
+.datemenu-displays-box {
+ margin:0;
}
.datemenu-calendar-column { spacing: 0.5em; }
@@ -21,9 +23,10 @@
.datemenu-displays-box { spacing: 1em; }
.datemenu-calendar-column {
- border: 0 solid $_bubble_borders_color;
- &:ltr { border-left-width: 1px; }
+ border: 0 solid $bubble_borders_color;
+ &:ltr { border-left-width: 1px; }app_icon_size
&:rtl { border-right-width: 1px; }
+ padding: 0 12px;
}
.datemenu-today-button,
@@ -34,6 +37,11 @@
padding: .4em;
}
+/* Message List */
+.message-list-sections {
+ margin:0;
+}
+
.message-list-section-list:ltr {
padding-left: .4em;
}
@@ -42,69 +50,30 @@
padding-right: .4em;
}
+/* Calendar */
+.calendar {
+ @extend %calendar_box;
+ margin:0;
+ margin-bottom: $base_padding;
+ padding:$base_padding * 0.5;
+}
+
.datemenu-today-button,
.world-clocks-button,
.weather-button,
.events-section-title {
- &:hover, &:focus { background-color: $_hover_bg_color }
- &:active { background-color: $_active_bg_color }
+ &:hover, &:focus { background-color: $hover_bg_color }
+ &:active { background-color: $active_bg_color }
}
.datemenu-today-button .day-label {
-}
-
-.datemenu-today-button .date-label {
- font-size: 1.5em;
- font-weight: 300;
-}
-
-// world clocks
-.world-clocks-header,
-.weather-header,
-.events-section-title {
- color: darken($fg_color,40%);
+ font-size: $base_font_size + 1pt;
font-weight: bold;
}
-.weather-header.location {
- font-weight: normal;
- font-size: 0.9em;
-}
-
-.world-clocks-grid,
-.weather-grid {
- spacing-rows: 0.4em;
- spacing-columns: 0.8em;
-}
-
-.weather-box {
- spacing: 0.4em;
-}
-
-.world-clocks-city {
- font-weight: bold;
- font-size: 0.9em;
-}
-
-.world-clocks-time {
- color: darken($fg_color,20%);
- font-feature-settings: "tnum";
- font-size: 1.2em;
-}
-
-.world-clocks-timezone {
- color: $fg_color;
- font-feature-settings: "tnum";
- font-size: 0.9em;
-}
-
-.weather-forecast-icon {
- icon-size: 2.18em;
-}
-
-.weather-forecast-time {
- color: darken($fg_color,40%);
- font-size: 0.8em;
+.datemenu-today-button .date-label {
+ font-size: $base_font_size * 1.5;
+ font-weight: 1000;
}
.calendar-month-label {
@@ -116,32 +85,40 @@
.pager-button {
background-color: transparent;
+ height: 32px;
width: 32px;
- border-radius: 4px;
- &:hover, &:focus { background-color: $_hover_bg_color; }
+ border-radius: $base_border_radius;
+ &:hover, &:focus { background-color: $hover_bg_color; }
&:active { background-color: transparentize($fg_color, 0.84); }
}
-.calendar-change-month-back StIcon, .calendar-change-month-forward StIcon { // arrows
+// prev/next month icons
+.calendar-change-month-back StIcon,
+.calendar-change-month-forward StIcon {
icon-size: $base_icon_size;
}
+$calendar_day_size: 32px;
+
.calendar-day-base {
font-size: 80%;
text-align: center;
- width: 2.4em; height: 2.4em;
- padding: 0.1em;
+ width: $calendar_day_size;
+ height: $calendar_day_size;
+ padding: 0;
margin: 2px;
- border-radius: 1.4em;
+ border-radius: $calendar_day_size * 0.5 + 2px;
+ border: 1px solid transparent; //avoid jumparound due to today
font-feature-settings: "tnum";
- &:hover, &:focus { background-color: $_hover_bg_color; }
+ &:hover, &:focus { background-color: $hover_bg_color; }
&:active,&:selected {
- color: lighten($selected_fg_color,5%);
- background-color: $selected_bg_color;
- border-color: transparent; //avoid jumparound due to today
+ color: lighten($fg_color,10%);
+ background-color: darken($bg_color,5%);
}
- &.calendar-day-heading { //day of week heading
- color: lighten($fg_color,5%);
+
+ // day of week heading
+ &.calendar-day-heading {
+ color: lighten($fg_color,10%);
margin-top: 1em;
font-size: 70%;
}
@@ -149,36 +126,120 @@
.calendar-day { //border collapse hack - see calendar.js
border-width: 0;
}
-.calendar-day-top { border-top-width: 1px; }
-.calendar-day-left { border-left-width: 1px; }
-.calendar-work-day {
+.calendar-day-top {
+ border-top-width: 1px;
}
+
+.calendar-day-left { border-left-width: 1px; }
+.calendar-work-day {}
.calendar-nonwork-day {
color: $insensitive_fg_color;
}
+
+// Today
.calendar-today {
font-weight: bold;
- //color: lighten($fg_color,10%);
- //background-color: darken($bg_color,5%);
- border: 1px solid $_bubble_borders_color;
+ border: 1px solid transparent;
+ background-color: $selected_bg_color;
+ color: $selected_fg_color;
+
+ &:hover,&:focus {
+ background-color:lighten($selected_bg_color, 3%);
+ color: $selected_fg_color;
+ }
+
+ &:active,&:selected {
+ background-color: $selected_bg_color;
+ color: $selected_fg_color;
+ &:hover,&:focus {
+ background-color:lighten($selected_bg_color, 3%);
+ color: $selected_fg_color;
+ }
+ }
+
}
.calendar-day-with-events {
color: lighten($fg_color,10%);
font-weight: bold;
background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
}
+
.calendar-other-month-day {
color: transparentize($fg_color ,0.5);
opacity: 0.5;
}
+
.calendar-week-number {
font-size: 70%;
font-weight: bold;
- width: 2.3em; height: 1.8em;
+ height: 1.8em;
+ width: 2.3em;
border-radius: 2px;
padding: 0.5em 0 0;
margin: 6px;
- background-color: $_bubble_borders_color;
+ background-color: darken($bg_color, 2%);
+ color: lighten($fg_color, 5%);
+}
+
+
+.world-clocks-button,
+.weather-button {
+ @extend %calendar_box;
+}
+
+/* Weather */
+.weather-box {
+ spacing: 0.4em;
+ padding:$base_padding * 0.5;
+}
+
+.weather-header.location {
+ font-weight: normal;
+ font-size: 0.9em;
+}
+
+
+/* World clocks */
+.world-clocks-header,
+.weather-header,
+.events-section-title {
+ color: darken($fg_color,40%);
+ font-weight: bold;
+}
+
+.world-clocks-grid {
+ padding:$base_padding * 0.5;
+}
+
+.world-clocks-grid,
+.weather-grid {
+ spacing-rows: 0.4em;
+ spacing-columns: 0.8em;
+}
+
+.world-clocks-city {
+ font-weight: bold;
+ font-size: 0.9em;
+}
+
+.world-clocks-time {
+ color: darken($fg_color,20%);
+ font-feature-settings: "tnum";
+ font-size: 1.2em;
+}
+
+.world-clocks-timezone {
color: $fg_color;
-}
\ No newline at end of file
+ font-feature-settings: "tnum";
+ font-size: 0.9em;
+}
+
+.weather-forecast-icon {
+ icon-size: $base_icon_size * 2;
+}
+
+.weather-forecast-time {
+ color: darken($fg_color,40%);
+ font-size: 0.8em;
+}
diff --git a/data/theme/gnome-shell-sass/widgets/_check-box.scss
b/data/theme/gnome-shell-sass/widgets/_check-box.scss
index 118ed72f3c..b53c9e24e8 100644
--- a/data/theme/gnome-shell-sass/widgets/_check-box.scss
+++ b/data/theme/gnome-shell-sass/widgets/_check-box.scss
@@ -1,4 +1,3 @@
-
/* Check Boxes */
.check-box {
diff --git a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
index 5a28db3028..fcac3f6629 100644
--- a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
+++ b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -1,20 +1,24 @@
+/* Activities Ripple */
+
+$ripple_size: 50px;
-// Activities Ripples
.ripple-box {
- width: 52px;
- height: 52px;
- border-radius: 0 0 52px 0; // radius the size of the box give us the curve
background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
-}
+ // plus + 2px for the border (box-shadow)
+ width: calc(#{$ripple_size} + 2px);
+ height: calc(#{$ripple_size} + 2px);
+ border-radius: 0 0 calc(#{$ripple_size} + 2px) 0; // radius equals the size of the box to give us the
curve
-.ripple-box:rtl { border-radius: 0 0 0 52px; } // just a simple change to the border radius position
+ // just a simple change to the border radius position
+ &:rtl { border-radius: 0 0 0 calc(#{$ripple_size} + 2px); }
+}
// Pointer location
.ripple-pointer-location {
- width: 50px;
- height: 50px;
- border-radius: 25px 25px 25px 25px; // radius the size of the box give us the curve
+ width: $ripple_size;
+ height: $ripple_size;
+ border-radius: calc(#{$ripple_size} * 0.5); // radius equals the size of the box to give us the curve
background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
}
diff --git a/data/theme/gnome-shell-sass/widgets/_dash.scss b/data/theme/gnome-shell-sass/widgets/_dash.scss
index 12914a5d8d..8b85ba5b5d 100644
--- a/data/theme/gnome-shell-sass/widgets/_dash.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dash.scss
@@ -1,44 +1,73 @@
+/* Dash */
-
-
-/* DASHBOARD */
+$dash_placeholder_size: 24px;
#dash {
-
- color: $osd_fg_color;
- background-color: transparentize($osd_bg_color, 0.1);
- border: none;
- font-size: 9pt;
+ @extend %overview_panel;
+ font-size: $base_font_size - 2pt;
padding: 4px 0;
- border-radius: 0px 9px 9px 0px;
+ border-radius: 0px $dialog_border_radius $dialog_border_radius 0px;
&:rtl {
- border-radius: 9px 0 0 9px;
+ border-radius: $dialog_border_radius 0 0 $dialog_border_radius;
}
.placeholder {
background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
background-size: contain;
- height: 24px;
+ height: $dash_placeholder_size;
}
.empty-dash-drop-target {
- width: 24px;
- height: 24px;
+ width: $dash_placeholder_size;
+ height: $dash_placeholder_size;
}
-
}
.dash-item-container > StWidget {
padding: 4px 8px;
}
-.dash-label { //osd tooltip
+// OSD Tooltip
+.dash-label {
border-radius: 7px;
padding: 4px 12px;
color: $osd_fg_color;
background-color: transparentize($osd_bg_color,0.05);
border: 1px solid $osd_outer_borders_color;
text-align: center;
- -x-offset: 8px;
+ -x-offset: 8px; // distance from the dash edge
+}
+
+// Show apps button
+.show-apps {
+ background-color: transparent;
+ color: $osd_fg_color;
+
+ & .overview-icon {
+ @extend %icon_tile;
+ color: $osd_fg_color;
+ }
+
+ &:hover .overview-icon,
+ &:focus .overview-icon,
+ &:selected .overview-icon {
+ background-color: transparentize($osd_fg_color,0.9);
+ color: $osd_fg_color;
+ }
+
+ &:drop .overview-icon {
+ background-color: transparentize($selected_bg_color,.15);
+ }
+
+ &:active .overview-icon,
+ &:checked .overview-icon {
+ background-color: darken($osd_bg_color,10%);
+ }
+}
+
+.show-apps:checked .show-apps-icon,
+.show-apps:focus .show-apps-icon {
+ color: $fg_color;
+ transition-duration: 100ms;
}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
index 74e1116372..82a670d26d 100644
--- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -1,12 +1,7 @@
/* Modal Dialogs */
-
-.headline { font-size: 110%; }
-.lightbox { background-color: black; }
-.flashspot { background-color: white; }
-
.modal-dialog {
- border-radius: $base_radius + 4px;;
+ border-radius: $base_border_radius + 4px;;
@extend %bubble_panel;
.modal-dialog-content-box {
@@ -21,7 +16,7 @@
.run-dialog-button-box { padding-top: 1em; }
.run-dialog-label {
- @include fontsize($font_size + 1.1);
+ @include fontsize($base_font_size + 1.1);
font-weight: normal;
color: $fg_color;
padding-bottom: .4em;
@@ -30,7 +25,7 @@
.mount-dialog-subject,
.end-session-dialog-subject { //this should be a generic header class
- @include fontsize($font_size * 1.3);
+ @include fontsize($base_font_size * 1.3);
}
.modal-dialog-linked-button {
@@ -49,8 +44,8 @@
}
.message-dialog-icon {
- min-width: 48px;
- icon-size: 48px;
+ min-width: $base_icon_size * 3;
+ icon-size: $base_icon_size * 3;
}
.message-dialog-title {
@@ -62,85 +57,10 @@
font-weight: bold;
}
-/* End Session Dialog */
-.end-session-dialog {
- spacing: 42px;
- border: 1px solid $_bubble_borders_color;
-}
-
-.end-session-dialog-list {
- padding-top: 20px;
-}
-
-.end-session-dialog-layout {
- padding-left: 17px;
- &:rtl { padding-right: 17px; }
-}
-
-.end-session-dialog-description {
- width: 28em;
- padding-bottom: 10px;
- &:rtl {
- text-align: right;
- }
-}
-
-.end-session-dialog-warning {
- width: 28em;
- color: $warning_color;
- padding-top: 6px;
- &:rtl {
- text-align: right;
- }
-}
-
-.end-session-dialog-logout-icon {
- border-radius: 99px;
- width: 48px;
- height: 48px;
- background-size: contain;
-}
-
-.end-session-dialog-shutdown-icon {
- color: $fg_color;
- width: 48px;
- height: 48px;
-}
-
-.end-session-dialog-inhibitor-layout {
- spacing: $base_spacing * 4;
- max-height: 200px;
- padding-right: 65px;
- padding-left: 65px;
-}
-
-.end-session-dialog-session-list,
-.end-session-dialog-app-list {
- spacing: 1em;
-}
-
-.end-session-dialog-list-header {
- font-weight: bold;
- &:rtl { text-align: right; }
-}
-
-.end-session-dialog-app-list-item,
-.end-session-dialog-session-list-item {
- spacing: 1em;
-}
-
-.end-session-dialog-app-list-item-name,
-.end-session-dialog-session-list-item-name {
- font-weight: bold;
-}
-
-.end-session-dialog-app-list-item-description {
- color: darken($fg_color,5%);
- font-size: 10pt;
-}
-
/* ShellMountOperation Dialogs */
-.shell-mount-operation-icon { icon-size: 48px; }
+.shell-mount-operation-icon {
+ icon-size: $base_icon_size * 3;
+}
.mount-dialog {
spacing: 24px;
@@ -299,9 +219,9 @@
}
.audio-selection-device {
- border: 1px solid $_bubble_borders_color;
+ border: 1px solid $bubble_borders_color;
border-radius: 12px;
- &:hover,&:focus { background-color: $_hover_bg_color; }
+ &:hover,&:focus { background-color: $hover_bg_color; }
&:active {
background-color: $selected_bg_color;
color: $selected_fg_color;
@@ -314,7 +234,7 @@
}
.audio-selection-device-icon {
- icon-size: 64px;
+ icon-size: $base_icon_size * 4;
}
/* Access Dialog */
@@ -352,47 +272,4 @@
.keyring-dialog-control-table {
spacing-rows: 15px;
spacing-columns: 1em;
-}
-
-/* Network Dialogs */
-
-.nm-dialog {
- @extend %bubble_panel;
- max-height: 34em;
- min-height: 31em;
- min-width: 32em;
-}
-
-.nm-dialog-content {
- spacing: 20px;
- padding: 24px;
-}
-.nm-dialog-header-hbox { spacing: 10px; }
-.nm-dialog-airplane-box { spacing: 12px; }
-
-.nm-dialog-airplane-headline {
- font-weight: bold;
- text-align: center;
-}
-
-.nm-dialog-airplane-text { color: $fg_color; }
-.nm-dialog-header-icon { icon-size: 32px; }
-.nm-dialog-scroll-view { border: 2px solid $borders_color; }
-.nm-dialog-header { font-weight: bold; }
-
-.nm-dialog-item {
- font-size: 110%;
- border-bottom: 1px solid $borders_color;
- padding: $base_padding;
- spacing: 20px;
-}
-
-.nm-dialog-item:selected {
- background-color: $selected_bg_color;
- color: $selected_fg_color;
-}
-
-.nm-dialog-icons { spacing: .5em; }
-.nm-dialog-icon { icon-size: 16px; }
-.no-networks-label { color: #999999; }
-.no-networks-box { spacing: 12px; }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
b/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
new file mode 100644
index 0000000000..19aa993e38
--- /dev/null
+++ b/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
@@ -0,0 +1,80 @@
+/* End Session Dialog */
+
+$end_session_dialog_width: 28em;
+
+.end-session-dialog {
+ spacing: $base_spacing;
+ border: 1px solid $bubble_borders_color;
+}
+
+.end-session-dialog-list {
+ padding-top: 20px;
+}
+
+.end-session-dialog-layout {
+ padding-left: 17px;
+ &:rtl { padding-right: 17px; }
+}
+
+.end-session-dialog-description {
+ width: $end_session_dialog_width;
+ padding-bottom: 10px;
+ &:rtl {
+ text-align: right;
+ }
+}
+
+.end-session-dialog-warning {
+ width: $end_session_dialog_width;
+ color: $warning_color;
+ padding-top: 6px;
+ &:rtl {
+ text-align: right;
+ }
+}
+
+// user profile picture
+.end-session-dialog-logout-icon {
+ border-radius: 99px;
+ width: $base_icon_size * 3;
+ height: $base_icon_size * 3;
+ background-size: contain;
+}
+
+.end-session-dialog-shutdown-icon {
+ color: $fg_color;
+ width: $base_icon_size * 3;
+ height: $base_icon_size * 3;
+}
+
+.end-session-dialog-inhibitor-layout {
+ spacing: $base_spacing * 4;
+ max-height: 200px;
+ padding-right: 65px;
+ padding-left: 65px;
+}
+
+.end-session-dialog-session-list,
+.end-session-dialog-app-list {
+ spacing: 1em;
+}
+
+.end-session-dialog-list-header {
+ font-weight: bold;
+ &:rtl { text-align: right; }
+}
+
+.end-session-dialog-app-list-item,
+.end-session-dialog-session-list-item {
+ spacing: 1em;
+}
+
+.end-session-dialog-app-list-item-name,
+.end-session-dialog-session-list-item-name {
+ font-weight: bold;
+}
+
+.end-session-dialog-app-list-item-description {
+ color: darken($fg_color,5%);
+ font-size: 10pt;
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_entries.scss
b/data/theme/gnome-shell-sass/widgets/_entries.scss
index 5240ddef0a..99881c9602 100644
--- a/data/theme/gnome-shell-sass/widgets/_entries.scss
+++ b/data/theme/gnome-shell-sass/widgets/_entries.scss
@@ -1,8 +1,7 @@
/* Entries */
-$entry_radius: $base_radius;
StEntry {
- border-radius: $entry_radius;
+ border-radius: $base_border_radius;
padding: 4px;
border-width: 1px;
color: $fg_color;
diff --git a/data/theme/gnome-shell-sass/widgets/_hotplug.scss
b/data/theme/gnome-shell-sass/widgets/_hotplug.scss
index 4db1bf1b4f..04e4185ef8 100644
--- a/data/theme/gnome-shell-sass/widgets/_hotplug.scss
+++ b/data/theme/gnome-shell-sass/widgets/_hotplug.scss
@@ -22,7 +22,7 @@
.hotplug-resident-mount {
spacing: $base_spacing * 2;
border-radius: 4px;
- &:hover { background-color: $_hover_bg_color; }
+ &:hover { background-color: $hover_bg_color; }
}
.hotplug-resident-mount-label {
@@ -43,4 +43,4 @@
padding: 7px;
border-radius: 5px;
color: pink;
-}
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_ibus-popup.scss
b/data/theme/gnome-shell-sass/widgets/_ibus-popup.scss
index a84e261029..e8fee85e35 100644
--- a/data/theme/gnome-shell-sass/widgets/_ibus-popup.scss
+++ b/data/theme/gnome-shell-sass/widgets/_ibus-popup.scss
@@ -1,6 +1,4 @@
-
// IBus Candidate Popup
-
.candidate-popup-content {
padding: 0.5em;
spacing: 0.3em;
@@ -13,7 +11,7 @@
.candidate-box {
padding: 0.3em 0.5em 0.3em 0.5em;
- border-radius: $base_radius;
+ border-radius: $base_border_radius;
&:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
}
@@ -27,6 +25,6 @@
padding: 4px;
}
-.candidate-page-button-previous { border-radius: $base_radius 0px 0px $base_radius; border-right-width: 0; }
-.candidate-page-button-next { border-radius: 0px $base_radius $base_radius 0px; }
+.candidate-page-button-previous { border-radius: $base_border_radius 0px 0px $base_border_radius;
border-right-width: 0; }
+.candidate-page-button-next { border-radius: 0px $base_border_radius $base_border_radius 0px; }
.candidate-page-button-icon { icon-size: 1em; }
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_keyboard.scss
b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
index 517b3e4c8a..8119300df2 100644
--- a/data/theme/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
@@ -1,18 +1,18 @@
/* On-screen Keyboard */
-$_key_bg: opacify(lighten($osd_bg_color, 9%), 1);
-$_default_key_bg: opacify($osd_bg_color, 1);
+$key_bg: opacify(lighten($osd_bg_color, 9%), 1);
+$default_key_bg: opacify($osd_bg_color, 1);
#keyboard {
background-color: transparentize($osd_bg_color, 0.3);
.page-indicator {
- padding: 4px;
+ padding: 4px;
- .page-indicator-icon {
- width: 6px;
- height: 6px
- }
+ .page-indicator-icon {
+ width: 6px;
+ height: 6px
+ }
}
}
@@ -22,17 +22,17 @@ $_default_key_bg: opacify($osd_bg_color, 1);
}
.keyboard-key {
- background-color: $_key_bg;
- border-radius: $base_radius;
+ background-color: $key_bg;
+ border-radius: $base_border_radius;
border: 1px solid $osd_outer_borders_color;
color: $osd_fg_color;
- font-size: $font_size + 5pt;
+ font-size: $base_font_size + 5pt;
min-height: 1.2em;
min-width: 1.2em;
&:focus { @include button(focus); }
- &:hover, &:checked { background-color: lighten($_key_bg, 3%); }
- &:active { background-color: darken($_key_bg, 2%); }
+ &:hover, &:checked { background-color: lighten($key_bg, 3%); }
+ &:active { background-color: darken($key_bg, 2%); }
&:grayed { //FIXME
background-color: $osd_bg_color;
color: $osd_fg_color;
@@ -41,10 +41,10 @@ $_default_key_bg: opacify($osd_bg_color, 1);
&.default-key {
border-color: $osd_outer_borders_color;
- background-color: $_default_key_bg;
+ background-color: $default_key_bg;
background-size: 20px;
- &:hover, &:checked { background-color: lighten($_default_key_bg, 3%); }
- &:active { background-color: darken($_default_key_bg, 2%); }
+ &:hover, &:checked { background-color: lighten($default_key_bg, 3%); }
+ &:active { background-color: darken($default_key_bg, 2%); }
}
// enter key is suggested-action
@@ -94,7 +94,7 @@ $_default_key_bg: opacify($osd_bg_color, 1);
// suggestions
.word-suggestions {
- font-size: $font_size + 3pt;
+ font-size: $base_font_size + 3pt;
spacing: 12px;
min-height: 20pt;
}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
index 54a4a7d3d1..1a33f2a9a2 100644
--- a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
@@ -1,5 +1,4 @@
-Z
-// LOGIN DIALOG
+/* Login Dialog */
.login-dialog-banner-view {
padding-top: 24px;
@@ -11,12 +10,11 @@ Z
border: none;
background-color: transparent;
- $_gdm_fg: #f6f5f4;
$_gdm_bg: lighten(#2e3436, 19%);
StEntry {
@extend %search_entry;
- border-radius: $base_radius;
+ border-radius: $base_border_radius;
@if $variant=='dark' {
$_gdm_entry_bg: transparentize(lighten(desaturate(#241f31, 20%), 2%), 0.5);
background-color: $_gdm_entry_bg;
@@ -31,7 +29,7 @@ Z
box-shadow: 0 1px 3px transparentize($shadow_color, 0.02);
background-color: $_gdm_bg;
border-color: $_gdm_bg;
- color: $_gdm_fg;
+ color: $fg_color;
$_hover_c: lighten($_gdm_bg, 5%);
&:hover, &:focus {
@@ -48,7 +46,7 @@ Z
@include button(insensitive);
border-color: darken($_gdm_bg, 5%);
background-color: darken($_gdm_bg, 5%);
- color: transparentize($_gdm_fg, 0.3);
+ color: transparentize($fg_color, 0.3);
}
&:default {
@include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
@@ -75,79 +73,82 @@ Z
}
}
- .login-dialog-logo-bin { padding: 24px 0px; }
- .login-dialog-banner { color: darken($osd_fg_color,10%); }
- .login-dialog-button-box { spacing: 5px; }
- .login-dialog-message-warning { color: $warning_color; }
- .login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
- .login-dialog-user-selection-box { padding: 100px 0px; }
- .login-dialog-not-listed-label {
- padding-left: 2px;
- .login-dialog-not-listed-button:focus &,
- .login-dialog-not-listed-button:hover & {
- color: $osd_fg_color;
- }
- }
- .login-dialog-not-listed-label {
- font-size: 90%;
- font-weight: bold;
- color: darken($osd_fg_color,30%);
- padding-top: 1em;
+.login-dialog-logo-bin { padding: 24px 0px; }
+.login-dialog-banner { color: darken($osd_fg_color,10%); }
+.login-dialog-button-box { spacing: 5px; }
+.login-dialog-message-warning { color: $warning_color; }
+.login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
+.login-dialog-user-selection-box { padding: 100px 0px; }
+.login-dialog-not-listed-label {
+ padding-left: 2px;
+ .login-dialog-not-listed-button:focus &,
+ .login-dialog-not-listed-button:hover & {
+ color: $osd_fg_color;
}
+}
- .login-dialog-user-list-view { -st-vfade-offset: 1em; }
- .login-dialog-user-list {
- spacing: 12px;
- width: 23em;
- &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color;
color: $selected_fg_color; }
- &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid
$selected_bg_color; }
- }
- .login-dialog-user-list-item {
- border-radius: 5px;
- padding: 6px;
- color: darken($osd_fg_color,30%);
- &:ltr .user-widget { padding-right: 1em; }
- &:rtl .user-widget { padding-left: 1em; }
- .login-dialog-timed-login-indicator {
- height: 2px;
- margin-top: 6px;
- background-color: $osd_fg_color;
- }
- &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
- }
+.login-dialog-not-listed-label {
+ font-size: 90%;
+ font-weight: bold;
+ color: darken($osd_fg_color,30%);
+ padding-top: 1em;
+}
- .login-dialog-username,
- .user-widget-label {
- color: $osd_fg_color;
- font-size: 120%;
- font-weight: bold;
- text-align: left;
- padding-left: 15px;
- }
- .user-widget-label {
- &:ltr { padding-left: 14px; }
- &:rtl { padding-right: 14px; }
- }
+.login-dialog-user-list-view { -st-vfade-offset: 1em; }
+.login-dialog-user-list {
+ spacing: 12px;
+ width: 23em;
+ &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color:
$selected_fg_color; }
+ &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
+}
- .login-dialog-prompt-layout {
- padding-top: 24px;
- padding-bottom: 12px;
- spacing: $base_spacing * 2;
- width: 23em;
+.login-dialog-user-list-item {
+ border-radius: 5px;
+ padding: 6px;
+ color: darken($osd_fg_color,30%);
+ &:ltr .user-widget { padding-right: 1em; }
+ &:rtl .user-widget { padding-left: 1em; }
+ .login-dialog-timed-login-indicator {
+ height: 2px;
+ margin-top: 6px;
+ background-color: $osd_fg_color;
}
+ &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
+}
- .login-dialog-prompt-label {
- color: darken($osd_fg_color, 20%);
- font-size: 110%;
- padding-top: 1em;
- }
+.login-dialog-username,
+.user-widget-label {
+ color: $osd_fg_color;
+ font-size: 120%;
+ font-weight: bold;
+ text-align: left;
+ padding-left: 15px;
+}
- .login-dialog-session-list-button StIcon {
- icon-size: 1.25em;
- }
+.user-widget-label {
+ &:ltr { padding-left: 14px; }
+ &:rtl { padding-right: 14px; }
+}
- .login-dialog-session-list-button {
- color: darken($osd_fg_color,30%);
- &:hover,&:focus { color: $osd_fg_color; }
- &:active { color: darken($osd_fg_color, 50%); }
- }
+.login-dialog-prompt-layout {
+ padding-top: 24px;
+ padding-bottom: 12px;
+ spacing: $base_spacing * 2;
+ width: 23em;
+}
+
+.login-dialog-prompt-label {
+ color: darken($osd_fg_color, 20%);
+ font-size: 110%;
+ padding-top: 1em;
+}
+
+.login-dialog-session-list-button StIcon {
+ icon-size: 1.25em;
+}
+
+.login-dialog-session-list-button {
+ color: darken($osd_fg_color,30%);
+ &:hover,&:focus { color: $osd_fg_color; }
+ &:active { color: darken($osd_fg_color, 50%); }
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
b/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
index 6bdb46d68f..8792677ab8 100644
--- a/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
+++ b/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
@@ -7,11 +7,11 @@
padding: 4px;
border: 2px solid transparentize($osd_fg_color, 0.8);
border-top-width:0;
- border-radius: 0 0 $base_radius $base_radius;
+ border-radius: 0 0 $base_border_radius $base_border_radius;
& > #Toolbar {
border: none;
- border-radius: $base_radius;
+ border-radius: $base_border_radius;
background-color: darken($osd_bg_color, 10%);
}
@@ -62,7 +62,7 @@
.lg-obj-inspector-button {
border: 1px solid gray;
padding: 4px;
- border-radius: $base_radius;
+ border-radius: $base_border_radius;
&:hover { border: 1px solid #ffffff; }
}
@@ -76,7 +76,7 @@
.lg-extension {
border: 1px solid $osd_borders_color;
- border-radius: $base_radius;
+ border-radius: $base_border_radius;
padding: 4px;
}
@@ -92,6 +92,6 @@
#LookingGlassPropertyInspector {
background: $osd_bg_color;
border: 1px solid $osd_borders_color;
- border-radius: $base_radius;
+ border-radius: $base_border_radius;
padding: 6px;
}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss
b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index 0ad7ee9a9c..71d6d7054d 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -19,9 +19,9 @@
}
.message {
- border: 1px solid $_bubble_borders_color;
+ border: 1px solid $bubble_borders_color;
background-color: lighten($bg_color, 2%);
- &:hover,&:focus { background-color: $_hover_bg_color; }
+ &:hover,&:focus { background-color: $hover_bg_color; }
&:active { background-color: transparentize($fg_color, 0.84) }
border-radius: 5px;
}
diff --git a/data/theme/gnome-shell-sass/widgets/_message-tray.scss
b/data/theme/gnome-shell-sass/widgets/_message-tray.scss
index 3b854b1f56..ce50d4e5d2 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-tray.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-tray.scss
@@ -1,15 +1,15 @@
-/* NOTIFICATIONS & MESSAGE TRAY */
+/* Notifications & Mesage Tray */
$notification_banner_height: 64px;
$notification_banner_width: 34em;
// Banner notifications
.notification-banner {
- font-size: $font_size;
+ font-size: $base_font_size;
width: $notification_banner_width;
margin: 5px;
- border-radius: $modal_radius;
- border: if($variant == 'light', none, $_bubble_borders_color);
+ border-radius: $dialog_border_radius;
+ border: if($variant == 'light', none, $bubble_borders_color);
min-height: $notification_banner_height;
box-shadow: 0 1px 2px transparentize(black, 0.7);
@@ -34,7 +34,7 @@ $notification_banner_width: 34em;
.notification-actions {
padding-top: 0;
color: $fg_color;
- border-top: 1px solid $_bubble_borders_color;
+ border-top: 1px solid $bubble_borders_color;
spacing: 0px;
}
@@ -49,7 +49,7 @@ $notification_banner_width: 34em;
// counter
.summary-source-counter {
- font-size: $font_size - 1pt;
+ font-size: $base_font_size - 1pt;
font-weight: bold;
height: 1.6em;
width: 1.6em;
diff --git a/data/theme/gnome-shell-sass/widgets/_misc.scss b/data/theme/gnome-shell-sass/widgets/_misc.scss
index 22b63f4fa2..f905de0010 100644
--- a/data/theme/gnome-shell-sass/widgets/_misc.scss
+++ b/data/theme/gnome-shell-sass/widgets/_misc.scss
@@ -36,3 +36,20 @@
color: lighten($osd_fg_color,30%);
}
}
+
+// Input Source Switcher
+.input-source-switcher-symbol {
+ font-size: 34pt;
+ width: 96px;
+ height: 96px;
+}
+
+// Window cycler highlight
+.cycler-highlight {
+ border: 5px solid $selected_bg_color;
+}
+
+
+.headline { font-size: 110%; }
+.lightbox { background-color: black; }
+.flashspot { background-color: white; }
diff --git a/data/theme/gnome-shell-sass/widgets/_network-dialog.scss
b/data/theme/gnome-shell-sass/widgets/_network-dialog.scss
new file mode 100644
index 0000000000..f2eb7f3e14
--- /dev/null
+++ b/data/theme/gnome-shell-sass/widgets/_network-dialog.scss
@@ -0,0 +1,57 @@
+/* Network Dialogs */
+.nm-dialog {
+ @extend %bubble_panel;
+ max-height: 34em;
+ min-height: 31em;
+ min-width: 32em;
+}
+
+.nm-dialog-content {
+ spacing: 20px;
+ padding: 24px;
+}
+
+.nm-dialog-airplane-box { spacing: 12px; }
+
+.nm-dialog-airplane-headline {
+ font-weight: bold;
+ text-align: center;
+}
+
+.nm-dialog-airplane-text { color: $fg_color; }
+
+// header
+.nm-dialog-header {
+ font-weight: bold;
+}
+.nm-dialog-header-icon {
+ icon-size: $base_icon_size * 2;
+}
+.nm-dialog-header-hbox { spacing: 10px; }
+
+// list of networks
+.nm-dialog-scroll-view {
+ border: 1px solid $borders_color;
+ padding:0;
+ background-color: darken($bg_color, 3%);
+}
+
+// list item
+.nm-dialog-item {
+ font-size: $base_font_size;
+ border-bottom: 1px solid $borders_color;
+ padding: $base_padding;
+ spacing: 0px;
+ &:selected {
+ background-color: $selected_bg_color;
+ color: $selected_fg_color;
+ }
+}
+
+// icons in list
+.nm-dialog-icon { icon-size: $base_icon_size; }
+.nm-dialog-icons { spacing: $base_spacing * 2; }
+
+// no networks
+.no-networks-label { color: $insensitive_fg_color; }
+.no-networks-box { spacing: $base_padding; }
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_osd.scss b/data/theme/gnome-shell-sass/widgets/_osd.scss
index 5e3da7f43d..ad2d1d119a 100644
--- a/data/theme/gnome-shell-sass/widgets/_osd.scss
+++ b/data/theme/gnome-shell-sass/widgets/_osd.scss
@@ -1,4 +1,3 @@
-
/* OSD */
.osd-window {
@extend %osd_panel;
@@ -23,7 +22,7 @@
/* Pad OSD */
.pad-osd-window {
padding: 32px;
- background-color: transparentize(black, 0.2);
+ background-color: transparentize(#000, 0.2);
.pad-osd-title-box { spacing: 12px; }
.pad-osd-title-menu-box { spacing: 6px; }
@@ -33,6 +32,6 @@
width: 15em;
}
-.resize-popup{
+.resize-popup {
@extend %osd_panel;
}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_overview.scss
b/data/theme/gnome-shell-sass/widgets/_overview.scss
index 6d5b133327..8c3058d3c8 100644
--- a/data/theme/gnome-shell-sass/widgets/_overview.scss
+++ b/data/theme/gnome-shell-sass/widgets/_overview.scss
@@ -6,81 +6,4 @@
.overview-controls {
padding-bottom: 32px;
-}
-
-// Search entry
-.search-entry, %search_entry {
- width: 320px;
- padding: 7px 9px;
- border-radius: 18px;
- color: $fg_color;
- background-color: $base_color;
- border-color: $borders_color;
- &:focus {
- padding: 6px 8px;
- border-width: 2px;
- border-color: $selected_bg_color;
- }
-
- .search-entry-icon {
- icon-size: $base_icon_size;
- padding: 0 4px;
- color: $fg_color;
- }
-
- &:hover, &:focus {
- .search-entry-icon { color: transparentize($fg_color,.3); }
- }
-}
-
-// Windows
-
-.window-picker { //container around window thumbnails
- -horizontal-spacing: $base_spacing * 4;
- -vertical-spacing: $base_spacing * 4;
- padding: 0 16px 16px;
-
- &.external-monitor { padding: 16px; }
-}
-
-.window-clone-border {
- $_bg: transparentize(white, 0.65);
- border: 7px solid $_bg;
- border-radius: $modal_radius;
- // For window decorations with round corners we can't match
- // the exact shape when the window is scaled. So apply a shadow
- // to fix that case
- box-shadow: inset 0 0 0 1px $_bg;
-}
-
-// titles
-.window-caption {
- spacing: 25px;
- color: $selected_fg_color;
- background-color: $selected_bg_color;
- border-radius: 8px;
- padding: 4px 12px;
-}
-
-// close icon
-.window-close {
- background-color: $selected_bg_color;
- color: white;
- border-radius: 24px;
- border: 2px solid $selected_bg_color;
- height: 24px;
- width: 24px;
- -shell-close-overlap: 11px;
- box-shadow: -1px 1px 5px 0px transparentize(black, 0.5);
-
- &:hover {
- background-color: lighten($selected_bg_color, 5%);
- border-color: lighten($selected_bg_color, 5%);
- }
-
- &:active {
- background-color: darken($selected_bg_color, 5%);
- border-color: darken($selected_bg_color, 5%);
- }
-}
-
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index a752abea78..f90a918a3b 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -1,9 +1,9 @@
/* Top Bar */
// a.k.a. the panel
-$panel_corner_radius: $base_radius + 1px;
+$panel_corner_radius: $base_border_radius + 1px;
$panel_bg_color: if($variant == 'light', #fff, #000);
-$panel_fg_color: if($variant == 'light', #2e3436, darken($fg_color, 10%));
+$panel_fg_color: if($variant == 'light', $fg_color, darken($fg_color, 10%));
$panel_height: 1.86em;
#panel {
diff --git a/data/theme/gnome-shell-sass/widgets/_popovers.scss
b/data/theme/gnome-shell-sass/widgets/_popovers.scss
index fb45f68b2f..2ff045bc49 100644
--- a/data/theme/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/theme/gnome-shell-sass/widgets/_popovers.scss
@@ -1,14 +1,16 @@
/* Popovers/Menus */
+$popover_width: 15em;
+
.popup-menu {
- min-width: 15em;
+ min-width: $popover_width;
color: $fg_color;
- border-color: $_bubble_borders_color;
+ border-color: $bubble_borders_color;
.popup-menu-arrow { } //defined globally in the TOP BAR
.popup-sub-menu {
background-color: darken($bg_color,5%);
- box-shadow: inset 0 -1px 0px $_bubble_borders_color;
+ box-shadow: inset 0 -1px 0px $bubble_borders_color;
}
.popup-menu-content { padding: 1em 0em; }
@@ -19,7 +21,7 @@
&:rtl { padding: .4em 0em .4em 1.75em; }
&:checked {
background-color: $bg_color;
- box-shadow: inset 0 -1px 0px $_bubble_borders_color;
+ box-shadow: inset 0 -1px 0px $bubble_borders_color;
font-weight: bold;
}
&.selected {
@@ -33,11 +35,13 @@
&:insensitive { color: transparentize($fg_color,.5); }
}
- .popup-inactive-menu-item { //all icons and other graphical elements
+ //all icons and other graphical elements
+ .popup-inactive-menu-item {
color: $fg_color;
&:insensitive { color: transparentize($fg_color,0.5); }
}
+
//.popup-status-menu-item { font-weight: normal; color: pink; } //dunno what that is
&.panel-menu {
-boxpointer-gap: 4px;
@@ -49,9 +53,10 @@
text-align: right;
width: 1.2em;
}
+
.popup-menu-boxpointer,
.candidate-popup-boxpointer {
- -arrow-border-radius: $base_radius+4;
+ -arrow-border-radius: $base_border_radius+4;
-arrow-background-color: $bg_color;
-arrow-border-width: 1px;
-arrow-border-color: if($variant=='light', transparentize(black, 0.6), $borders_color);
@@ -65,7 +70,7 @@
height: 1px; //not really the whole box
margin: 6px 64px;
background-color: transparent;
- border-color: $_bubble_borders_color;
+ border-color: $bubble_borders_color;
border-bottom-width: 1px;
border-bottom-style: solid;
}
@@ -75,17 +80,14 @@
.popup-menu-icon { icon-size: $base_icon_size; }
-
// Background menu
.background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; }
/* fallback menu
-- odd thing for styling App menu when apparently not running under shell. Light Adwaita styled
- app menu inside the main app window itself rather than the top bar
+- odd thing for styling App menu when apparently not running under shell. Light Adwaita styled app menu
inside the main app window itself rather than the top bar
*/
// a little unstructured mess:
-
#appMenu {
spacing: $base_spacing;
@@ -101,10 +103,16 @@
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; }
+ &: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;
+ }
}
}
@@ -114,10 +122,10 @@
color: $fg_color;
border-radius: 32px; /* wish we could do 50% */
padding: 13px;
- border: 1px solid $_bubble_borders_color;
+ border: 1px solid $bubble_borders_color;
&:hover, &:focus {
- background-color: $_hover_bg_color;
+ background-color: $hover_bg_color;
color: $fg_color;
border: none;
padding: 14px;
diff --git a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
index 48bcd0c45c..0a5da271bb 100644
--- a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
@@ -1,18 +1,18 @@
-//SCREEN SHIELD
+/* Screen Shield */
$_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
.screen-shield-arrows {
- padding-bottom: 3em;
+ padding-bottom: 3em;
}
.screen-shield-arrows Gjs_Arrow {
- color: white;
- width: 80px;
- height: 48px;
- -arrow-thickness: 12px;
- -arrow-shadow: $_screenshield_shadow;
+ color: white;
+ width: 80px;
+ height: 48px;
+ -arrow-thickness: 12px;
+ -arrow-shadow: $_screenshield_shadow;
}
.screen-shield-clock {
diff --git a/data/theme/gnome-shell-sass/widgets/_search-entry.scss
b/data/theme/gnome-shell-sass/widgets/_search-entry.scss
new file mode 100644
index 0000000000..f391306ca1
--- /dev/null
+++ b/data/theme/gnome-shell-sass/widgets/_search-entry.scss
@@ -0,0 +1,33 @@
+// Search entry
+
+$search_entry_width: 320px;
+
+%search_entry,
+.search-entry {
+ width: $search_entry_width;
+ padding: 7px 9px;
+ border-radius: 18px;
+ color: transparentize($fg_color,0.3);
+ background-color: $bg_color;
+ border-color: $borders_color;
+ box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.2);
+
+ &:hover {
+ background-color: $hover_bg_color;
+ border-color: $hover_borders_color;
+ color: $hover_fg_color;
+ }
+
+ &:focus {
+ padding: 6px 8px;
+ border-width: 2px;
+ color: $fg_color;
+ border-color: $selected_bg_color;
+ }
+
+ .search-entry-icon {
+ icon-size: $base_icon_size;
+ padding: 0 4px;
+ color: inherit;
+ }
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_search-results.scss
b/data/theme/gnome-shell-sass/widgets/_search-results.scss
index e69d974d63..490ef7eeac 100644
--- a/data/theme/gnome-shell-sass/widgets/_search-results.scss
+++ b/data/theme/gnome-shell-sass/widgets/_search-results.scss
@@ -1,4 +1,4 @@
-//search results
+/* Search */
#searchResultsContent {
max-width: 1000px;
@@ -7,23 +7,24 @@
}
.search-section {
- // background-color: red;
- padding:$base_padding;
- spacing: 0; // This should be equal to #searchResultsContent spacing
-}
-
-.search-section-content {
- background-color: lighten($osd_bg_color, 5%);
- border-radius: $base_radius * 3;
+ background-color: transparentize(lighten($osd_bg_color, 5%), 0.2);
+ border-radius: $base_border_radius * 3;
border: 1px solid $osd_outer_borders_color;
box-shadow: 0 1px 4px 0 rgba(0,0,0,0.3);
color: $osd_fg_color;
text-shadow: 1px rgba(0,0,0,0.3);
padding: $base_padding;
- spacing: 0; // This is the space between the provider icon and the results container
+ margin-bottom: $base_padding;
+ spacing:0;
+}
+
+
+.search-section-content {
+ spacing: 0;
}
-.search-statustext { // "no results"
+// "no results"
+.search-statustext {
font-size: 2em;
font-weight: bold;
color: $osd_fg_color;
@@ -31,17 +32,67 @@
.search-section-separator {
// height: 2px; background-color: rgba(255, 255, 255, 0.2);
- height: 0px;
- background-color: rgba(255, 255, 255, 0);
+ height: 0;
+ background-color:transparent;
}
.search-section:last-child .search-section-separator { background-color: transparent; }
+// Search results with icons
+.grid-search-result {
+ > .overview-icon {
+ @extend %icon_tile;
+ color: $osd_fg_color;
+ }
+
+ > .overview-icon.overview-icon-with-label {
+ padding: 10px 8px 5px 8px;
+ background-color:red;
+ spacing: $base_spacing;
+ }
+
+ &:hover,
+ &:focus,
+ &:selected {
+ .overview-icon {
+ // background-color: transparentize($osd_bg_color,0.8);
+ background-color: red;
+ color: $osd_fg_color;
+ }
+ }
+
+ &:drop .overview-icon {
+ background-color: transparentize($selected_bg_color,.15);
+ }
+
+ &:active .overview-icon,
+ &:checked .overview-icon {
+ background-color: transparentize(darken($osd_bg_color,10%), 0.5);
+ }
+}
+
// Search results
.list-search-results {
spacing: $base_spacing;
}
+.list-search-result {
+ @extend %icon_tile;
+ spacing: 0;
+ color: $osd_fg_color;
+
+ &:focus,
+ &:selected,
+ &:hover {
+ background-color: transparentize($osd_fg_color,.9);
+ transition-duration: 200ms;
+ }
+ &:active,
+ &:checked {
+ background-color: transparentize(darken($osd_bg_color,10%),.1);
+ }
+}
+
.list-search-result-content {
spacing: 0;
}
@@ -66,6 +117,20 @@
spacing: 20px;
}
+// icons
.search-provider-icon {
- padding: $base_padding;
+ @extend %icon_tile;
+ padding: 0;
+ spacing: 0;
+
+ &:focus,
+ &:selected,
+ &:hover {
+ background-color: transparentize($osd_fg_color,.9);
+ transition-duration: 200ms;
+ }
+ &:active,
+ &:checked {
+ background-color: transparentize(darken($osd_bg_color,10%),.1);
+ }
}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_slider.scss
b/data/theme/gnome-shell-sass/widgets/_slider.scss
index 8fc4dcbfd8..bc7370bd70 100644
--- a/data/theme/gnome-shell-sass/widgets/_slider.scss
+++ b/data/theme/gnome-shell-sass/widgets/_slider.scss
@@ -1,20 +1,21 @@
/* Slider */
.slider {
- height: 1em;
- -barlevel-height: 0.3em;
- -barlevel-background-color: transparentize($fg_color, 0.9); //background of the trough
+ height: 16px;
+ -barlevel-height: 4px;
+ -barlevel-background-color: lighten($borders_color, 5%); //background of the trough
-barlevel-border-color: $borders_color; //trough border color
-barlevel-active-background-color: $selected_bg_color; //active trough fill
- -barlevel-active-border-color: $selected_borders_color; //active trough border
+ -barlevel-active-border-color: $borders_color; //active trough border
-barlevel-overdrive-color: $destructive_color;
- -barlevel-overdrive-border-color: darken($destructive_color,10%);
- -barlevel-overdrive-separator-width: 0.2em;
+ -barlevel-overdrive-border-color: $borders_color;
+ -barlevel-overdrive-separator-width:1px;
-barlevel-border-width: 1px;
-slider-handle-radius: 8px;
-slider-handle-border-width: 1px;
-slider-handle-border-color: $borders_color;
color: if($variant == 'light', lighten($bg_color, 10%), darken($bg_color,4%));
- &:hover { color: $_hover_bg_color; }
- &:active { color: $_active_bg_color; }
+ color: $fg_color;
+ &:hover { color: $hover_bg_color; }
+ &:active { color: $active_bg_color; }
}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_switches.scss
b/data/theme/gnome-shell-sass/widgets/_switches.scss
index c88e67dab4..51dc478f83 100644
--- a/data/theme/gnome-shell-sass/widgets/_switches.scss
+++ b/data/theme/gnome-shell-sass/widgets/_switches.scss
@@ -1,14 +1,16 @@
-
/* Switches */
+
+// these are equal to the size of the SVG assets
+$switch_height: 22px;
+$switch_width: 46px;
+
.toggle-switch {
color: $fg_color;
- width: 46px;
- height: 22px;
+ height: $switch_height;
+ width: $switch_width;
background-size: contain;
- background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-off.svg"),
-
url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"));
+ background-image: if($variant == 'light',
url("resource:///org/gnome/shell/theme/toggle-off.svg"),url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"));
&:checked {
- background-image: if($variant == 'light',
url("resource:///org/gnome/shell/theme/toggle-on.svg"),
-
url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"));
+ background-image: if($variant == 'light',
url("resource:///org/gnome/shell/theme/toggle-on.svg"),url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"));
}
}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_tiled-previews.scss
b/data/theme/gnome-shell-sass/widgets/_tiled-previews.scss
index 6f687319e9..f4b8f54f1d 100644
--- a/data/theme/gnome-shell-sass/widgets/_tiled-previews.scss
+++ b/data/theme/gnome-shell-sass/widgets/_tiled-previews.scss
@@ -1,6 +1,6 @@
/* Tiled window previews */
-$tile_corner_radius: $base_radius + 1px;
+$tile_corner_radius: $base_border_radius + 1px;
.tile-preview {
background-color: transparentize($selected_bg_color,0.5);
border: 1px solid $selected_bg_color;
diff --git a/data/theme/gnome-shell-sass/widgets/_window-picker.scss
b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
new file mode 100644
index 0000000000..5c9d565b94
--- /dev/null
+++ b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
@@ -0,0 +1,66 @@
+/* Window Picker */
+
+$window_picker_spacing: 48px;
+$window_picker_padding: 64px;
+
+$window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);
+
+$window_close_button_size: 24px;
+$window_close_button_padding: 3px;
+
+
+// Window picker
+.window-picker {
+ // Space between window thumbnails
+ -horizontal-spacing: $window_picker_spacing;
+ -vertical-spacing: $window_picker_spacing;
+ // Padding for container around window thumbnails
+ padding: $window_picker_padding;
+
+ &.external-monitor { padding: $window_picker_padding; }
+}
+
+// Borders on window thumbnails
+.window-clone-border {
+ border: 6px solid $window_thumbnail_border_color;
+ border-radius: $base_border_radius + 2px;
+ // For window decorations with round corners we can't match
+ // the exact shape when the window is scaled. So apply a shadow
+ // to fix that case
+ box-shadow: inset 0 0 0 1px transparentize($borders_color, 0.8);
+}
+
+// Window titles
+.window-caption {
+ spacing: 24px;
+ color: $selected_fg_color;
+ background-color: rgba(0,0,0,0.5);
+ border:1px solid rgba(0,0,0,0.6);
+ border-radius: 8px;
+ margin-top: 24px;
+ padding: 4px 12px;
+ font-size: $base_font_size + 1pt;
+ font-weight: bold;
+}
+
+// Close button
+.window-close {
+ background-color: $selected_bg_color;
+ color: $selected_fg_color;
+ border: none;
+ border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
+ padding: $window_close_button_padding;
+ height: $window_close_button_size;
+ width: $window_close_button_size;
+ box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
+
+ -shell-close-overlap: $window_close_button_size * 0.5;
+
+ &:hover {
+ background-color: lighten($selected_bg_color, 5%);
+ }
+
+ &:active {
+ background-color: darken($selected_bg_color, 5%);
+ }
+}
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
b/data/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
index b33eb1bafa..6af04a6fc1 100644
--- a/data/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
+++ b/data/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -1,5 +1,7 @@
/* Workspace Switcher */
-.workspace-switcher-group { padding: $base_padding; }
+.workspace-switcher-group {
+ padding: $base_padding;
+}
.workspace-switcher-container {
@extend %osd_panel;
@@ -13,33 +15,35 @@
spacing: $base_spacing * 2;
}
-.ws-switcher-active-up, .ws-switcher-active-down,
-.ws-switcher-active-left, .ws-switcher-active-right {
+.ws-switcher-active-up,
+.ws-switcher-active-down,
+.ws-switcher-active-left,
+.ws-switcher-active-right {
height: 50px;
background-color: $selected_bg_color;
color: $selected_fg_color;
background-size: 32px;
- border-radius: 8px;
+ border-radius: $base_border_radius + 3px;
}
.ws-switcher-box {
height: 50px;
border: 1px solid transparentize($osd_fg_color,0.9);
background: transparent;
- border-radius: 8px;
+ border-radius: $base_border_radius + 3px;
}
-// Workspace pager
-.workspace-thumbnails { //container ala dash
- color: $osd_fg_color;
- background-color: transparentize($osd_bg_color, 0.1);
- border: none;
+/* Workspace pager */
+
+// thumbnails in overview
+.workspace-thumbnails {
+ @extend %overview_panel;
visible-width: 32px; //amount visible before hover
spacing: 11px;
padding: 8px;
- border-radius: 9px 0 0 9px;
+ border-radius: $dialog_border_radius 0 0 $dialog_border_radius;
//border-width: 1px 0 1px 1px; //fixme: can't have non unoform borders :(
- &:rtl { border-radius: 0 9px 9px 0;}
+ &:rtl { border-radius: 0 $dialog_border_radius $dialog_border_radius 0;}
.placeholder {
background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
@@ -47,7 +51,10 @@
height: 24px;
}
}
+
+// selected indicator
.workspace-thumbnail-indicator {
border: 2px solid $selected_bg_color;
+ border-radius: 2px;
padding: 1px;
}
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
