[gnome-themes-standard/wip/sass] more on tabs - added the backdrop state to the reorderable tab - used mix istead of transparenti
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard/wip/sass] more on tabs - added the backdrop state to the reorderable tab - used mix istead of transparenti
- Date: Thu, 29 May 2014 17:49:51 +0000 (UTC)
commit 1bf402db3ba4583dc534e56d2b6ee8bcd7dfdf65
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Thu May 29 19:46:53 2014 +0200
more on tabs
- added the backdrop state to the reorderable tab
- used mix istead of transparentize on colors involved which were taken
from buttons hence...
- same for buttons, which is saner though
themes/Adwaita/gtk-3.0/_common.scss | 9 ++++++---
themes/Adwaita/gtk-3.0/_drawing.scss | 7 +++----
themes/Adwaita/gtk-3.0/gtk-contained-dark.css | 11 +++++++----
themes/Adwaita/gtk-3.0/gtk-contained.css | 11 +++++++----
4 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index b5ac79c..7f6ad94 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -651,9 +651,8 @@ GtkPopover {
&.left { border-right: none; };
&:backdrop {
border-color: $backdrop_borders_color;
- // same color as backdrop pushed button, we use mix in both cases
- // hence, FIXME
- background-color: transparentize($backdrop_borders_color,.7);
+ // same color as backdrop pushed button
+ background-color: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
box-shadow: none;
}
}
@@ -705,6 +704,10 @@ GtkPopover {
border-width: 0 1px 0 1px;
background-color: transparentize($bg_color, .5); ;// darken($bg_color,3%);
border-color: transparentize($borders_color,0.5);
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: mix($backdrop_borders_color,$backdrop_bg_color, 8%);
+ }
}
GtkLabel { //tab text
font-weight: bold;
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index abb85d8..5757064 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -213,8 +213,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
color: $insensitive_fg_color;
border-color: $insensitive_borders_color;
background-image: linear-gradient(to bottom,
- transparentize($insensitive_borders_color,.8));
- //FIXME? better to use mix() probably
+ mix($insensitive_borders_color, $bg_color, 10%));
@if $noedge {
// white with 0 alpha to avoid an ugly transition, since no color means
// black with 0 alpha
@@ -247,7 +246,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
color: $backdrop_fg_color;
border-color: $backdrop_borders_color;
background-image: linear-gradient(to bottom,
- transparentize($backdrop_borders_color,.7));
+ mix($backdrop_borders_color,$backdrop_bg_color, 35%));
@include _shadows(inset 0 1px transparentize(white,1),
0 1px transparentize(white,1));
}
@@ -268,7 +267,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
color: $backdrop_insensitive_color;
border-color: $backdrop_borders_color;
background-image: linear-gradient(to bottom,
- transparentize($backdrop_borders_color,.9));
+ mix($backdrop_borders_color,$backdrop_bg_color, 8%));
@include _shadows(inset 0 1px transparentize(white,1),
0 1px transparentize(white,1));
}
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 9de362b..3022b99 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -208,7 +208,7 @@
border-style: solid;
color: #c9cbc9;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, rgba(28, 31, 31, 0.3));
+ background-image: linear-gradient(to bottom, #2e3333);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.button:backdrop:insensitive {
border-width: 1px;
@@ -221,7 +221,7 @@
border-style: solid;
color: #a0a3a2;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, rgba(28, 31, 31, 0.1));
+ background-image: linear-gradient(to bottom, #363c3c);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.button:insensitive {
border-width: 1px;
@@ -237,7 +237,7 @@
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, rgba(28, 31, 31, 0.2));
+ background-image: linear-gradient(to bottom, #363b3b);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
.button.suggested-action {
border-width: 1px;
@@ -700,7 +700,7 @@ GtkPopover {
border-right: none; }
.notebook.header.frame:backdrop {
border-color: #1c1f1f;
- background-color: rgba(28, 31, 31, 0.3);
+ background-color: #2e3333;
box-shadow: none; }
.notebook tab {
border-width: 0;
@@ -733,6 +733,9 @@ GtkPopover {
border-width: 0 1px 0 1px;
background-color: rgba(57, 63, 63, 0.5);
border-color: rgba(28, 31, 31, 0.5); }
+ .notebook tab.reorderable-page:active:backdrop {
+ border-color: #1c1f1f;
+ background-color: #363c3c; }
.notebook tab GtkLabel {
font-weight: bold;
color: #939695; }
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index c0eb071..6e61cd1 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -208,7 +208,7 @@
border-style: solid;
color: #54595a;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, rgba(161, 161, 161, 0.3));
+ background-image: linear-gradient(to bottom, #d2d2d2);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.button:backdrop:insensitive {
border-width: 1px;
@@ -221,7 +221,7 @@
border-style: solid;
color: #c7c7c7;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, rgba(161, 161, 161, 0.1));
+ background-image: linear-gradient(to bottom, #e6e6e6);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.button:insensitive {
border-width: 1px;
@@ -237,7 +237,7 @@
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, rgba(161, 161, 161, 0.2));
+ background-image: linear-gradient(to bottom, #e5e5e5);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
.button.suggested-action {
border-width: 1px;
@@ -700,7 +700,7 @@ GtkPopover {
border-right: none; }
.notebook.header.frame:backdrop {
border-color: #a1a1a1;
- background-color: rgba(161, 161, 161, 0.3);
+ background-color: #d2d2d2;
box-shadow: none; }
.notebook tab {
border-width: 0;
@@ -733,6 +733,9 @@ GtkPopover {
border-width: 0 1px 0 1px;
background-color: rgba(237, 237, 237, 0.5);
border-color: rgba(161, 161, 161, 0.5); }
+ .notebook tab.reorderable-page:active:backdrop {
+ border-color: #a1a1a1;
+ background-color: #e6e6e6; }
.notebook tab GtkLabel {
font-weight: bold;
color: #8d9091; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]