[gnome-shell/wip/snwh/style-updates] theme: fixes to the calendar popover
- From: Sam Hewitt <snwh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/snwh/style-updates] theme: fixes to the calendar popover
- Date: Wed, 29 Dec 2021 15:08:20 +0000 (UTC)
commit 2d19fd73e0659e05a4b0677c7eb16b98b2d136eb
Author: Sam Hewitt <sam snwh org>
Date: Wed Dec 29 11:35:09 2021 -0330
theme: fixes to the calendar popover
data/gnome-shell-theme.gresource.xml | 1 +
data/theme/calendar-today-dark.svg | 1 +
data/theme/calendar-today.svg | 179 +--------------------
data/theme/gnome-shell-sass/widgets/_calendar.scss | 47 +++---
4 files changed, 27 insertions(+), 201 deletions(-)
---
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index 1be29376c5..df64c24d8c 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -2,6 +2,7 @@
<gresources>
<gresource prefix="/org/gnome/shell/theme">
<file>calendar-today.svg</file>
+ <file>calendar-today-dark.svg</file>
<file
alias="icons/scalable/status/carousel-arrow-next-24-symbolic.svg">carousel-arrow-next-24-symbolic.svg</file>
<file
alias="icons/scalable/status/carousel-arrow-back-24-symbolic.svg">carousel-arrow-back-24-symbolic.svg</file>
<file>checkbox-focused.svg</file>
diff --git a/data/theme/calendar-today-dark.svg b/data/theme/calendar-today-dark.svg
new file mode 100644
index 0000000000..b2d7c653a0
--- /dev/null
+++ b/data/theme/calendar-today-dark.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg";><defs><linearGradient id="a"><stop
style="stop-color:#fff;stop-opacity:1" offset="0"/><stop style="stop-color:#fff;stop-opacity:0"
offset="1"/></linearGradient></defs><circle
style="color:#000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000;solid-opacity:1;fill:#fff;fill-opacity:.85827738;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
cx="481.571" cy="559.465" r="1.5" transform="translate(-469.083 -537.993)"/></svg>
\ No newline at end of file
diff --git a/data/theme/calendar-today.svg b/data/theme/calendar-today.svg
index 5e77084c77..e9bb5083d4 100644
--- a/data/theme/calendar-today.svg
+++ b/data/theme/calendar-today.svg
@@ -1,178 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="24"
- height="24"
- id="svg10621"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="calendar-today.svg">
- <defs
- id="defs10623">
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient34508-1-3"
- id="radialGradient99561-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
- cx="51"
- cy="30"
- fx="51"
- fy="30"
- r="42" />
- <linearGradient
- inkscape:collect="always"
- id="linearGradient34508-1-3">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop34510-1-9" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop34512-4-5" />
- </linearGradient>
- <radialGradient
- r="42"
- fy="30"
- fx="51"
- cy="30"
- cx="51"
- gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient10592"
- xlink:href="#linearGradient34508-1-3"
- inkscape:collect="always" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient34508-1-3"
- id="radialGradient3770"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
- cx="51"
- cy="30"
- fx="51"
- fy="30"
- r="42" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient34508-1-3"
- id="radialGradient3001"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
- cx="51"
- cy="30"
- fx="51"
- fy="30"
- r="42" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient34508-1-3"
- id="radialGradient3007"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
- cx="51"
- cy="30"
- fx="51"
- fy="30"
- r="42" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient34508-1-3"
- id="radialGradient3067"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
- cx="51"
- cy="30"
- fx="51"
- fy="30"
- r="42" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient34508-1-3"
- id="radialGradient3072"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
- cx="51"
- cy="30"
- fx="51"
- fy="30"
- r="42" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient34508-1-3"
- id="radialGradient2997"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
- cx="51"
- cy="30"
- fx="51"
- fy="30"
- r="42" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#000000"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:zoom="8"
- inkscape:cx="-23.537329"
- inkscape:cy="-31.442864"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="2133"
- inkscape:window-height="1241"
- inkscape:window-x="238"
- inkscape:window-y="88"
- inkscape:window-maximized="0"
- borderlayer="true"
- inkscape:showpageshadow="false">
- <inkscape:grid
- type="xygrid"
- id="grid3109"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata10626">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-469.08263,-537.99307)">
- <circle
-
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.23756906;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- id="path7305"
- cx="481.57138"
- cy="559.4649"
- r="1.5" />
- </g>
-</svg>
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg";><defs><linearGradient id="a"><stop
style="stop-color:#fff;stop-opacity:1" offset="0"/><stop style="stop-color:#fff;stop-opacity:0"
offset="1"/></linearGradient></defs><circle
style="color:#000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000;solid-opacity:1;fill:#242424;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
cx="481.571" cy="559.465" r="1.5" transform="translate(-469.083 -537.993)"/></svg>
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss
b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index 33aea17a6b..e98e667726 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -33,7 +33,7 @@
.events-section-title {
@include notification_bubble($flat: true);
- color: desaturate(darken($fg_color,40%), 10%);
+ color: $insensitive_fg_color;
font-weight: bold;
padding: .4em;
}
@@ -46,6 +46,7 @@
// weekday label
.day-label {
@include fontsize($base_font_size+1);
+ color: $insensitive_fg_color;
font-weight: bold;
}
@@ -64,7 +65,7 @@
// month
.calendar-month-label {
color: lighten($fg_color,5%);
- font-weight: bold;
+ font-weight: 1000;
padding: 8px 0;
&:focus {}
}
@@ -80,7 +81,7 @@
height: 32px;
width: 32px;
border-radius: $base_border_radius;
- &:hover, &:focus { background-color: lighten($hover_bg_color, 5%); }
+ &:hover, &:focus { background-color: $hover_bg_color; }
&:active { background-color: $active_bg_color; }
}
@@ -90,13 +91,12 @@
.calendar-day-base {
@include fontsize($base_font_size - 3);
text-align: center;
- width: $calendar_day_size;
- height: $calendar_day_size;
padding: 0;
margin: 2px;
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; }
&:active,&:selected {
color: lighten($fg_color,10%);
@@ -105,8 +105,8 @@
// day of week heading
&.calendar-day-heading {
- color: lighten($fg_color,10%);
- margin-top: 1em;
+ color: $insensitive_fg_color;
+ font-weight: bold;
@include fontsize($base_font_size - 4);
}
}
@@ -123,7 +123,8 @@
border-left-width: 1px;
}
- .calendar-work-day {}
+ .calendar-work-day {
+ }
.calendar-nonwork-day {
color: $insensitive_fg_color;
@@ -131,37 +132,37 @@
// Today
.calendar-today {
- font-weight: bold;
- border: 1px solid transparent;
background-color: $selected_bg_color;
- color: $selected_fg_color;
+ border: 1px solid transparent;
+ font-weight: bold;
+ color: $selected_fg_color !important;
&:hover,&:focus {
background-color:lighten($selected_bg_color, 3%);
- color: $selected_fg_color;
+ color: inherit;
}
&:active,&:selected {
background-color: $selected_bg_color;
- color: $selected_fg_color;
+ color: inherit;
&:hover,&:focus {
background-color:lighten($selected_bg_color, 3%);
- color: $selected_fg_color;
+ color: inherit;
}
}
}
.calendar-day-with-events {
- background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
+ background-image: if($variant=='light', url("resource:///org/gnome/shell/theme/calendar-today.svg"),
url("resource:///org/gnome/shell/theme/calendar-today-dark.svg"));
&.calendar-work-day {
- color: lighten($fg_color,10%);
- font-weight: bold;
+ color: lighten($fg_color,10%);
+ font-weight: bold;
}
}
.calendar-other-month-day {
- color: transparentize($fg_color ,0.5);
+ color: transparentize($fg_color ,0.5) !important;
}
.calendar-week-number {
@@ -190,13 +191,13 @@
}
.events-title {
- color: desaturate(darken($fg_color,40%), 10%);
+ color: $insensitive_fg_color;
font-weight: bold;
margin-bottom: $base_margin;
}
.event-time {
- color: darken($fg_color,20%);
+ color: $insensitive_fg_color;
font-feature-settings: "tnum";
@include fontsize($base_font_size - 1);
}
@@ -214,7 +215,7 @@
// title
.world-clocks-header {
- color: desaturate(darken($fg_color,40%), 10%);
+ color: $insensitive_fg_color;
font-weight: bold;
}
@@ -238,7 +239,7 @@
// timezone offset label
.world-clocks-timezone {
- color: darken($fg_color,20%);
+ color: $insensitive_fg_color;
font-feature-settings: "tnum";
@include fontsize($base_font_size - 1);
}
@@ -258,7 +259,7 @@
}
.weather-header {
- color: desaturate(darken($fg_color,40%), 10%);
+ color: $insensitive_fg_color;
font-weight: bold;
&.location {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
