[gnome-themes-standard] added and used around $selected_borders_color;
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] added and used around $selected_borders_color;
- Date: Mon, 9 Jun 2014 13:19:48 +0000 (UTC)
commit f67d9fd2fe3e29da8739a1cedc2ea02703e7c4d7
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Wed Jun 4 09:42:51 2014 +0200
added and used around $selected_borders_color;
themes/Adwaita/gtk-3.0/_colors.scss | 3 ++-
themes/Adwaita/gtk-3.0/_common.scss | 16 ++++++++--------
themes/Adwaita/gtk-3.0/_drawing.scss | 4 ++--
themes/Adwaita/gtk-3.0/gtk-contained-dark.css | 14 +++++++-------
themes/Adwaita/gtk-3.0/gtk-contained.css | 2 +-
5 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_colors.scss b/themes/Adwaita/gtk-3.0/_colors.scss
index 989a644..46ccca3 100644
--- a/themes/Adwaita/gtk-3.0/_colors.scss
+++ b/themes/Adwaita/gtk-3.0/_colors.scss
@@ -7,7 +7,8 @@ $fg_color: if($variant =='light', #2e3436, #eeeeec);
$selected_fg_color: #fff;
$selected_bg_color: if($variant =='light', #4a90d9, darken(#4a90d9,20%));
-
+$selected_borders_color: if($variant == 'light',darken($selected_bg_color, 30%),
darken($selected_bg_color,15%));
+ // FIXME dark variant color
$borders_color: if($variant =='light', darken($bg_color,30%), darken($bg_color,12%));
$borders_edge: if($variant =='light', white, transparentize($fg_color,.9));
$link_color: lighten($selected_bg_color,10%);
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 77eba2f..38fd64c 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -560,7 +560,7 @@ GtkComboBox {
* Tree Views *
**************/
-column-header {
+column-header { // FIXME: something better
.button,
.button:hover,
.button:active,
@@ -898,7 +898,7 @@ GtkSwitch {
text-shadow: 0 1px transparentize(black, 0.9);
&:active {
color: white;
- border-color: darken($selected_bg_color, 30%); // FIXME it needs a var
+ border-color: $selected_borders_color;
background-color: $selected_bg_color;
box-shadow: $widget_edge;
text-shadow: 0 0 2px 1px white;
@@ -935,7 +935,7 @@ GtkSwitch {
transparentize(white,0.85)),
inset 0 -2px transparentize($bg_color,0.4),
inset 0 -1px mix($bg_color,$borders_color,50%);
- &:active { border: 1px solid darken($selected_bg_color, 30%); }
+ &:active { border: 1px solid $selected_borders_color; }
&:insensitive { @include button(insensitive, $noedge: true); }
&:backdrop { @include button(backdrop); }
&:backdrop:active{ border-color: $selected_bg_color; }
@@ -1025,11 +1025,11 @@ GtkCheckButton.text-button:selected { background-color: transparent; }
}
&:backdrop:insensitive { @include button(backdrop-insensitive); }
//FIXME we need a better color for the dark variant
- &:active { border: 1px solid darken($selected_bg_color,33%); }
+ &:active { border: 1px solid darken($selected_borders_color, 3%); }
&.fine-tune:active { //FIXME: Lapo doesn;t like this
border: 4px solid transparent; //margin
box-shadow: inset 0 2px white,
- inset 0 0 0 1px darken($selected_bg_color,33%); //border
+ inset 0 0 0 1px darken($selected_borders_color,3%); //border
}
}
&.trough {
@@ -1041,7 +1041,7 @@ GtkCheckButton.text-button:selected { background-color: transparent; }
box-shadow: inset 1px 1px transparentize(black, 0.9),
$widget_edge;
&.highlight {
- border-color: darken($selected_bg_color,30%);
+ border-color: $selected_borders_color;
background-color: $selected_bg_color;
box-shadow: $widget_edge;
&:backdrop {
@@ -1088,7 +1088,7 @@ GtkProgressBar {
border-width: 1px;
border-style: solid;
border-radius: 3px;
- border-color: darken($selected_bg_color,30%);
+ border-color: $selected_borders_color;
background-color: $selected_bg_color;
// I really prefer these flat w/o this shadow - Lapo
box-shadow: inset 0 1px 0 transparentize($borders_edge,0.8);
@@ -1146,7 +1146,7 @@ GtkLevelBar.vertical {
&.fill-block {
border-width: 1px;
border-style: solid;
- border-color: darken($selected_bg_color,10%);
+ border-color: $selected_borders_color;
background-color: $selected_bg_color;
&.indicator-continuous {
padding: 2px;
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index bccfbc0..1a442db 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -42,10 +42,10 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
$_entry_edge);
}
@if $t==focus {
- border-color: $selected_bg_color;
+ border-color: $selected_bg_color; //FIXME doesn't work on dark
@include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
inset 0 0 2px 1px mix($selected_bg_color,$base_color,20%),
- $_entry_edge);
+ $_entry_edge); //FIXME needs improvements wrt dark variant
}
@if $t==insensitive {
color: $insensitive_fg_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index d1705f2..be56ead 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -891,7 +891,7 @@ GtkSwitch {
text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
GtkSwitch.trough:active {
color: white;
- border-color: #06121e;
+ border-color: #14375d;
background-color: #215d9c;
box-shadow: 0 1px rgba(238, 238, 236, 0.1);
text-shadow: 0 0 2px 1px white; }
@@ -927,7 +927,7 @@ GtkSwitch {
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px
#2a2f2f; }
GtkSwitch.slider:active {
- border: 1px solid #06121e; }
+ border: 1px solid #14375d; }
GtkSwitch.slider:insensitive {
border-width: 1px;
border-style: solid;
@@ -1204,10 +1204,10 @@ GtkCheckButton.text-button:selected {
background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.scale.slider:active {
- border: 1px solid #040a11; }
+ border: 1px solid #113050; }
.scale.slider.fine-tune:active {
border: 4px solid transparent;
- box-shadow: inset 0 2px white, inset 0 0 0 1px #040a11; }
+ box-shadow: inset 0 2px white, inset 0 0 0 1px #113050; }
.scale.trough {
border-width: 1px;
border-style: solid;
@@ -1216,7 +1216,7 @@ GtkCheckButton.text-button:selected {
background-color: #2d3232;
box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
.scale.trough.highlight {
- border-color: #06121e;
+ border-color: #14375d;
background-color: #215d9c;
box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
.scale.trough.highlight:backdrop {
@@ -1249,7 +1249,7 @@ GtkProgressBar {
border-width: 1px;
border-style: solid;
border-radius: 3px;
- border-color: #06121e;
+ border-color: #14375d;
background-color: #215d9c;
box-shadow: inset 0 1px 0 rgba(238, 238, 236, 0); }
.progressbar.vertical {
@@ -1293,7 +1293,7 @@ GtkLevelBar.vertical {
.level-bar.fill-block {
border-width: 1px;
border-style: solid;
- border-color: #184472;
+ border-color: #14375d;
background-color: #215d9c; }
.level-bar.fill-block.indicator-continuous {
padding: 2px;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 6d3d9ad..408a4ef 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -1293,7 +1293,7 @@ GtkLevelBar.vertical {
.level-bar.fill-block {
border-width: 1px;
border-style: solid;
- border-color: #2a76c6;
+ border-color: #184472;
background-color: #4a90d9; }
.level-bar.fill-block.indicator-continuous {
padding: 2px;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]