[gtk+/wip/adwaita-saner-linked-entries] Adwaita: cleanup commented code
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/adwaita-saner-linked-entries] Adwaita: cleanup commented code
- Date: Tue, 7 Oct 2014 11:44:46 +0000 (UTC)
commit d1622ad5ef06481473fecb97a206946c70277988
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Tue Oct 7 13:43:54 2014 +0200
Adwaita: cleanup commented code
gtk/resources/theme/Adwaita/_common.scss | 74 -------------------
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 76 +-------------------
gtk/resources/theme/Adwaita/gtk-contained.css | 76 +-------------------
3 files changed, 2 insertions(+), 224 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 0dd6048..ed7969c 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -328,80 +328,6 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
&:backdrop { color: mix($backdrop_fg_color,$backdrop_base_color,80%); }
}
-/*
- .linked.vertical & { //FIXME comment stuff and make the whole thing smarter.
- @include entry(normal, $edge: none);
- background-image: linear-gradient(to bottom, $base_color);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- box-shadow: none;
- @extend %linked_vertical;
- &:focus {
- border-color: entry_focus_border($selected_bg_color);
- box-shadow: entry_focus_glow($selected_bg_color),
- 0 -1px 0 0 entry_focus_border($selected_bg_color);
- @extend %linked_vertical;
- }
- &:insensitive {
- @include entry(insensitive, $edge: none);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- @extend %linked_vertical;
- &:backdrop {
- @include entry(backdrop-insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical;
- }
- }
- &:backdrop {
- @include entry(backdrop, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical;
- }
- &:first-child {
- @include entry(normal, $edge: none);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- &:focus { @include entry(focus, $edge: none); }
- &:insensitive {
- @include entry(insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical:first-child;
- &:backdrop {
- @include entry(backdrop-insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- border-top-style: solid;
- }
- }
- &:backdrop {
- @include entry(backdrop, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical:first-child;
- }
- }
- &:last-child {
- @include entry(normal);
- background-image: linear-gradient(to bottom, $base_color);
- box-shadow: _widget_edge();
- &:focus {
- border-color: entry_focus_border($selected_bg_color);
- box-shadow: entry_focus_glow($selected_bg_color),
- 0 -1px 0 0 entry_focus_border($selected_bg_color),
- _widget_edge();
- @extend %linked_vertical:last-child;
- }
- &:insensitive {
- @include entry(insensitive);
- @extend %linked_vertical:last-child;
- &:backdrop {
- @include entry(backdrop-insensitive);
- @extend %linked_vertical:last-child;
- }
- }
- &:backdrop {
- @include entry(backdrop);
- @extend %linked_vertical:last-child;
- }
- }
- }
- */
}
// set flat background and dimmed top border
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 0809d2a..17bbb0c 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -172,81 +172,7 @@ GtkTextView {
background-color: #292929;
background-image: linear-gradient(to bottom, #212121, #292929 90%);
border-color: #1c1f1f;
- box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0,
0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1);
- /*
- .linked.vertical & { //FIXME comment stuff and make the whole thing smarter.
- @include entry(normal, $edge: none);
- background-image: linear-gradient(to bottom, $base_color);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- box-shadow: none;
- @extend %linked_vertical;
- &:focus {
- border-color: entry_focus_border($selected_bg_color);
- box-shadow: entry_focus_glow($selected_bg_color),
- 0 -1px 0 0 entry_focus_border($selected_bg_color);
- @extend %linked_vertical;
- }
- &:insensitive {
- @include entry(insensitive, $edge: none);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- @extend %linked_vertical;
- &:backdrop {
- @include entry(backdrop-insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical;
- }
- }
- &:backdrop {
- @include entry(backdrop, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical;
- }
- &:first-child {
- @include entry(normal, $edge: none);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- &:focus { @include entry(focus, $edge: none); }
- &:insensitive {
- @include entry(insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical:first-child;
- &:backdrop {
- @include entry(backdrop-insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- border-top-style: solid;
- }
- }
- &:backdrop {
- @include entry(backdrop, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical:first-child;
- }
- }
- &:last-child {
- @include entry(normal);
- background-image: linear-gradient(to bottom, $base_color);
- box-shadow: _widget_edge();
- &:focus {
- border-color: entry_focus_border($selected_bg_color);
- box-shadow: entry_focus_glow($selected_bg_color),
- 0 -1px 0 0 entry_focus_border($selected_bg_color),
- _widget_edge();
- @extend %linked_vertical:last-child;
- }
- &:insensitive {
- @include entry(insensitive);
- @extend %linked_vertical:last-child;
- &:backdrop {
- @include entry(backdrop-insensitive);
- @extend %linked_vertical:last-child;
- }
- }
- &:backdrop {
- @include entry(backdrop);
- @extend %linked_vertical:last-child;
- }
- }
- }
- */ }
+ box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0,
0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
.entry.image.left {
padding-left: 0; }
.entry.image.right {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index f7aa223..631e3bc 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -172,81 +172,7 @@ GtkTextView {
background-color: #ffffff;
background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
border-color: #a1a1a1;
- box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0,
0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white;
- /*
- .linked.vertical & { //FIXME comment stuff and make the whole thing smarter.
- @include entry(normal, $edge: none);
- background-image: linear-gradient(to bottom, $base_color);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- box-shadow: none;
- @extend %linked_vertical;
- &:focus {
- border-color: entry_focus_border($selected_bg_color);
- box-shadow: entry_focus_glow($selected_bg_color),
- 0 -1px 0 0 entry_focus_border($selected_bg_color);
- @extend %linked_vertical;
- }
- &:insensitive {
- @include entry(insensitive, $edge: none);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- @extend %linked_vertical;
- &:backdrop {
- @include entry(backdrop-insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical;
- }
- }
- &:backdrop {
- @include entry(backdrop, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical;
- }
- &:first-child {
- @include entry(normal, $edge: none);
- border-bottom-color: mix($borders_color, $base_color, 30%);
- &:focus { @include entry(focus, $edge: none); }
- &:insensitive {
- @include entry(insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical:first-child;
- &:backdrop {
- @include entry(backdrop-insensitive, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- border-top-style: solid;
- }
- }
- &:backdrop {
- @include entry(backdrop, $edge: none);
- border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
- @extend %linked_vertical:first-child;
- }
- }
- &:last-child {
- @include entry(normal);
- background-image: linear-gradient(to bottom, $base_color);
- box-shadow: _widget_edge();
- &:focus {
- border-color: entry_focus_border($selected_bg_color);
- box-shadow: entry_focus_glow($selected_bg_color),
- 0 -1px 0 0 entry_focus_border($selected_bg_color),
- _widget_edge();
- @extend %linked_vertical:last-child;
- }
- &:insensitive {
- @include entry(insensitive);
- @extend %linked_vertical:last-child;
- &:backdrop {
- @include entry(backdrop-insensitive);
- @extend %linked_vertical:last-child;
- }
- }
- &:backdrop {
- @include entry(backdrop);
- @extend %linked_vertical:last-child;
- }
- }
- }
- */ }
+ box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0,
0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
.entry.image.left {
padding-left: 0; }
.entry.image.right {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]