AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 20:51:07 +00:00
Code Issues Projects Releases Wiki Activity

Adwaita: Fix use of font: shorthand

Browse Source
This commit is contained in:
Matthias Clasen 2016-04-18 11:45:55 -04:00
parent dcd20e17e5
commit df22f3017b
3 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/theme/Adwaita/_common.scss
View File

@ -4219,7 +4219,7 @@ headerbar.selection-mode button.titlebutton,
} }
} }
.monospace { font: Monospace; } .monospace { font-family: monospace; }
/********************** /**********************

34
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -141,7 +141,8 @@ assistant .sidebar label.highlight {
background-color: #5d6262; } background-color: #5d6262; }
.csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification,
.app-notification.frame, .osd .scale-popup, .osd { .app-notification.frame, .osd .scale-popup,
.osd {
color: #eeeeec; color: #eeeeec;
border: none; border: none;
background-color: rgba(32, 37, 38, 0.8); background-color: rgba(32, 37, 38, 0.8);
@ -149,7 +150,8 @@ assistant .sidebar label.highlight {
outline-color: rgba(238, 238, 236, 0.3); outline-color: rgba(238, 238, 236, 0.3);
text-shadow: 0 1px black; text-shadow: 0 1px black;
-gtk-icon-shadow: 0 1px black; } -gtk-icon-shadow: 0 1px black; }
popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop,
.osd:backdrop {
text-shadow: none; text-shadow: none;
-gtk-icon-shadow: none; } -gtk-icon-shadow: none; }
@ -1680,9 +1682,9 @@ headerbar {
transition: 200ms ease-out; } transition: 200ms ease-out; }
.titlebar:not(headerbar) .title, .titlebar:not(headerbar) .title,
headerbar .title { headerbar .title {
font-weight: bold;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; } padding-right: 12px;
font-weight: bold; }
.titlebar:not(headerbar) .subtitle, .titlebar:not(headerbar) .subtitle,
headerbar .subtitle { headerbar .subtitle {
font-size: smaller; font-size: smaller;
@ -1691,8 +1693,8 @@ headerbar {
.selection-mode.titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar),
headerbar.selection-mode { headerbar.selection-mode {
color: #ffffff; color: #ffffff;
text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
border-color: #0f2b48; border-color: #0f2b48;
text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
background-image: linear-gradient(to top, #1e5690, #205b98 2px, #215d9c 3px); background-image: linear-gradient(to top, #1e5690, #205b98 2px, #215d9c 3px);
background-color: #215d9c; background-color: #215d9c;
box-shadow: inset 0 1px rgba(40, 98, 159, 0.535); } box-shadow: inset 0 1px rgba(40, 98, 159, 0.535); }
@ -1931,8 +1933,8 @@ headerbar {
border-radius: 0; } border-radius: 0; }
.default-decoration.titlebar:not(headerbar), .default-decoration.titlebar:not(headerbar),
headerbar.default-decoration { headerbar.default-decoration {
padding: 4px; min-height: 28px;
min-height: 28px; } padding: 4px; }
.default-decoration.titlebar:not(headerbar) button.titlebutton, .default-decoration.titlebar:not(headerbar) button.titlebutton,
headerbar.default-decoration button.titlebutton { headerbar.default-decoration button.titlebutton {
min-height: 26px; min-height: 26px;
@ -2097,29 +2099,29 @@ treeview.view {
treeview.view header.button.dnd:hover, treeview.view header.button.dnd:hover,
treeview.view header.button.dnd { treeview.view header.button.dnd {
padding: 0 6px; padding: 0 6px;
transition: none; color: #292929;
background-image: none; background-image: none;
background-color: #215d9c; background-color: #215d9c;
color: #292929;
border-radius: 0;
border-style: none; border-style: none;
border-radius: 0;
box-shadow: inset 0 0 0 1px #292929; box-shadow: inset 0 0 0 1px #292929;
text-shadow: none; } text-shadow: none;
transition: none; }
treeview.view header button, treeview.view header button:hover, treeview.view header button:active { treeview.view header button, treeview.view header button:hover, treeview.view header button:active {
padding: 0 6px; padding: 0 6px;
border-radius: 0;
background-image: none; background-image: none;
text-shadow: none;
border-style: none solid solid none; border-style: none solid solid none;
border-color: #393f3f; } border-color: #393f3f;
border-radius: 0;
text-shadow: none; }
treeview.view header button:disabled { treeview.view header button:disabled {
border-color: #393f3f; border-color: #393f3f;
background-image: none; } background-image: none; }
treeview.view header button:backdrop { treeview.view header button:backdrop {
color: #676b6b;
border-color: #393f3f; border-color: #393f3f;
border-style: none solid solid none; border-style: none solid solid none;
color: #676b6b;
background-image: none; background-image: none;
background-color: #2c2c2c; } background-color: #2c2c2c; }
treeview.view header button:backdrop:disabled { treeview.view header button:backdrop:disabled {
@ -4467,7 +4469,7 @@ popover.background radiobutton:selected,
color: #5781ad; } color: #5781ad; }
.monospace { .monospace {
font: Monospace; } font-family: monospace; }
/********************** /**********************
* Touch Copy & Paste * * Touch Copy & Paste *

34
gtk/theme/Adwaita/gtk-contained.css
View File

@ -141,7 +141,8 @@ assistant .sidebar label.highlight {
background-color: #c3c4c4; } background-color: #c3c4c4; }
.csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification,
.app-notification.frame, .osd .scale-popup, .osd { .app-notification.frame, .osd .scale-popup,
.osd {
color: #eeeeec; color: #eeeeec;
border: none; border: none;
background-color: rgba(32, 37, 38, 0.8); background-color: rgba(32, 37, 38, 0.8);
@ -149,7 +150,8 @@ assistant .sidebar label.highlight {
outline-color: rgba(238, 238, 236, 0.3); outline-color: rgba(238, 238, 236, 0.3);
text-shadow: 0 1px black; text-shadow: 0 1px black;
-gtk-icon-shadow: 0 1px black; } -gtk-icon-shadow: 0 1px black; }
popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop,
.osd:backdrop {
text-shadow: none; text-shadow: none;
-gtk-icon-shadow: none; } -gtk-icon-shadow: none; }
@ -1687,9 +1689,9 @@ headerbar {
transition: 200ms ease-out; } transition: 200ms ease-out; }
.titlebar:not(headerbar) .title, .titlebar:not(headerbar) .title,
headerbar .title { headerbar .title {
font-weight: bold;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; } padding-right: 12px;
font-weight: bold; }
.titlebar:not(headerbar) .subtitle, .titlebar:not(headerbar) .subtitle,
headerbar .subtitle { headerbar .subtitle {
font-size: smaller; font-size: smaller;
@ -1698,8 +1700,8 @@ headerbar {
.selection-mode.titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar),
headerbar.selection-mode { headerbar.selection-mode {
color: #ffffff; color: #ffffff;
text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
border-color: #184472; border-color: #184472;
text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
background-image: linear-gradient(to top, #276fba, #428bd7 2px, #4a90d9 3px); background-image: linear-gradient(to top, #276fba, #428bd7 2px, #4a90d9 3px);
background-color: #4a90d9; background-color: #4a90d9;
box-shadow: inset 0 1px rgba(146, 188, 232, 0.9); } box-shadow: inset 0 1px rgba(146, 188, 232, 0.9); }
@ -1938,8 +1940,8 @@ headerbar {
border-radius: 0; } border-radius: 0; }
.default-decoration.titlebar:not(headerbar), .default-decoration.titlebar:not(headerbar),
headerbar.default-decoration { headerbar.default-decoration {
padding: 4px; min-height: 28px;
min-height: 28px; } padding: 4px; }
.default-decoration.titlebar:not(headerbar) button.titlebutton, .default-decoration.titlebar:not(headerbar) button.titlebutton,
headerbar.default-decoration button.titlebutton { headerbar.default-decoration button.titlebutton {
min-height: 26px; min-height: 26px;
@ -2110,29 +2112,29 @@ treeview.view {
treeview.view header.button.dnd:hover, treeview.view header.button.dnd:hover,
treeview.view header.button.dnd { treeview.view header.button.dnd {
padding: 0 6px; padding: 0 6px;
transition: none; color: #ffffff;
background-image: none; background-image: none;
background-color: #4a90d9; background-color: #4a90d9;
color: #ffffff;
border-radius: 0;
border-style: none; border-style: none;
border-radius: 0;
box-shadow: inset 0 0 0 1px #ffffff; box-shadow: inset 0 0 0 1px #ffffff;
text-shadow: none; } text-shadow: none;
transition: none; }
treeview.view header button, treeview.view header button:hover, treeview.view header button:active { treeview.view header button, treeview.view header button:hover, treeview.view header button:active {
padding: 0 6px; padding: 0 6px;
border-radius: 0;
background-image: none; background-image: none;
text-shadow: none;
border-style: none solid solid none; border-style: none solid solid none;
border-color: #e8e8e7; } border-color: #e8e8e7;
border-radius: 0;
text-shadow: none; }
treeview.view header button:disabled { treeview.view header button:disabled {
border-color: #e8e8e7; border-color: #e8e8e7;
background-image: none; } background-image: none; }
treeview.view header button:backdrop { treeview.view header button:backdrop {
color: #babbbb;
border-color: #e8e8e7; border-color: #e8e8e7;
border-style: none solid solid none; border-style: none solid solid none;
color: #babbbb;
background-image: none; background-image: none;
background-color: #fcfcfc; } background-color: #fcfcfc; }
treeview.view header button:backdrop:disabled { treeview.view header button:backdrop:disabled {
@ -4497,7 +4499,7 @@ popover.background radiobutton:selected,
color: #7fb0e4; } color: #7fb0e4; }
.monospace { .monospace {
font: Monospace; } font-family: monospace; }
/********************** /**********************
* Touch Copy & Paste * * Touch Copy & Paste *