GNOME.org
 

[gnome-shell/wip/snwh/theme-refactor: 4/16] theme: use the fontsize function consistently

commit 79e0c07beffab4ea998cf3def04d12621aff2887
Author: Sam Hewitt <sam snwh org>
Date:   Thu Dec 19 11:09:33 2019 -0500

    theme: use the fontsize function consistently
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/904

 .gitignore                                         |    3 +-
 data/theme/gnome-shell-high-contrast.css           | 2270 --------------------
 data/theme/gnome-shell-sass/widgets/_calendar.scss |   22 +-
 data/theme/gnome-shell-sass/widgets/_dash.scss     |    2 +-
 data/theme/gnome-shell-sass/widgets/_dialogs.scss  |    8 +-
 .../widgets/_end-session-dialog.scss               |    2 +-
 data/theme/gnome-shell-sass/widgets/_keyboard.scss |    4 +-
 .../gnome-shell-sass/widgets/_login-dialog.scss    |    6 +-
 .../gnome-shell-sass/widgets/_message-list.scss    |    2 +-
 data/theme/gnome-shell-sass/widgets/_misc.scss     |    2 +-
 .../gnome-shell-sass/widgets/_network-dialog.scss  |    2 +-
 .../gnome-shell-sass/widgets/_notifications.scss   |    4 +-
 .../gnome-shell-sass/widgets/_window-picker.scss   |    2 +-
 data/theme/gnome-shell.css                         | 2262 -------------------
 14 files changed, 30 insertions(+), 4561 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98cd44361a..38d6765cc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,8 @@ data/org.gnome.shell.gschema.valid
 data/org.gnome.Shell.PortalHelper.desktop
 data/org.gnome.Shell.PortalHelper.service
 data/theme/.sass-cache
-data/theme/*.css.map
+data/theme/gnome-shell*.css.map
+data/theme/gnome-shell*.css
 docs/reference/*/*.args
 docs/reference/*/*.bak
 docs/reference/*/*.hierarchy
diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss 
b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index c19743713e..0c7c5fd24f 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -40,13 +40,13 @@
 
     // weekday label
     .day-label {
-      font-size: $base_font_size + 1pt;
+      @include fontsize($base_font_size+1);
       font-weight: bold;
     }
 
     // date label
     .date-label {
-      font-size: $base_font_size * 1.5;
+      @include fontsize($base_font_size+7);
       font-weight: 1000;
     }
   }
@@ -115,7 +115,7 @@
   $calendar_day_size: 32px;
 
   .calendar-day-base {
-    font-size: 80%;
+    @include fontsize($base_font_size - 3);
     text-align: center;
     width: $calendar_day_size;
     height: $calendar_day_size;
@@ -134,7 +134,7 @@
     &.calendar-day-heading {
       color: lighten($fg_color,10%);
       margin-top: 1em;
-      font-size: 70%;
+      @include fontsize($base_font_size - 4);
     }
   }
   .calendar-day { //border collapse hack - see calendar.js
@@ -185,7 +185,7 @@
   }
 
   .calendar-week-number {
-    font-size: 70%;
+    @include fontsize($base_font_size - 4);
     font-weight: bold;
     height: 1.8em;
     width: 2.3em; 
@@ -208,7 +208,7 @@
     font-weight: bold;
     &.location {
       font-weight: normal;
-      font-size: $base_font_size - 1pt;
+      @include fontsize($base_font_size - 1);
     }
   }
 
@@ -225,7 +225,7 @@
   .weather-forecast-time {
     color: darken($fg_color,30%);
     font-feature-settings: "tnum";
-    font-size: $base_font_size - 2pt;
+    @include fontsize($base_font_size - 2);
     font-weight: normal;
   }
 }
@@ -245,7 +245,7 @@
   // city label
   .world-clocks-city {
     color: $fg_color;
-    font-size: $base_font_size;
+    @include fontsize($base_font_size);
     font-weight: normal;
   }
 
@@ -254,14 +254,14 @@
     font-weight: bold;
     color: $fg_color;
     font-feature-settings: "lnum";
-    font-size: $base_font_size;
-    text-align:right;
+    @include fontsize($base_font_size);
+    text-align: right;
   }
 
   // timezone offset label
   .world-clocks-timezone {
     color: darken($fg_color,20%);
     font-feature-settings: "tnum";
-    font-size: $base_font_size - 1pt;
+    @include fontsize($base_font_size - 1);
   }
 }
\ No newline at end of file
diff --git a/data/theme/gnome-shell-sass/widgets/_dash.scss b/data/theme/gnome-shell-sass/widgets/_dash.scss
index 99058d5686..c11ad4dddb 100644
--- a/data/theme/gnome-shell-sass/widgets/_dash.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dash.scss
@@ -5,7 +5,7 @@ $dash_border_radius: $modal_radius * 1.5;
 
 #dash {
   @extend %overview_panel;
-  font-size: $base_font_size - 2pt;
+  @include fontsize($base_font_size - 2);
   padding: 0;
   padding-bottom: $base_padding + 4px;
 
diff --git a/data/theme/gnome-shell-sass/widgets/_dialogs.scss 
b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
index c62a2eea63..f63d488ae9 100644
--- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -113,7 +113,7 @@
 }
 
 .mount-dialog-app-list-item-name {
-  font-size: 10pt;
+  @include fontsize($base_font_size - 1);
 }
 
 
