Theme: update to sync with gtk Adwaita

- consistent OSD colors
- consistent fg/bg colors
- updated rounded corners
- switches

Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/841

NEWS

@@ -1,30 +1,3 @@
-3.33.3
-======
-* Prepare for optional X11 [Carlos; !378]
-* Fix opening window menu [Marco; !557]
-* Reload search providers when installed applications change [Cosimo; !562]
-* Implement locate-pointer accessibility feature [Olivier; #981]
-* Allow to disable window menus via session mode [Cosimo; !569]
-* Implement mouse accessibility [Olivier; !474]
-* Call GDM's RegisterSession() after startup [Iain; !570]
-* Fix extended keys popups being hidden by on-screen keyboard [Marco; !583]
-* Fix top bar being hidden by lock screen [Jonas; !571]
-* Update theme to better match GTK's Adwaita [Frederik; #841]
-* Set up GJS profiler when GJS_TRACE_FD is set [Christian; !573]
-* Misc. bug fixes and cleanups [Jonas, Cosimo, Robert, Florian, Marco, Simon,
-  Laurent, Niels, Will; !551, !555, !464, #1333, !565, !572, !568, !558, #1205,
-  #1336, !579, !576, #1392, !582, !586, #1406, #1351]
-
-Contributors:
-  Laurent Bigonville, Cosimo Cecchi, Piotr Drąg, Jonas Dreßler,
-  Frederik Feichtmeier, Olivier Fourdan, Carlos Garnacho, Niels De Graef,
-  Christian Hergert, Iain Lane, Robert Mader, Florian Müllner, Simon Schampijer,
-  Jakub Steiner, Will Thompson, Marco Trevisan (Treviño)
-
-Translators:
-  Kukuh Syafaat [id], Balázs Meskó [hu], Daniel Mustieles [es],
-  Fabio Tomat [fur], Nathan Follens [nl], Goran Vidović [hr], Jordi Mas [ca]
-
 3.33.2
 ======
 * Fix keeping actors visible in scrollviews [Marco; #1061]

data/theme/gnome-shell-sass/_common.scss

@@ -188,7 +188,7 @@ StScrollBar {
 
 /* Modal Dialogs */
 
-.headline { @extend %heading; }
+.headline { font-size: 110%; }
 .lightbox { background-color: black; }
 .flashspot { background-color: white; }
 
@@ -205,7 +205,8 @@ StScrollBar {
   }
   .run-dialog-button-box { padding-top: 1em; }
   .run-dialog-label {
-    @extend %title-4;
+    @include fontsize($font-size + 1.1);
+    font-weight: normal;
     color: $fg_color;
     padding-bottom: .4em;
   }
@@ -213,8 +214,8 @@ StScrollBar {
 }
 
   .mount-dialog-subject,
-  .end-session-dialog-subject {
-    @extend %title-2;
+  .end-session-dialog-subject { //this should be a generic header class
+    @include fontsize($font-size * 1.3);
   }
 
 /* Message Dialog */
@@ -234,12 +235,12 @@ StScrollBar {
   }
 
   .message-dialog-title {
-    @extend %title-2;
+    font-weight: bold;
   }
 
   .message-dialog-subtitle {
-    @extend %heading;
     color: $fg_color;
+    font-weight: bold;
   }
 
 /* End Session Dialog */
@@ -300,7 +301,7 @@ StScrollBar {
   }
 
   .end-session-dialog-list-header {
-    @extend %heading;
+    font-weight: bold;
     &:rtl { text-align: right; }
   }
 
@@ -311,11 +312,12 @@ StScrollBar {
 
   .end-session-dialog-app-list-item-name,
   .end-session-dialog-session-list-item-name {
-    @extend %heading;
+    font-weight: bold;
   }
 
   .end-session-dialog-app-list-item-description {
     color: darken($fg_color,5%);
+    font-size: 10pt;
   }
 
 /* ShellMountOperation Dialogs */
@@ -371,6 +373,11 @@ StScrollBar {
     &:rtl { padding-left: 17px; }
   }
 
+  .mount-dialog-app-list-item-name {
+    font-size: 10pt;
+  }
+
+
 /* Password or Authentication Dialog */
 
 .prompt-dialog {
@@ -393,11 +400,13 @@ StScrollBar {
   }
 
   .prompt-dialog-error-label {
+    font-size: 10pt;
     color: $warning_color;
     padding-bottom: 8px;
   }
 
   .prompt-dialog-info-label {
+    font-size: 10pt;
     padding-bottom: 8px;
   }
 
@@ -406,6 +415,7 @@ StScrollBar {
   }
 
   .prompt-dialog-null-label {
+    font-size: 10pt;
     padding-bottom: 8px;
   }
 
@@ -461,7 +471,7 @@ StScrollBar {
   }
 
   .audio-selection-title {
-    @extend %heading;
+    font-weight: bold;
     text-align: center;
   }
 
@@ -545,9 +555,9 @@ StScrollBar {
     &:ltr { padding: .4em 1.75em .4em 0em; }
     &:rtl { padding: .4em 0em .4em 1.75em; }
     &:checked {
-      @extend %heading;
       background-color: $bg_color;
       box-shadow: inset 0 -1px 0px $_bubble_borders_color;
+      font-weight: bold;
     }
     &.selected {
       background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
@@ -618,7 +628,7 @@ StScrollBar {
   min-width: 64px;
   min-height: 64px;
 
-  .osd-monitor-label { @extend %title-1; }
+  .osd-monitor-label { font-size: 3em; }
   .level {
     height: 0.6em;
     -barlevel-height: 0.6em;
@@ -791,8 +801,8 @@ StScrollBar {
 /* TOP BAR */
 
 #panel {
-  @extend %heading;
   background-color: black;
+  font-weight: bold;
   height: 1.86em;
   font-feature-settings: "tnum";
 
@@ -824,9 +834,9 @@ StScrollBar {
   }
 
   .panel-button {
-    @extend %heading;
     -natural-hpadding: 12px;
     -minimum-hpadding: 6px;
+    font-weight: bold;
     color: #ccc;
 
     .app-menu-icon {
@@ -923,28 +933,28 @@ StScrollBar {
     }
 
     .datemenu-today-button .day-label {
-      @extend %heading;
     }
 
     .datemenu-today-button .date-label {
-      @extend %large-title;
+      font-size: 1.5em;
+      font-weight: 300;
     }
 
     .world-clocks-header,
     .weather-header,
-    .events-section-title,
-    .calendar-month-label {
-      @extend %heading;
+    .events-section-title {
       color: darken($fg_color,40%);
+      font-weight: bold;
     }
 
     .weather-header.location {
-      @extend %caption;
+      font-weight: normal;
+      font-size: 0.9em;
     }
 
     .world-clocks-grid,
     .weather-grid {
-      spacing-rows: 0.8em;
+      spacing-rows: 0.4em;
       spacing-columns: 0.8em;
     }
 
@@ -952,26 +962,35 @@ StScrollBar {
       spacing: 0.4em;
     }
 
+    .world-clocks-city {
+      font-weight: bold;
+      font-size: 0.9em;
+    }
+
     .world-clocks-time {
-        font-feature-settings: "tnum";
+      color: darken($fg_color,20%);
+      font-feature-settings: "tnum";
+      font-size: 1.2em;
     }
 
     .world-clocks-timezone {
-      color: darken($fg_color,40%);
+      color: $fg_color;
       font-feature-settings: "tnum";
-      @extend %caption;
+      font-size: 0.9em;
     }
 
     .weather-forecast-icon {
-      icon-size: 32px;
+      icon-size: 2.18em;
     }
 
     .weather-forecast-time {
-      @extend %caption;
       color: darken($fg_color,40%);
+      font-size: 0.8em;
     }
 
     .calendar-month-label {
+      color: lighten($fg_color,5%);
+      font-weight: bold;
       padding: 8px 0;
       &:focus {}
     }
@@ -989,7 +1008,7 @@ StScrollBar {
       }
 
     .calendar-day-base {
-      @extend %caption;
+      font-size: 80%;
       text-align: center;
       width: 2.4em; height: 2.4em;
       padding: 0.1em;
@@ -1003,8 +1022,9 @@ StScrollBar {
         border-color: transparent; //avoid jumparound due to today
       }
       &.calendar-day-heading {  //day of week heading
-        color: darken($fg_color,40%);
-//        margin-top: 1em;
+        color: lighten($fg_color,5%);
+        margin-top: 1em;
+        font-size: 70%;
       }
     }
       .calendar-day { //border collapse hack - see calendar.js
@@ -1019,15 +1039,14 @@ StScrollBar {
         color: $insensitive_fg_color;
       }
       .calendar-today {
-        @extend %caption-heading;
+        font-weight: bold;
         //color: lighten($fg_color,10%);
         //background-color: darken($bg_color,5%);
         border: 1px solid $_bubble_borders_color;
       }
       .calendar-day-with-events {
-        @extend %caption-heading;
         color: lighten($fg_color,10%);
-
+        font-weight: bold;
         background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
       }
       .calendar-other-month-day {
@@ -1035,7 +1054,8 @@ StScrollBar {
         opacity: 0.5;
       }
       .calendar-week-number {
-        @extend %caption-heading;
+        font-size: 70%;
+        font-weight: bold;
         width: 2.3em; height: 1.8em;
         border-radius: 2px;
         padding: 0.5em 0 0;
@@ -1092,8 +1112,8 @@ StScrollBar {
           }
 
           .message-secondary-bin > .event-time {
-            @extend %caption;
             color: $fg_color;
+            font-size: 0.7em;
             /* HACK: the label should be baseline-aligned with a 1em label,
                      fake this with some bottom padding */
             padding-bottom: 0.13em;
@@ -1264,16 +1284,17 @@ StScrollBar {
   .nm-dialog-airplane-box { spacing: 12px; }
 
   .nm-dialog-airplane-headline {
-    @extend %heading;
+    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 { @extend %title-2; }
+  .nm-dialog-header { font-weight: bold; }
 
   .nm-dialog-item {
+    font-size: 110%;
     border-bottom: 1px solid $borders_color;
     padding: 12px;
     spacing: 20px;
@@ -1380,7 +1401,7 @@ StScrollBar {
 
   #dash {
     @extend %overview-panel;
-    @extend %caption;
+    font-size: 9pt;
     padding: 4px 0;
     border-radius: 0px 9px 9px 0px;
 
@@ -1595,9 +1616,9 @@ StScrollBar {
   border: none;
 }
 
-// Search status, like "Searching..." and "No results"
 %status_text {
-  @extend %large-title;
+  font-size: 2em;
+  font-weight: bold;
   color: $osd_fg_color;
 }
 
@@ -1607,6 +1628,7 @@ StScrollBar {
 
   // Banners
   .notification-banner {
+    font-size: 11pt;
     width: 34em;
     margin: 5px;
     border-radius: $medium-radius;
@@ -1616,7 +1638,7 @@ StScrollBar {
     &:hover { background: $bg_color; }
     &, &:focus, &:active {
       background-color: $bg_color;
-      .message-title { color: $fg_color; }
+      .message-title { color: $fg_color }
       .message-content { color: $fg_color; }
     }
 
@@ -1643,6 +1665,18 @@ StScrollBar {
       border: none;
     }
   }
+  .summary-source-counter {
+    font-size: 10pt;
+    font-weight: bold;
+    height: 1.6em; width: 1.6em;
+    -shell-counter-overlap-x: 3px;
+    -shell-counter-overlap-y: 3px;
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+    border: 2px solid $fg_color;
+    box-shadow: 0 2px 2px rgba(0,0,0,0.5);
+    border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
+  }
 
   .secondary-icon { icon-size: 1.09em; }
 
@@ -1661,8 +1695,9 @@ StScrollBar {
     &:rtl { padding-left: 0; padding-right: 18pt; }
   }
   .chat-meta-message {
-    @extend %caption-heading;
     padding-left: 4px;
+    font-size: 9pt;
+    font-weight: bold;
     color: lighten($fg_color,18%);
     &:rtl { padding-left: 0; padding-right: 4px; }
   }
@@ -1948,7 +1983,8 @@ StScrollBar {
     }
   }
   .login-dialog-not-listed-label {
-    @extend %heading;
+    font-size: 90%;
+    font-weight: bold;
     color: darken($osd_fg_color,30%);
     padding-top: 1em;
   }
@@ -1977,7 +2013,8 @@ StScrollBar {
   .login-dialog-username,
   .user-widget-label {
     color: $osd_fg_color;
-    @extend %title-3;
+    font-size: 120%;
+    font-weight: bold;
     text-align: left;
     padding-left: 15px;
   }
@@ -1995,6 +2032,7 @@ StScrollBar {
 
   .login-dialog-prompt-label {
       color: darken($osd_fg_color, 20%);
+      font-size: 110%;
       padding-top: 1em;
   }
 
@@ -2066,7 +2104,7 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
 
 
 .screen-shield-notification-label {
-  @extend %heading;
+  font-weight: bold;
   padding: 0px 0px 0px 12px;
 }
 
@@ -2106,9 +2144,9 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
   }
   .labels { spacing: 4px; }
   .notebook-tab {
-    @extend %heading;
     -natural-hpadding: 12px;
     -minimum-hpadding: 6px;
+    font-weight: bold;
     color: #ccc;
     transition-duration: 100ms;
     padding-left: .3em;
@@ -2169,7 +2207,7 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
   }
 
   .lg-extension-name {
-      @extend %heading;
+      font-weight: bold;
   }
 
   .lg-extension-meta {
@@ -2182,39 +2220,3 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
     border-radius: 4px;
     padding: 6px;
   }
-
-// text styles
-
-%large-title {
-   font-weight: 300;
-   font-size: 24pt;
-//   letter-spacing: 0.2rem;  This breaks the style 
-}
-%title-1 {
-   font-weight: 800;
-   font-size: 20pt;
-}
-%title-2 {
-   font-weight: 800;
-   font-size: 15pt;
-} 
-%title-3 {
-   font-weight: 700;
-   font-size: 15pt;
-}
-%title-4 {
-   font-weight: 700;
-   font-size: 13pt;
-}
-%heading {
-   font-weight: 700;
-   font-size: 11pt;
-}
-%caption-heading {
-   font-weight: 700;
-   font-size: 9pt;
-}
-%caption {
-   font-weight: 400;
-   font-size: 9pt;
-}

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.33.3',
+  version: '3.33.2',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
@@ -20,10 +20,10 @@ gcr_req = '>= 3.7.5'
 gdesktop_req = '>= 3.7.90'
 gio_req = '>= 2.56.0'
 gi_req = '>= 1.49.1'
-gjs_req = '>= 1.57.3'
+gjs_req = '>= 1.57.2'
 gtk_req = '>= 3.15.0'
 json_glib_req = '>= 0.13.2'
-mutter_req = '>= 3.33.3'
+mutter_req = '>= 3.33.2'
 polkit_req = '>= 0.100'
 schemas_req = '>= 3.27.90'
 startup_req = '>= 0.11'

src/main.c

@@ -198,62 +198,6 @@ shell_fonts_init (void)
   cogl_pango_font_map_set_use_mipmapping (fontmap, FALSE);
 }
 
-static void
-shell_profiler_init (void)
-{
-  ShellGlobal *global;
-  GjsProfiler *profiler;
-  GjsContext *context;
-  const char *enabled;
-  const char *fd_str;
-  int fd = -1;
-
-  /* Sysprof uses the "GJS_TRACE_FD=N" environment variable to connect GJS
-   * profiler data to the combined Sysprof capture. Since we are in control of
-   * the GjsContext, we need to proxy this FD across to the GJS profiler.
-   */
-
-  fd_str = g_getenv ("GJS_TRACE_FD");
-  enabled = g_getenv ("GJS_ENABLE_PROFILER");
-  if (fd_str == NULL || enabled == NULL)
-    return;
-
-  global = shell_global_get ();
-  g_return_if_fail (global);
-
-  context = _shell_global_get_gjs_context (global);
-  g_return_if_fail (context);
-
-  profiler = gjs_context_get_profiler (context);
-  g_return_if_fail (profiler);
-
-  if (fd_str)
-    {
-      fd = atoi (fd_str);
-
-      if (fd > 2)
-        {
-          gjs_profiler_set_fd (profiler, fd);
-          gjs_profiler_start (profiler);
-        }
-    }
-}
-
-static void
-shell_profiler_shutdown (void)
-{
-  ShellGlobal *global;
-  GjsProfiler *profiler;
-  GjsContext *context;
-
-  global = shell_global_get ();
-  context = _shell_global_get_gjs_context (global);
-  profiler = gjs_context_get_profiler (context);
-
-  if (profiler)
-    gjs_profiler_stop (profiler);
-}
-
 static void
 malloc_statistics_callback (ShellPerfLog *perf_log,
                             gpointer      data)
@@ -552,9 +496,7 @@ main (int argc, char **argv)
       dump_gjs_stack_on_signal (SIGSEGV);
     }
 
-  shell_profiler_init ();
   ecode = meta_run ();
-  shell_profiler_shutdown ();
 
   g_debug ("Doing final cleanup");
   _shell_global_destroy_gjs_context (shell_global_get ());