Hard code Cantarell as the default UI font.

- specify an overall font-family for all children of the stage and
  for places where we just want to use a size, use font-size.
- also shrink the humongous 16px panel and menu size to a reasonable 14.
- scale up the icons to be 16px by default again

Based on a patch by Jakub Steiner <jimmac@gmail.com>

https://bugzilla.gnome.org/show_bug.cgi?id=634226
This commit is contained in:
Owen W. Taylor 2010-12-14 02:50:19 +01:00
parent 28adc03cce
commit 961fdd861f

View File

@ -17,6 +17,10 @@
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
stage {
font-family: cantarell, sans-serif;
}
.shell-link { .shell-link {
color: #0000ff; color: #0000ff;
text-decoration: underline; text-decoration: underline;
@ -101,7 +105,7 @@ StTooltip StLabel {
.popup-menu { .popup-menu {
color: #ffffff; color: #ffffff;
font-size: 16px; font-size: 14px;
min-width: 200px; min-width: 200px;
} }
@ -151,7 +155,7 @@ StTooltip StLabel {
} }
.popup-menu-icon { .popup-menu-icon {
icon-size: 1em; icon-size: 1.14em;
} }
/* Switches (to be used in menus) */ /* Switches (to be used in menus) */
@ -178,7 +182,6 @@ StTooltip StLabel {
#panel { #panel {
color: #ffffff; color: #ffffff;
font-size: 16px;
background-color: black; background-color: black;
} }
@ -209,7 +212,7 @@ StTooltip StLabel {
border-radius: 5px; border-radius: 5px;
border-radius-bottomleft: 0px; border-radius-bottomleft: 0px;
border-radius-bottomright: 0px; border-radius-bottomright: 0px;
font: 16px sans-serif; font-size: 14px;
font-weight: bold; font-weight: bold;
transition-duration: 100; transition-duration: 100;
} }
@ -242,7 +245,7 @@ StTooltip StLabel {
} }
.system-status-icon { .system-status-icon {
icon-size: 1em; icon-size: 1.14em;
} }
/* Overview */ /* Overview */
@ -464,7 +467,7 @@ StTooltip StLabel {
.dash-search-button-label { .dash-search-button-label {
color: #cccccc; color: #cccccc;
font: 16px sans-serif; font-size: 16px;
} }
/* Apps */ /* Apps */
@ -883,7 +886,7 @@ StTooltip StLabel {
} }
.source-title { .source-title {
font: 12px sans-serif; font-size: 12px;
font-weight: bold; font-weight: bold;
padding-left: 4px; padding-left: 4px;
} }
@ -904,7 +907,7 @@ StTooltip StLabel {
border-radius: 24px; border-radius: 24px;
padding: 20px; padding: 20px;
font: 12px sans-serif; font-size: 12px;
color: white; color: white;
} }
@ -1021,7 +1024,7 @@ StTooltip StLabel {
/* Modal Dialogs */ /* Modal Dialogs */
.modal-dialog { .modal-dialog {
font: 12pt sans-serif; font-size: 12pt;
border-radius: 24px; border-radius: 24px;
background-color: rgba(0.0, 0.0, 0.0, 0.9); background-color: rgba(0.0, 0.0, 0.0, 0.9);
border: 2px solid #868686; border: 2px solid #868686;
@ -1036,7 +1039,7 @@ StTooltip StLabel {
.modal-dialog-button { .modal-dialog-button {
border: 1px solid #8b8b8b; border: 1px solid #8b8b8b;
border-radius: 18px; border-radius: 18px;
font: 14px sans-serif; font-size: 14px;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
@ -1069,7 +1072,7 @@ StTooltip StLabel {
/* Run Dialog */ /* Run Dialog */
.run-dialog-label { .run-dialog-label {
font: 12px sans-serif; font-size: 12px;
color: white; color: white;
} }
@ -1080,12 +1083,12 @@ StTooltip StLabel {
} }
.run-dialog-error-label { .run-dialog-error-label {
font: 16px sans-serif; font-size: 16px;
color: white; color: white;
} }
.run-dialog-entry { .run-dialog-entry {
font: 14px sans-serif; font-size: 14px;
font-weight: bold; font-weight: bold;
width: 320px; width: 320px;
color: white; color: white;
@ -1106,7 +1109,7 @@ StTooltip StLabel {
/* End Session Dialog */ /* End Session Dialog */
.end-session-dialog-subject { .end-session-dialog-subject {
font: 12pt sans-serif; font-size: 12pt;
font-weight: bold; font-weight: bold;
color: #666666; color: #666666;
padding-top: 10px; padding-top: 10px;
@ -1115,7 +1118,7 @@ StTooltip StLabel {
} }
.end-session-dialog-description { .end-session-dialog-description {
font: 10pt sans-serif; font-size: 10pt;
color: white; color: white;
padding-left: 17px; padding-left: 17px;
padding-right: 40px; padding-right: 40px;
@ -1135,7 +1138,7 @@ StTooltip StLabel {
} }
.end-session-dialog-app-list { .end-session-dialog-app-list {
font: 10pt sans-serif; font-size: 10pt;
max-height: 200px; max-height: 200px;
padding-top: 42px; padding-top: 42px;
padding-bottom: 42px; padding-bottom: 42px;
@ -1152,11 +1155,11 @@ StTooltip StLabel {
} }
.end-session-dialog-app-list-item-name { .end-session-dialog-app-list-item-name {
font: 10pt sans-serif; font-size: 10pt;
} }
.end-session-dialog-app-list-item-description { .end-session-dialog-app-list-item-description {
font: 8pt sans-serif; font-size: 8pt;
color: #444444; color: #444444;
} }