@@ -139,13 +139,13 @@
 }
 
 .prompt-dialog-error-label {
-  font-size: 10pt;
+  @include fontsize($base_font_size - 1);
   color: $warning_color;
   padding-bottom: 8px;
 }
 
 .prompt-dialog-info-label {
-  font-size: 10pt;
+  @include fontsize($base_font_size - 1);
   padding-bottom: 8px;
 }
 
@@ -154,7 +154,7 @@
 }
 
 .prompt-dialog-null-label {
-  font-size: 10pt;
+  @include fontsize($base_font_size - 1);
   padding-bottom: 8px;
 }
 
diff --git a/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss 
b/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
index c1bd525cfe..15b975f12d 100644
--- a/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
+++ b/data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
@@ -76,5 +76,5 @@ $end_session_dialog_width: 28em;
 
 .end-session-dialog-app-list-item-description {
   color: darken($fg_color,5%);
-  font-size: 10pt;
+  @include fontsize($base_font_size - 1);
 }
\ 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 bd028a4005..59e9a34cfa 100644
--- a/data/theme/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
@@ -39,7 +39,7 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
   &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
   &:active { @include button(active, $c: $key_bg_color); }
 
-  font-size: $base_font_size + 5pt;
+  @include fontsize($base_font_size + 5);
   min-height: $key_size;
   min-width: $key_size;
 
@@ -119,7 +119,7 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
 
 // suggestions
 .word-suggestions {
-  font-size: $base_font_size + 3pt;
+  @include fontsize($base_font_size + 3);
   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 8b24db99e0..3bccccfdc2 100644
--- a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
@@ -88,7 +88,7 @@
 }
 
 .login-dialog-not-listed-label {
-  font-size: 90%;
+  @include fontsize($base_font_size - 1);
   font-weight: bold;
   color: darken($osd_fg_color,30%);
   padding-top: 1em;
@@ -119,7 +119,7 @@
 .login-dialog-username,
 .user-widget-label {
   color: $osd_fg_color;
-  font-size: 120%;
+  @include fontsize($base_font_size + 2);
   font-weight: bold;
   text-align: left;
   padding-left: 15px;
@@ -139,7 +139,7 @@
 
 .login-dialog-prompt-label {
   color: darken($osd_fg_color, 20%);
-  font-size: 110%;
+  @include fontsize($base_font_size + 1);
   padding-top: 1em;
 }
 
diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss 
b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index 97ad5e6955..a51b07d65c 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -95,7 +95,7 @@
     // notification time stamp
     > .event-time {
       color: transparentize($fg_color, 0.5);
-      font-size: 80%;
+      @include fontsize($base_font_size - 2);
       text-align: right;
       margin: 0 $base_margin * 2;
       /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
diff --git a/data/theme/gnome-shell-sass/widgets/_misc.scss b/data/theme/gnome-shell-sass/widgets/_misc.scss
index e91d7afb1b..673857a7d5 100644
--- a/data/theme/gnome-shell-sass/widgets/_misc.scss
+++ b/data/theme/gnome-shell-sass/widgets/_misc.scss
@@ -50,6 +50,6 @@
 }
 
 
-.headline { font-size: 110%; }
+.headline { @include fontsize($base_font_size + 1); }
 .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
index b234ca1ad1..dff9de706f 100644
--- a/data/theme/gnome-shell-sass/widgets/_network-dialog.scss
+++ b/data/theme/gnome-shell-sass/widgets/_network-dialog.scss
@@ -38,7 +38,7 @@
 
 // list item
 .nm-dialog-item {
-  font-size: $base_font_size;
+  @include fontsize($base_font_size);
   border-bottom: 1px solid $borders_color;
   padding: $base_padding * 2;
   spacing: 0px;
diff --git a/data/theme/gnome-shell-sass/widgets/_notifications.scss 
b/data/theme/gnome-shell-sass/widgets/_notifications.scss
index 3bc69094a0..20f2272a19 100644
--- a/data/theme/gnome-shell-sass/widgets/_notifications.scss
+++ b/data/theme/gnome-shell-sass/widgets/_notifications.scss
@@ -7,7 +7,7 @@ $notification_banner_width: 34em;
 .notification-banner {
   min-height: $notification_banner_height;
   width: $notification_banner_width;
-  font-size: $base_font_size;
+  @include fontsize($base_font_size);
   margin: $base_margin;
   border-radius: $modal_radius;
 
@@ -93,7 +93,7 @@ $notification_banner_width: 34em;
 
 .chat-meta-message {
   padding-left: 4px;
-  font-size: 9pt;
+  @include fontsize($base_font_size - 2);
   font-weight: bold;
   color: lighten($fg_color,18%);
   &:rtl { padding-left: 0; padding-right: 4px; }
diff --git a/data/theme/gnome-shell-sass/widgets/_window-picker.scss 
b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
index 156f84515d..c8245e4e21 100644
--- a/data/theme/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
@@ -39,7 +39,7 @@ $window_close_button_padding: 3px;
   border-radius: 8px;
   margin-top: 24px;
   padding: 4px 12px;
-  font-size: $base_font_size + 1pt;
+  @include fontsize($base_font_size + 1);
   font-weight: bold;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]