isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

theme: use the fontsize function consistently

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/904
This commit is contained in:
Sam Hewitt 2019-12-19 11:09:33 -05:00 committed by Florian Müllner
parent d50e06dcce
commit 79a837b87a
14 changed files with 30 additions and 4561 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -21,7 +21,8 @@ data/org.gnome.shell.gschema.valid
data/org.gnome.Shell.PortalHelper.desktop data/org.gnome.Shell.PortalHelper.desktop
data/org.gnome.Shell.PortalHelper.service data/org.gnome.Shell.PortalHelper.service
data/theme/.sass-cache data/theme/.sass-cache
data/theme/*.css.map data/theme/gnome-shell*.css.map
data/theme/gnome-shell*.css
docs/reference/*/*.args docs/reference/*/*.args
docs/reference/*/*.bak docs/reference/*/*.bak
docs/reference/*/*.hierarchy docs/reference/*/*.hierarchy

2270
data/theme/gnome-shell-high-contrast.css
View File

File diff suppressed because it is too large Load Diff

22
data/theme/gnome-shell-sass/widgets/_calendar.scss
View File

@ -40,13 +40,13 @@
// weekday label // weekday label
.day-label { .day-label {
font-size: $base_font_size + 1pt; @include fontsize($base_font_size+1);
font-weight: bold; font-weight: bold;
} }
// date label // date label
.date-label { .date-label {
font-size: $base_font_size * 1.5; @include fontsize($base_font_size+7);
font-weight: 1000; font-weight: 1000;
} }
} }
@ -115,7 +115,7 @@
$calendar_day_size: 32px; $calendar_day_size: 32px;
.calendar-day-base { .calendar-day-base {
font-size: 80%; @include fontsize($base_font_size - 3);
text-align: center; text-align: center;
width: $calendar_day_size; width: $calendar_day_size;
height: $calendar_day_size; height: $calendar_day_size;
@ -134,7 +134,7 @@
&.calendar-day-heading { &.calendar-day-heading {
color: lighten($fg_color,10%); color: lighten($fg_color,10%);
margin-top: 1em; margin-top: 1em;
font-size: 70%; @include fontsize($base_font_size - 4);
} }
} }
.calendar-day { //border collapse hack - see calendar.js .calendar-day { //border collapse hack - see calendar.js
@ -185,7 +185,7 @@
} }
.calendar-week-number { .calendar-week-number {
font-size: 70%; @include fontsize($base_font_size - 4);
font-weight: bold; font-weight: bold;
height: 1.8em; height: 1.8em;
width: 2.3em; width: 2.3em;
@ -208,7 +208,7 @@
font-weight: bold; font-weight: bold;
&.location { &.location {
font-weight: normal; font-weight: normal;
font-size: $base_font_size - 1pt; @include fontsize($base_font_size - 1);
} }
} }
@ -225,7 +225,7 @@
.weather-forecast-time { .weather-forecast-time {
color: darken($fg_color,30%); color: darken($fg_color,30%);
font-feature-settings: "tnum"; font-feature-settings: "tnum";
font-size: $base_font_size - 2pt; @include fontsize($base_font_size - 2);
font-weight: normal; font-weight: normal;
} }
} }
@ -245,7 +245,7 @@
// city label // city label
.world-clocks-city { .world-clocks-city {
color: $fg_color; color: $fg_color;
font-size: $base_font_size; @include fontsize($base_font_size);
font-weight: normal; font-weight: normal;
} }
@ -254,14 +254,14 @@
font-weight: bold; font-weight: bold;
color: $fg_color; color: $fg_color;
font-feature-settings: "lnum"; font-feature-settings: "lnum";
font-size: $base_font_size; @include fontsize($base_font_size);
text-align:right; text-align: right;
} }
// timezone offset label // timezone offset label
.world-clocks-timezone { .world-clocks-timezone {
color: darken($fg_color,20%); color: darken($fg_color,20%);
font-feature-settings: "tnum"; font-feature-settings: "tnum";
font-size: $base_font_size - 1pt; @include fontsize($base_font_size - 1);
} }
} }

2
data/theme/gnome-shell-sass/widgets/_dash.scss
View File

@ -5,7 +5,7 @@ $dash_border_radius: $modal_radius * 1.5;
#dash { #dash {
@extend %overview_panel; @extend %overview_panel;
font-size: $base_font_size - 2pt; @include fontsize($base_font_size - 2);
padding: 0; padding: 0;
padding-bottom: $base_padding + 4px; padding-bottom: $base_padding + 4px;

8
data/theme/gnome-shell-sass/widgets/_dialogs.scss
View File

@ -113,7 +113,7 @@
} }
.mount-dialog-app-list-item-name { .mount-dialog-app-list-item-name {
font-size: 10pt; @include fontsize($base_font_size - 1);
} }
@ -139,13 +139,13 @@
} }
.prompt-dialog-error-label { .prompt-dialog-error-label {
font-size: 10pt; @include fontsize($base_font_size - 1);
color: $warning_color; color: $warning_color;
padding-bottom: 8px; padding-bottom: 8px;
} }
.prompt-dialog-info-label { .prompt-dialog-info-label {
font-size: 10pt; @include fontsize($base_font_size - 1);
padding-bottom: 8px; padding-bottom: 8px;
} }
@ -154,7 +154,7 @@
} }
.prompt-dialog-null-label { .prompt-dialog-null-label {
font-size: 10pt; @include fontsize($base_font_size - 1);
padding-bottom: 8px; padding-bottom: 8px;
} }

2
data/theme/gnome-shell-sass/widgets/_end-session-dialog.scss
View File

@ -76,5 +76,5 @@ $end_session_dialog_width: 28em;
.end-session-dialog-app-list-item-description { .end-session-dialog-app-list-item-description {
color: darken($fg_color,5%); color: darken($fg_color,5%);
font-size: 10pt; @include fontsize($base_font_size - 1);
} }

4
data/theme/gnome-shell-sass/widgets/_keyboard.scss
View File

@ -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);} &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
&:active { @include button(active, $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-height: $key_size;
min-width: $key_size; min-width: $key_size;
@ -119,7 +119,7 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
// suggestions // suggestions
.word-suggestions { .word-suggestions {
font-size: $base_font_size + 3pt; @include fontsize($base_font_size + 3);
spacing: 12px; spacing: 12px;
min-height: 20pt; min-height: 20pt;
} }

6
data/theme/gnome-shell-sass/widgets/_login-dialog.scss
View File

@ -88,7 +88,7 @@
} }
.login-dialog-not-listed-label { .login-dialog-not-listed-label {
font-size: 90%; @include fontsize($base_font_size - 1);
font-weight: bold; font-weight: bold;
color: darken($osd_fg_color,30%); color: darken($osd_fg_color,30%);
padding-top: 1em; padding-top: 1em;
@ -119,7 +119,7 @@
.login-dialog-username, .login-dialog-username,
.user-widget-label { .user-widget-label {
color: $osd_fg_color; color: $osd_fg_color;
font-size: 120%; @include fontsize($base_font_size + 2);
font-weight: bold; font-weight: bold;
text-align: left; text-align: left;
padding-left: 15px; padding-left: 15px;
@ -139,7 +139,7 @@
.login-dialog-prompt-label { .login-dialog-prompt-label {
color: darken($osd_fg_color, 20%); color: darken($osd_fg_color, 20%);
font-size: 110%; @include fontsize($base_font_size + 1);
padding-top: 1em; padding-top: 1em;
} }

2
data/theme/gnome-shell-sass/widgets/_message-list.scss
View File

@ -95,7 +95,7 @@
// notification time stamp // notification time stamp
> .event-time { > .event-time {
color: transparentize($fg_color, 0.5); color: transparentize($fg_color, 0.5);
font-size: 80%; @include fontsize($base_font_size - 2);
text-align: right; text-align: right;
margin: 0 $base_margin * 2; margin: 0 $base_margin * 2;
/* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */ /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */

