[Gtk-3.22] Changed font syntax from Pango-style to CSS-style. Fixes #571

pull/592/head
Csaba Jakosa 2016-10-16 07:24:44 +02:00 committed by Khurshid Alam
parent c138b787be
commit 49943fb350
5 changed files with 24 additions and 12 deletions

View File

@ -79,7 +79,8 @@
transition: all 200ms ease-in;
}
statusbar { border-top: 1px solid border_normal($bg_color); }
//Ignore: Global double border separator.
//statusbar { border-top: 1px solid border_normal($bg_color); }
statusbar GeditSmallButton, GeditStatusMenuButton {
text-shadow: none;

View File

@ -7,7 +7,7 @@
background-color: $lightdm_bg_color;
background-image: none;
color: $white;
font: bold;
font-weight: bold;
text-shadow: 0 1px alpha($black, .5);
-gtk-icon-shadow: 0 1px alpha($black, .5);
@ -33,7 +33,7 @@
&:disabled { color: alpha($white, .7); }
}
menu > menuitem { font: normal; }
menu > menuitem { font-weight: normal; }
}
}
@ -64,9 +64,9 @@
#user_combobox {
color: $lightdm_fg_color;
font: 18px;
font-size: 18px;
menu { font: normal; }
menu { font-weight: normal; }
arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, .5); }
}
@ -113,5 +113,5 @@
}
/* password warning */
#greeter_infobar { font: bold; }
#greeter_infobar { font-weight: bold; }
}

View File

@ -42,7 +42,9 @@
*******/
@include exports("menu") {
menu, .menu {
menu,
.menu,
.context-menu {
padding: 0;
border-radius: 0;
border: 0;
@ -138,6 +140,10 @@
&:indeterminate,
&:indeterminate:backdrop { color: mix($menu_fg_color, $menu_bg_color, .5); }
}
// avoids labels color being overridden, see
// https://bugzilla.gnome.org/show_bug.cgi?id=767058
label { &:dir(rtl), &:dir(ltr) { color: inherit; } }
}
// overflow arrows
@ -174,7 +180,7 @@
}
}
.context-menu { font: initial; }
.context-menu { font: initial; } // Decouple the font of context menus from their entry/textview
menuitem {
accelerator {

View File

@ -231,13 +231,18 @@
********************/
@include exports("gnome-bluetooth") {
// Base code: https://github.com/GNOME/gnome-bluetooth/blob/a93575c4b590e2b831da32f739294bb2f197d420/lib/bluetooth-settings.css
entry.entry.pin-entry {
font: regular 50;
font-style: normal;
font-size: 50px;
padding-left: 25px;
padding-right: 25px;
}
label.pin-label { font: regular 50; }
label.pin-label {
font-style: normal;
font-size: 50px;
}
}

View File

@ -18,12 +18,12 @@
}
.title {
font: bold;
font-weight: bold;
padding: 0 ($spacing * 2);
}
.subtitle {
font: smaller;
font-size: smaller;
padding: 0 ($spacing * 2);
}