callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adwaita: non csd message dialog and entry shadow fix

Browse Source 
Made the non csd message dialog more similar to the csd one (to
match the csd one we need mutter theme changes), little shadow fix
for entry.
This commit is contained in:
Lapo Calamandrei 2014-07-07 19:51:27 +02:00
parent b40672f145
commit e2af4853fc
4 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1855,6 +1855,10 @@ GtkCalendar {
* Dialogs *
***********/
.message-dialog .dialog-action-area .button {
padding: 8px;
}
.message-dialog { // Message Dialog styling
-GtkDialog-button-spacing: 0;
.titlebar {

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

@ -39,7 +39,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
$_blank_inner_shadows: inset 0 2px 2px -2px transparentize(
mix(black, $base_color, 50%),1),
inset 0 0 2px 1px transparentize(
mix($fc,$base_color),1);
mix($fc,$base_color,20%),1);
$_blank_edge: if($noedge, none, 0 1px transparentize(white,1));
$_entry_edge: $widget_edge;
@ -48,7 +48,8 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
@if $t==normal {
border-color: $borders_color;
@include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
inset 0 0 2px 1px transparentize(mix($fc,$base_color),1),
inset 0 0 2px 1px transparentize(
mix($fc,$base_color,20%),1),
$_entry_edge);
// the second transparent shadow is needed for the transition to work
}

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

@ -142,7 +142,7 @@
border-width: 1px;
background-image: linear-gradient(to bottom, #212121, #292929 90%);
border-color: #1c1f1f;
box-shadow: inset 0 2px 2px -2px #141414, inset 0 0 2px 1px rgba(37, 67, 98, 0), 0 1px rgba(238, 238, 236, 0.1); }
box-shadow: inset 0 2px 2px -2px #141414, inset 0 0 2px 1px rgba(39, 51, 64, 0), 0 1px rgba(238, 238, 236, 0.1); }
.entry.flat, .entry.flat:focus {
padding: 2px;
background-color: transparent;
@ -150,7 +150,7 @@
border-width: 1px;
background-image: linear-gradient(to bottom, #212121, #292929 90%);
border-color: #1c1f1f;
box-shadow: inset 0 2px 2px -2px #141414, inset 0 0 2px 1px rgba(37, 67, 98, 0);
box-shadow: inset 0 2px 2px -2px #141414, inset 0 0 2px 1px rgba(39, 51, 64, 0);
border: none;
border-radius: 0; }
.entry:focus {
@ -168,7 +168,7 @@
color: #939695;
border-color: #1c1f1f;
background-image: linear-gradient(to bottom, #323636);
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(37, 67, 98, 0), 0 1px rgba(238, 238, 236, 0.1); }
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(39, 51, 64, 0), 0 1px rgba(238, 238, 236, 0.1); }
.entry:backdrop {
background-color: transparent;
border-style: solid;
@ -176,7 +176,7 @@
background-image: linear-gradient(to bottom, #212121, #292929 90%);
color: #c9cbc9;
background-image: linear-gradient(to bottom, #2c2c2c);
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(37, 67, 98, 0), 0 1px rgba(255, 255, 255, 0); }
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(39, 51, 64, 0), 0 1px rgba(255, 255, 255, 0); }
.entry:backdrop:insensitive {
background-color: transparent;
border-style: solid;
@ -184,7 +184,7 @@
background-image: linear-gradient(to bottom, #212121, #292929 90%);
color: #454c4c;
background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(37, 67, 98, 0), 0 1px rgba(255, 255, 255, 0); }
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(39, 51, 64, 0), 0 1px rgba(255, 255, 255, 0); }
.entry:selected, .entry:backdrop:selected {
background-color: #215d9c;
color: white; }
@ -2244,7 +2244,7 @@ GtkLevelBar.vertical {
border-width: 1px;
background-image: linear-gradient(to bottom, #212121, #292929 90%);
border-color: #1c1f1f;
box-shadow: inset 0 2px 2px -2px #141414, inset 0 0 2px 1px rgba(37, 67, 98, 0), 0 1px rgba(238, 238, 236, 0.1); }
box-shadow: inset 0 2px 2px -2px #141414, inset 0 0 2px 1px rgba(39, 51, 64, 0), 0 1px rgba(238, 238, 236, 0.1); }
.level-bar.trough:backdrop {
background-color: transparent;
border-style: solid;
@ -2252,7 +2252,7 @@ GtkLevelBar.vertical {
background-image: linear-gradient(to bottom, #212121, #292929 90%);
color: #c9cbc9;
background-image: linear-gradient(to bottom, #2c2c2c);
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(37, 67, 98, 0), 0 1px rgba(255, 255, 255, 0); }
box-shadow: inset 0 2px 2px -2px rgba(20, 20, 20, 0), inset 0 0 2px 1px rgba(39, 51, 64, 0), 0 1px rgba(255, 255, 255, 0); }
.level-bar.fill-block {
border-width: 1px;
border-style: solid;
@ -2385,6 +2385,9 @@ GtkCalendar {
/***********
* Dialogs *
***********/
.message-dialog .dialog-action-area .button {
padding: 8px; }
.message-dialog {
-GtkDialog-button-spacing: 0; }
.message-dialog .titlebar {

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

@ -142,7 +142,7 @@
border-width: 1px;
background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
border-color: #a1a1a1;
box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px rgba(164, 199, 236, 0), 0 1px white; }
box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px rgba(218, 232, 247, 0), 0 1px white; }
.entry.flat, .entry.flat:focus {
padding: 2px;
background-color: transparent;
@ -150,7 +150,7 @@
border-width: 1px;
background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
border-color: #a1a1a1;
box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px rgba(164, 199, 236, 0);
box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px rgba(218, 232, 247, 0);
border: none;
border-radius: 0; }
.entry:focus {
@ -168,7 +168,7 @@
color: #8d9091;
border-color: #a1a1a1;
background-image: linear-gradient(to bottom, #f4f4f4);
box-shadow: inset 0 2px 2px -2px rgba(127, 127, 127, 0), inset 0 0 2px 1px rgba(164, 199, 236, 0), 0 1px white; }
box-shadow: inset 0 2px 2px -2px rgba(127, 127, 127, 0), inset 0 0 2px 1px rgba(218, 232, 247, 0), 0 1px white; }
.entry:backdrop {
background-color: transparent;
border-style: solid;
@ -176,7 +176,7 @@
background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
color: #54595a;
background-image: linear-gradient(to bottom, #fcfcfc);
box-shadow: inset 0 2px 2px -2px rgba(127, 127, 127, 0), inset 0 0 2px 1px rgba(164, 199, 236, 0), 0 1px rgba(255, 255, 255, 0); }
box-shadow: inset 0 2px 2px -2px rgba(127, 127, 127, 0), inset 0 0 2px 1px rgba(218, 232, 247, 0), 0 1px rgba(255, 255, 255, 0); }
.entry:backdrop:insensitive {
background-color: transparent;
border-style: solid;
@ -184,7 +184,7 @@
background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
color: #c7c7c7;
background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 2px 2px -2px rgba(127, 127, 127, 0), inset 0 0 2px 1px rgba(164, 199, 236, 0), 0 1px rgba(255, 255, 255, 0); }
box-shadow: inset 0 2px 2px -2px rgba(127, 127, 127, 0), inset 0 0 2px 1px rgba(218, 232, 247, 0), 0 1px rgba(255, 255, 255, 0); }
.entry:selected, .entry:backdrop:selected {
background-color: #4a90d9;
color: white; }
@ -2235,7 +2235,7 @@ GtkLevelBar.vertical {
border-width: 1px;
background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
border-color: #a1a1a1;
box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px rgba(164, 199, 236, 0), 0 1px white; }
box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px rgba(218, 232, 247, 0), 0 1px white; }
.level-bar.trough:backdrop {
background-color: transparent;
border-style: solid;
@ -2243,7 +2243,7 @@ GtkLevelBar.vertical {
background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
color: #54595a;
background-image: linear-gradient(to bottom, #fcfcfc);
box-shadow: inset 0 2px 2px -2px rgba(127, 127, 127, 0), inset 0 0 2px 1px rgba(164, 199, 236, 0), 0 1px rgba(255, 255, 255, 0); }
box-shadow: inset 0 2px 2px -2px rgba(127, 127, 127, 0), inset 0 0 2px 1px rgba(218, 232, 247, 0), 0 1px rgba(255, 255, 255, 0); }
.level-bar.fill-block {
border-width: 1px;
border-style: solid;
@ -2377,6 +2377,9 @@ GtkCalendar {
/***********
* Dialogs *
***********/
.message-dialog .dialog-action-area .button {
padding: 8px; }
.message-dialog {
-GtkDialog-button-spacing: 0; }
.message-dialog .titlebar {