AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: move %selected_items at the end of the file

Browse Source 
To be able to use that all over the place avoiding duplication.
This commit is contained in:
Lapo Calamandrei 2014-09-02 23:28:21 +02:00
parent d4250eecf7
commit 9e8582e371
3 changed files with 162 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/resources/theme/Adwaita/_common.scss
View File

@ -2136,19 +2136,6 @@ GtkLevelBar.vertical {
}
}
// catch all extend :)
%selected_items {
background-color: $selected_bg_color;
color: $selected_fg_color;
@if $variant == 'light' {
outline-color: transparentize($selected_fg_color, 0.7);
}
&:backdrop {
@if $variant == 'light' { color: $backdrop_base_color; }
@else { color: $backdrop_fg_color; };
}
}
/**********
* Frames *
@ -2230,11 +2217,7 @@ GtkScrolledWindow {
}
.list-row:selected {
color: $selected_fg_color;
background-color: $selected_bg_color;
&:backdrop {
color: $backdrop_base_color;
}
@extend %selected_items;
.button {
@include button(normal, $noedge:true);
@if $variant == 'light' { border-color: $selected_borders_color; }
@ -2735,3 +2718,18 @@ GtkVolumeButton.button { padding: 8px; }
@extend .image-button;
}
// catch all extend :)
%selected_items {
background-color: $selected_bg_color;
color: $selected_fg_color;
@if $variant == 'light' {
outline-color: transparentize($selected_fg_color, 0.7);
}
&:backdrop {
@if $variant == 'light' { color: $backdrop_base_color; }
@else { color: $backdrop_fg_color; };
}
}

145
gtk/resources/theme/Adwaita/gtk-contained-dark.css
View File

@ -2902,16 +2902,6 @@ GtkLevelBar.vertical {
.level-bar.fill-block.empty-fill-block:backdrop {
border-color: rgba(201, 203, 201, 0.15); }
.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.button.titlebutton:selected,
.titlebar .menuitem.button.titlebutton:selected,
GtkCalendar.header .menuitem.button.titlebutton:selected {
background-color: #215d9c;
color: #ffffff; }
.view:backdrop:selected, GtkLabel:backdrop:selected, GtkFlowBox .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.button.titlebutton:backdrop:selected,
.titlebar .menuitem.button.titlebutton:backdrop:selected,
GtkCalendar.header .menuitem.button.titlebutton:backdrop:selected {
color: #c9cbc9; }
/**********
* Frames *
**********/
@ -2971,81 +2961,76 @@ GtkScrolledWindow GtkViewport.frame {
.list-row.button:selected:hover {
background-color: #1d538c; }
.list-row:selected {
color: #ffffff;
background-color: #215d9c; }
.list-row:selected:backdrop {
color: #2c2c2c; }
.list-row:selected .button {
.list-row:selected .button {
color: #eeeeec;
background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
border-color: #1c1f1f;
text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
.list-row:selected .button:hover, .list-row:selected .button.flat:hover, .list-row:selected .header-bar .button.titlebutton:hover, .header-bar .list-row:selected .button.titlebutton:hover,
.list-row:selected .titlebar .button.titlebutton:hover,
.titlebar .list-row:selected .button.titlebutton:hover,
.list-row:selected GtkCalendar.header .button.titlebutton:hover,
GtkCalendar.header .list-row:selected .button.titlebutton:hover {
color: #eeeeec;
background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
border-color: #1c1f1f;
text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
.list-row:selected .button:hover, .list-row:selected .button.flat:hover, .list-row:selected .header-bar .button.titlebutton:hover, .header-bar .list-row:selected .button.titlebutton:hover,
.list-row:selected .titlebar .button.titlebutton:hover,
.titlebar .list-row:selected .button.titlebutton:hover,
.list-row:selected GtkCalendar.header .button.titlebutton:hover,
GtkCalendar.header .list-row:selected .button.titlebutton:hover {
color: #eeeeec;
border-color: #1c1f1f;
background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
.list-row:selected .button:active, .list-row:selected .button.flat:active, .list-row:selected .header-bar .button.titlebutton:active, .header-bar .list-row:selected .button.titlebutton:active,
.list-row:selected .titlebar .button.titlebutton:active,
.titlebar .list-row:selected .button.titlebutton:active,
.list-row:selected GtkCalendar.header .button.titlebutton:active,
GtkCalendar.header .list-row:selected .button.titlebutton:active, .list-row:selected .button:checked, .list-row:selected .button.flat:checked, .list-row:selected .header-bar .button.titlebutton:checked, .header-bar .list-row:selected .button.titlebutton:checked,
.list-row:selected .titlebar .button.titlebutton:checked,
.titlebar .list-row:selected .button.titlebutton:checked,
.list-row:selected GtkCalendar.header .button.titlebutton:checked,
GtkCalendar.header .list-row:selected .button.titlebutton:checked {
color: #eeeeec;
border-color: #1c1f1f;
background-image: linear-gradient(to bottom, #232727, #2d3232);
text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
.list-row:selected .button:backdrop {
.list-row:selected .button:active, .list-row:selected .button.flat:active, .list-row:selected .header-bar .button.titlebutton:active, .header-bar .list-row:selected .button.titlebutton:active,
.list-row:selected .titlebar .button.titlebutton:active,
.titlebar .list-row:selected .button.titlebutton:active,
.list-row:selected GtkCalendar.header .button.titlebutton:active,
GtkCalendar.header .list-row:selected .button.titlebutton:active, .list-row:selected .button:checked, .list-row:selected .button.flat:checked, .list-row:selected .header-bar .button.titlebutton:checked, .header-bar .list-row:selected .button.titlebutton:checked,
.list-row:selected .titlebar .button.titlebutton:checked,
.titlebar .list-row:selected .button.titlebutton:checked,
.list-row:selected GtkCalendar.header .button.titlebutton:checked,
GtkCalendar.header .list-row:selected .button.titlebutton:checked {
color: #eeeeec;
border-color: #1c1f1f;
background-image: linear-gradient(to bottom, #232727, #2d3232);
text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
.list-row:selected .button:backdrop {
color: #c9cbc9;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #393f3f);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked {
color: #c9cbc9;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #393f3f);
text-shadow: none;
icon-shadow: none;
background-image: linear-gradient(to bottom, #2f3434);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked {
color: #c9cbc9;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #2f3434);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:backdrop:insensitive {
color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:backdrop:insensitive > GtkLabel {
color: inherit; }
.list-row:selected .button:backdrop:insensitive:active {
color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #303434);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:backdrop:insensitive:active > GtkLabel {
color: inherit; }
.list-row:selected .button:insensitive {
color: #939695;
border-color: #1c1f1f;
.list-row:selected .button:backdrop:insensitive {
color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #323636);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:insensitive > GtkLabel {
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:backdrop:insensitive > GtkLabel {
color: inherit; }
.list-row:selected .button:backdrop:insensitive:active {
color: #5d6767;
border-color: #1e2222;
background-image: linear-gradient(to bottom, #303434);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:backdrop:insensitive:active > GtkLabel {
color: inherit; }
.list-row:selected .button:insensitive {
color: #939695;
border-color: #1c1f1f;
background-image: linear-gradient(to bottom, #323636);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.list-row:selected .button:insensitive > GtkLabel {
color: inherit; }
/*.list-row.button:selected,
.list-row:selected {
@ -3561,6 +3546,16 @@ GtkVolumeButton.button {
border-radius: 7px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.button.titlebutton:selected,
.titlebar .menuitem.button.titlebutton:selected,
GtkCalendar.header .menuitem.button.titlebutton:selected, .list-row:selected {
background-color: #215d9c;
color: #ffffff; }
.view:backdrop:selected, GtkLabel:backdrop:selected, GtkFlowBox .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.button.titlebutton:backdrop:selected,
.titlebar .menuitem.button.titlebutton:backdrop:selected,
GtkCalendar.header .menuitem.button.titlebutton:backdrop:selected, .list-row:backdrop:selected {
color: #c9cbc9; }
/* GTK NAMED COLORS */
@define-color theme_fg_color #eeeeec;
@define-color theme_bg_color #393f3f;

157
gtk/resources/theme/Adwaita/gtk-contained.css
View File

@ -3041,17 +3041,6 @@ GtkLevelBar.vertical {
.level-bar.fill-block.empty-fill-block:backdrop {
border-color: rgba(84, 89, 90, 0.15); }
.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.button.titlebutton:selected,
.titlebar .menuitem.button.titlebutton:selected,
GtkCalendar.header .menuitem.button.titlebutton:selected {
background-color: #4a90d9;
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3); }
.view:backdrop:selected, GtkLabel:backdrop:selected, GtkFlowBox .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.button.titlebutton:backdrop:selected,
.titlebar .menuitem.button.titlebutton:backdrop:selected,
GtkCalendar.header .menuitem.button.titlebutton:backdrop:selected {
color: #fcfcfc; }
/**********
* Frames *
**********/
@ -3111,89 +3100,84 @@ GtkScrolledWindow GtkViewport.frame {
.list-row.button:selected:hover {
background-color: #4281c3; }
.list-row:selected {
color: #ffffff;
background-color: #4a90d9; }
.list-row:selected:backdrop {
color: #fcfcfc; }
.list-row:selected .button {
.list-row:selected .button {
color: #2e3436;
background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
border-color: #a1a1a1;
text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
box-shadow: inset 0 1px white;
border-color: #184472; }
.list-row:selected .button:hover, .list-row:selected .button.flat:hover, .list-row:selected .header-bar .button.titlebutton:hover, .header-bar .list-row:selected .button.titlebutton:hover,
.list-row:selected .titlebar .button.titlebutton:hover,
.titlebar .list-row:selected .button.titlebutton:hover,
.list-row:selected GtkCalendar.header .button.titlebutton:hover,
GtkCalendar.header .list-row:selected .button.titlebutton:hover {
color: #2e3436;
background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
border-color: #a1a1a1;
background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
box-shadow: inset 0 1px white;
border-color: #184472; }
.list-row:selected .button:hover, .list-row:selected .button.flat:hover, .list-row:selected .header-bar .button.titlebutton:hover, .header-bar .list-row:selected .button.titlebutton:hover,
.list-row:selected .titlebar .button.titlebutton:hover,
.titlebar .list-row:selected .button.titlebutton:hover,
.list-row:selected GtkCalendar.header .button.titlebutton:hover,
GtkCalendar.header .list-row:selected .button.titlebutton:hover {
color: #2e3436;
border-color: #a1a1a1;
background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
box-shadow: inset 0 1px white;
border-color: #184472; }
.list-row:selected .button:active, .list-row:selected .button.flat:active, .list-row:selected .header-bar .button.titlebutton:active, .header-bar .list-row:selected .button.titlebutton:active,
.list-row:selected .titlebar .button.titlebutton:active,
.titlebar .list-row:selected .button.titlebutton:active,
.list-row:selected GtkCalendar.header .button.titlebutton:active,
GtkCalendar.header .list-row:selected .button.titlebutton:active, .list-row:selected .button:checked, .list-row:selected .button.flat:checked, .list-row:selected .header-bar .button.titlebutton:checked, .header-bar .list-row:selected .button.titlebutton:checked,
.list-row:selected .titlebar .button.titlebutton:checked,
.titlebar .list-row:selected .button.titlebutton:checked,
.list-row:selected GtkCalendar.header .button.titlebutton:checked,
GtkCalendar.header .list-row:selected .button.titlebutton:checked {
color: #2e3436;
border-color: #a1a1a1;
background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0);
text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
border-color: #184472; }
.list-row:selected .button:backdrop {
.list-row:selected .button:active, .list-row:selected .button.flat:active, .list-row:selected .header-bar .button.titlebutton:active, .header-bar .list-row:selected .button.titlebutton:active,
.list-row:selected .titlebar .button.titlebutton:active,
.titlebar .list-row:selected .button.titlebutton:active,
.list-row:selected GtkCalendar.header .button.titlebutton:active,
GtkCalendar.header .list-row:selected .button.titlebutton:active, .list-row:selected .button:checked, .list-row:selected .button.flat:checked, .list-row:selected .header-bar .button.titlebutton:checked, .header-bar .list-row:selected .button.titlebutton:checked,
.list-row:selected .titlebar .button.titlebutton:checked,
.titlebar .list-row:selected .button.titlebutton:checked,
.list-row:selected GtkCalendar.header .button.titlebutton:checked,
GtkCalendar.header .list-row:selected .button.titlebutton:checked {
color: #2e3436;
border-color: #a1a1a1;
background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0);
text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
border-color: #184472; }
.list-row:selected .button:backdrop {
color: #54595a;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #ededed);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked {
color: #54595a;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #ededed);
background-image: linear-gradient(to bottom, #d4d4d4);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:backdrop:insensitive {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked {
color: #54595a;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #d4d4d4);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:backdrop:insensitive {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:backdrop:insensitive > GtkLabel {
color: inherit; }
.list-row:selected .button:backdrop:insensitive:active {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:backdrop:insensitive:active > GtkLabel {
color: inherit; }
.list-row:selected .button:insensitive {
color: #8d9091;
border-color: #a1a1a1;
background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:insensitive > GtkLabel {
.list-row:selected .button:backdrop:insensitive > GtkLabel {
color: inherit; }
.list-row:selected .button:backdrop:insensitive:active {
color: #c7c7c7;
border-color: #a8a8a8;
background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:backdrop:insensitive:active > GtkLabel {
color: inherit; }
.list-row:selected .button:insensitive {
color: #8d9091;
border-color: #a1a1a1;
background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
.list-row:selected .button:insensitive > GtkLabel {
color: inherit; }
/*.list-row.button:selected,
.list-row:selected {
@ -3709,6 +3693,17 @@ GtkVolumeButton.button {
border-radius: 7px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.button.titlebutton:selected,
.titlebar .menuitem.button.titlebutton:selected,
GtkCalendar.header .menuitem.button.titlebutton:selected, .list-row:selected {
background-color: #4a90d9;
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3); }
.view:backdrop:selected, GtkLabel:backdrop:selected, GtkFlowBox .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.button.titlebutton:backdrop:selected,
.titlebar .menuitem.button.titlebutton:backdrop:selected,
GtkCalendar.header .menuitem.button.titlebutton:backdrop:selected, .list-row:backdrop:selected {
color: #fcfcfc; }
/* GTK NAMED COLORS */
@define-color theme_fg_color #2e3436;
@define-color theme_bg_color #ededed;