2
data/theme/gnome-shell-sass/widgets/_misc.scss
View File

@ -50,6 +50,6 @@
} }
.headline { font-size: 110%; } .headline { @include fontsize($base_font_size + 1); }
.lightbox { background-color: black; } .lightbox { background-color: black; }
.flashspot { background-color: white; } .flashspot { background-color: white; }

2
data/theme/gnome-shell-sass/widgets/_network-dialog.scss
View File

@ -38,7 +38,7 @@
// list item // list item
.nm-dialog-item { .nm-dialog-item {
font-size: $base_font_size; @include fontsize($base_font_size);
border-bottom: 1px solid $borders_color; border-bottom: 1px solid $borders_color;
padding: $base_padding * 2; padding: $base_padding * 2;
spacing: 0px; spacing: 0px;

4
data/theme/gnome-shell-sass/widgets/_notifications.scss
View File

@ -7,7 +7,7 @@ $notification_banner_width: 34em;
.notification-banner { .notification-banner {
min-height: $notification_banner_height; min-height: $notification_banner_height;
width: $notification_banner_width; width: $notification_banner_width;
font-size: $base_font_size; @include fontsize($base_font_size);
margin: $base_margin; margin: $base_margin;
border-radius: $modal_radius; border-radius: $modal_radius;
@ -93,7 +93,7 @@ $notification_banner_width: 34em;
.chat-meta-message { .chat-meta-message {
padding-left: 4px; padding-left: 4px;
font-size: 9pt; @include fontsize($base_font_size - 2);
font-weight: bold; font-weight: bold;
color: lighten($fg_color,18%); color: lighten($fg_color,18%);
&:rtl { padding-left: 0; padding-right: 4px; } &:rtl { padding-left: 0; padding-right: 4px; }

2
data/theme/gnome-shell-sass/widgets/_window-picker.scss
View File

@ -39,7 +39,7 @@ $window_close_button_padding: 3px;
border-radius: 8px; border-radius: 8px;
margin-top: 24px; margin-top: 24px;
padding: 4px 12px; padding: 4px 12px;
font-size: $base_font_size + 1pt; @include fontsize($base_font_size + 1);
font-weight: bold; font-weight: bold;
} }

2262
data/theme/gnome-shell.css
View File

File diff suppressed because it is too large Load Diff