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

Adwaita: cosmetic fixes

Browse Source
This commit is contained in:
Lapo Calamandrei 2016-04-02 16:03:02 +02:00
parent 2784eacf00
commit f2f1725b40
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -834,7 +834,7 @@ button {
// More inline toolbar buttons // More inline toolbar buttons
toolbar.inline-toolbar toolbutton, toolbar.inline-toolbar toolbutton,
toolbar.inline-toolbar toolbutton:backdrop { toolbar.inline-toolbar toolbutton:backdrop {
& > button.flat { @extend %linked_middle; } > button.flat { @extend %linked_middle; }
&:first-child > button.flat { @extend %linked:first-child; } &:first-child > button.flat { @extend %linked:first-child; }
@ -1574,7 +1574,7 @@ treeview.view {
border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color, border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color,
border-top-color: $bg_color; // while this is the grid lines color, better then nothing border-top-color: $bg_color; // while this is the grid lines color, better then nothing
& rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
&:selected { &:selected {
&:focus, & { &:focus, & {
@ -1923,7 +1923,7 @@ popover.background {
border-radius: 5px; border-radius: 5px;
background-color: $popover_bg_color; background-color: $popover_bg_color;
&, .csd & { border: 1px solid $borders_color; } .csd &, & { border: 1px solid $borders_color; }
box-shadow: 0 1px 2px transparentize(black, 0.7); box-shadow: 0 1px 2px transparentize(black, 0.7);
@ -1939,7 +1939,7 @@ popover.background {
background-color: transparent; background-color: transparent;
} }
&, .csd & { .csd &, & {
&.touch-selection, &.touch-selection,
&.magnifier { &.magnifier {
@extend %osd; @extend %osd;
@ -2740,7 +2740,7 @@ treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a work
} }
// ...on selected list rows // ...on selected list rows
row:selected & { &, &:disabled { border-color: $selected_borders_color; } } row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
// OSD // OSD
.osd & { .osd & {
@ -3887,7 +3887,7 @@ infobar { border-style: none; }
} }
} }
& label:selected { &:focus, &:hover, & { background-color: darken($selected_bg_color, 10%); }} label:selected { &:focus, &:hover, & { background-color: darken($selected_bg_color, 10%); }}
*:link { @extend %link_selected; } *:link { @extend %link_selected; }
} }
@ -4092,7 +4092,7 @@ colorchooser .popover.osd { border-radius: 5px; }
border-radius: 5px; border-radius: 5px;
} }
&:backdrop { &:hover, &:disabled, & {@extend %undecorated_button; }} &:backdrop { &:hover, &:disabled, & { @extend %undecorated_button; }}
} }
} }

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

@ -126,7 +126,7 @@ textview {
textview:backdrop { textview:backdrop {
background-color: #333636; } background-color: #333636; }
popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd 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;
@ -642,7 +642,7 @@ button.osd {
text-shadow: none; text-shadow: none;
-gtk-icon-shadow: none; -gtk-icon-shadow: none;
border: none; } border: none; }
popover.background.touch-selection button, popover.background.magnifier button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, .app-notification button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .app-notification button,
.app-notification.frame button, .osd .app-notification.frame button, .osd
button { button {
color: #eeeeec; color: #eeeeec;
@ -2217,7 +2217,7 @@ popover.background {
border-radius: 5px; border-radius: 5px;
background-color: #393f3f; background-color: #393f3f;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); } box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
popover.background, .csd popover.background { .csd popover.background, popover.background {
border: 1px solid #1c1f1f; } border: 1px solid #1c1f1f; }
popover.background:backdrop { popover.background:backdrop {
background-color: #393f3f; background-color: #393f3f;
@ -2228,7 +2228,7 @@ popover.background {
popover.background > toolbar { popover.background > toolbar {
border-style: none; border-style: none;
background-color: transparent; } background-color: transparent; }
popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier { .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier {
border: 1px solid rgba(255, 255, 255, 0.1); } border: 1px solid rgba(255, 255, 255, 0.1); }
popover.background separator { popover.background separator {
margin: 3px; } margin: 3px; }
@ -2944,7 +2944,7 @@ scale highlight, progressbar progress {
scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled, progressbar:backdrop progress:disabled { scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled, progressbar:backdrop progress:disabled {
background-color: transparent; background-color: transparent;
border-color: transparent; } border-color: transparent; }
row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress, row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled { row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled, row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress {
border-color: #0f2b48; } border-color: #0f2b48; }
.osd scale highlight, scale .osd highlight, .osd progressbar progress, progressbar .osd progress { .osd scale highlight, scale .osd highlight, .osd progressbar progress, progressbar .osd progress {
border-color: rgba(0, 0, 0, 0.7); } border-color: rgba(0, 0, 0, 0.7); }

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

@ -126,7 +126,7 @@ textview {
textview:backdrop { textview:backdrop {
background-color: #f2f2f2; } background-color: #f2f2f2; }
popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd 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;
@ -645,7 +645,7 @@ button.osd {
text-shadow: none; text-shadow: none;
-gtk-icon-shadow: none; -gtk-icon-shadow: none;
border: none; } border: none; }
popover.background.touch-selection button, popover.background.magnifier button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, .app-notification button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .app-notification button,
.app-notification.frame button, .osd .app-notification.frame button, .osd
button { button {
color: #eeeeec; color: #eeeeec;
@ -2230,7 +2230,7 @@ popover.background {
border-radius: 5px; border-radius: 5px;
background-color: #e8e8e7; background-color: #e8e8e7;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); } box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
popover.background, .csd popover.background { .csd popover.background, popover.background {
border: 1px solid #9d9d99; } border: 1px solid #9d9d99; }
popover.background:backdrop { popover.background:backdrop {
background-color: #e8e8e7; background-color: #e8e8e7;
@ -2241,7 +2241,7 @@ popover.background {
popover.background > toolbar { popover.background > toolbar {
border-style: none; border-style: none;
background-color: transparent; } background-color: transparent; }
popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier { .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier {
border: 1px solid rgba(255, 255, 255, 0.1); } border: 1px solid rgba(255, 255, 255, 0.1); }
popover.background separator { popover.background separator {
margin: 3px; } margin: 3px; }
@ -2973,7 +2973,7 @@ scale highlight, progressbar progress {
scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled, progressbar:backdrop progress:disabled { scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled, progressbar:backdrop progress:disabled {
background-color: transparent; background-color: transparent;
border-color: transparent; } border-color: transparent; }
row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress, row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled { row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled, row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress {
border-color: #184472; } border-color: #184472; }
.osd scale highlight, scale .osd highlight, .osd progressbar progress, progressbar .osd progress { .osd scale highlight, scale .osd highlight, .osd progressbar progress, progressbar .osd progress {
border-color: rgba(0, 0, 0, 0.7); } border-color: rgba(0, 0, 0, 0.7); }