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

Adwaita: change widget_edge() to _widget_edge()

Browse Source 
For consistence with other "private" functions.
This commit is contained in:
Lapo Calamandrei 2014-09-03 14:27:07 +02:00
parent 58bef3a464
commit f8ee954a10
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -683,7 +683,7 @@ GtkColorButton.button {
GtkColorSwatch { GtkColorSwatch {
border-radius: 1.5px; border-radius: 1.5px;
box-shadow: inset 0 1px 1px transparentize(black, 0.8), box-shadow: inset 0 1px 1px transparentize(black, 0.8),
widget_edge(); _widget_edge();
&:backdrop { box-shadow: none; } &:backdrop { box-shadow: none; }
} }
} }
@ -928,7 +928,7 @@ GtkComboBox {
$_bg: mix($bg_color, $borders_color, 70%); $_bg: mix($bg_color, $borders_color, 70%);
background-color: $_bg; background-color: $_bg;
box-shadow: inset 0 2px 3px -1px mix($borders_color, $_bg, 60%), box-shadow: inset 0 2px 3px -1px mix($borders_color, $_bg, 60%),
widget_edge(); _widget_edge();
//FIXME edge would be nice, but doesn't work //FIXME edge would be nice, but doesn't work
&:backdrop { &:backdrop {
border-color: $backdrop_borders_color; border-color: $backdrop_borders_color;
@ -1638,7 +1638,7 @@ GtkSwitch {
font-size: 82%; font-size: 82%;
outline-offset: -4px; outline-offset: -4px;
box-shadow: inset 0 1px transparentize(black, 0.9), // needs to be set here box-shadow: inset 0 1px transparentize(black, 0.9), // needs to be set here
widget_edge(); // otherwise it gets _widget_edge(); // otherwise it gets
// clipped // clipped
&.trough { &.trough {
// similar to the .scale // similar to the .scale
@ -1651,7 +1651,7 @@ GtkSwitch {
@include progressbar_fill; @include progressbar_fill;
color: white; color: white;
border-color: $selected_borders_color; border-color: $selected_borders_color;
box-shadow: widget_edge(); box-shadow: _widget_edge();
//text-shadow: 0 1px transparentize($selected_borders_color,0.5); //text-shadow: 0 1px transparentize($selected_borders_color,0.5);
text-shadow: 0 1px transparentize($selected_borders_color,0.5), text-shadow: 0 1px transparentize($selected_borders_color,0.5),
0 0 2px transparentize(white,0.4); 0 0 2px transparentize(white,0.4);
@ -1661,7 +1661,7 @@ GtkSwitch {
border-color: $borders_color; border-color: $borders_color;
background-image: none; background-image: none;
background-color: $insensitive_bg_color; background-color: $insensitive_bg_color;
box-shadow: widget_edge(); box-shadow: _widget_edge();
text-shadow: none; text-shadow: none;
} }
&:backdrop { &:backdrop {
@ -1895,11 +1895,11 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
border-radius: 3px; border-radius: 3px;
background-color: mix($bg_color,$borders_color,60%); background-color: mix($bg_color,$borders_color,60%);
box-shadow: inset 1px 1px transparentize(black, 0.9), box-shadow: inset 1px 1px transparentize(black, 0.9),
widget_edge(); _widget_edge();
&.highlight { &.highlight {
@include progressbar_fill; @include progressbar_fill;
border-color: $selected_borders_color; border-color: $selected_borders_color;
box-shadow: widget_edge(); box-shadow: _widget_edge();
&.vertical { @include progressbar_fill(vertical); } &.vertical { @include progressbar_fill(vertical); }
&:backdrop { &:backdrop {
border-color: if($variant=='light', $selected_bg_color, border-color: if($variant=='light', $selected_bg_color,
@ -1912,7 +1912,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
border-color: $insensitive_borders_color; border-color: $insensitive_borders_color;
background-image: none; background-image: none;
background-color: $insensitive_bg_color; background-color: $insensitive_bg_color;
box-shadow: widget_edge(); box-shadow: _widget_edge();
} }
&:backdrop { &:backdrop {
border-color: $backdrop_borders_color; border-color: $backdrop_borders_color;
@ -2010,7 +2010,7 @@ GtkProgressBar {
font-size: 82%; font-size: 82%;
color: transparentize($fg_color, 0.6); color: transparentize($fg_color, 0.6);
box-shadow: inset 1px 1px transparentize(black, 0.9), // needs to be set box-shadow: inset 1px 1px transparentize(black, 0.9), // needs to be set
widget_edge(); // here ot it gets _widget_edge(); // here ot it gets
// clipped // clipped
&:backdrop { &:backdrop {
color: $backdrop_insensitive_color; color: $backdrop_insensitive_color;
@ -2087,7 +2087,7 @@ GtkProgressBar.trough {
GtkLevelBar { GtkLevelBar {
-GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-width: 34;
-GtkLevelBar-min-block-height: 3; -GtkLevelBar-min-block-height: 3;
box-shadow: widget_edge(); // needs to be set here to avoid clipping box-shadow: _widget_edge(); // needs to be set here to avoid clipping
} }
GtkLevelBar.vertical { GtkLevelBar.vertical {

8
gtk/resources/theme/Adwaita/_drawing.scss
View File

@ -2,7 +2,7 @@
// generic drawing of more complex things // generic drawing of more complex things
@function widget_edge($c:$borders_edge) { @function _widget_edge($c:$borders_edge) {
// outer highlight "used" on most widgets // outer highlight "used" on most widgets
@return 0 1px $c; @return 0 1px $c;
} }
@ -38,7 +38,7 @@
background-color: transparent; background-color: transparent;
background-image: entry_gradient($base_color); background-image: entry_gradient($base_color);
$_blank_edge: if($edge == none, none, 0 1px transparentize($edge,1)); $_blank_edge: if($edge == none, none, 0 1px transparentize($edge,1));
$_entry_edge: if($edge == none, none, widget_edge($edge)); $_entry_edge: if($edge == none, none, _widget_edge($edge));
$_inner_shadows: inset 0 3px mix(black, $base_color, 3%), $_inner_shadows: inset 0 3px mix(black, $base_color, 3%),
inset 0 1px mix(black, $base_color, 18%); inset 0 1px mix(black, $base_color, 18%);
@if $variant == 'dark' { @if $variant == 'dark' {
@ -148,8 +148,8 @@
$_top_hilight: if(lightness($c)> 70%, white, transparentize(white,0.9)); //not just dark/light but colored buttons $_top_hilight: if(lightness($c)> 70%, white, transparentize(white,0.9)); //not just dark/light but colored buttons
$_button_edge: if($edge == none, none, widget_edge($edge)); $_button_edge: if($edge == none, none, _widget_edge($edge));
$_blank_edge: if($edge == none, none, widget_edge(transparentize($edge,1))); $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
@if $t==normal { @if $t==normal {
// //