Skip to content

Commit 49943fb

Browse files
megaxkhurshid-alam
authored andcommitted
[Gtk-3.22] Changed font syntax from Pango-style to CSS-style. Fixes #571
1 parent c138b78 commit 49943fb

5 files changed

Lines changed: 24 additions & 12 deletions

File tree

src/gtk-3.20/scss/apps/_gedit.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
transition: all 200ms ease-in;
8080
}
8181

82-
statusbar { border-top: 1px solid border_normal($bg_color); }
82+
//Ignore: Global double border separator.
83+
//statusbar { border-top: 1px solid border_normal($bg_color); }
8384

8485
statusbar GeditSmallButton, GeditStatusMenuButton {
8586
text-shadow: none;

src/gtk-3.20/scss/apps/_lightdm.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
background-color: $lightdm_bg_color;
88
background-image: none;
99
color: $white;
10-
font: bold;
10+
font-weight: bold;
1111
text-shadow: 0 1px alpha($black, .5);
1212
-gtk-icon-shadow: 0 1px alpha($black, .5);
1313

@@ -33,7 +33,7 @@
3333
&:disabled { color: alpha($white, .7); }
3434
}
3535

36-
menu > menuitem { font: normal; }
36+
menu > menuitem { font-weight: normal; }
3737
}
3838
}
3939

@@ -64,9 +64,9 @@
6464

6565
#user_combobox {
6666
color: $lightdm_fg_color;
67-
font: 18px;
67+
font-size: 18px;
6868

69-
menu { font: normal; }
69+
menu { font-weight: normal; }
7070

7171
arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, .5); }
7272
}
@@ -113,5 +113,5 @@
113113
}
114114

115115
/* password warning */
116-
#greeter_infobar { font: bold; }
116+
#greeter_infobar { font-weight: bold; }
117117
}

src/gtk-3.20/scss/widgets/_menu.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
*******/
4343

4444
@include exports("menu") {
45-
menu, .menu {
45+
menu,
46+
.menu,
47+
.context-menu {
4648
padding: 0;
4749
border-radius: 0;
4850
border: 0;
@@ -138,6 +140,10 @@
138140
&:indeterminate,
139141
&:indeterminate:backdrop { color: mix($menu_fg_color, $menu_bg_color, .5); }
140142
}
143+
144+
// avoids labels color being overridden, see
145+
// https://bugzilla.gnome.org/show_bug.cgi?id=767058
146+
label { &:dir(rtl), &:dir(ltr) { color: inherit; } }
141147
}
142148

143149
// overflow arrows
@@ -174,7 +180,7 @@
174180
}
175181
}
176182

177-
.context-menu { font: initial; }
183+
.context-menu { font: initial; } // Decouple the font of context menus from their entry/textview
178184

179185
menuitem {
180186
accelerator {

src/gtk-3.20/scss/widgets/_misc.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,18 @@
231231
********************/
232232

233233
@include exports("gnome-bluetooth") {
234+
// Base code: https://github.com/GNOME/gnome-bluetooth/blob/a93575c4b590e2b831da32f739294bb2f197d420/lib/bluetooth-settings.css
234235
entry.entry.pin-entry {
235-
font: regular 50;
236+
font-style: normal;
237+
font-size: 50px;
236238
padding-left: 25px;
237239
padding-right: 25px;
238240
}
239241

240-
label.pin-label { font: regular 50; }
242+
label.pin-label {
243+
font-style: normal;
244+
font-size: 50px;
245+
}
241246
}
242247

243248

src/gtk-3.20/scss/widgets/_toolbar.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
}
1919

2020
.title {
21-
font: bold;
21+
font-weight: bold;
2222
padding: 0 ($spacing * 2);
2323
}
2424

2525
.subtitle {
26-
font: smaller;
26+
font-size: smaller;
2727
padding: 0 ($spacing * 2);
2828
}
2929

0 commit comments

Comments
 (0)