[gnome-themes-standard] more notebook work...
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] more notebook work...
- Date: Mon, 9 Jun 2014 13:17:42 +0000 (UTC)
commit adbda1631dd3ea2e33b5efac87baaeeeec3fe9ed
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Fri May 30 18:14:45 2014 +0200
more notebook work...
themes/Adwaita/gtk-3.0/_common.scss | 27 +++++++++++------
themes/Adwaita/gtk-3.0/gtk-contained-dark.css | 39 ++++++++++++++++++-------
themes/Adwaita/gtk-3.0/gtk-contained.css | 39 ++++++++++++++++++-------
3 files changed, 74 insertions(+), 31 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index a094391..64c87ff 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -59,6 +59,7 @@
icon-shadow: none;
color: lighten($fg_color,10%);
+ background-color: $backdrop_bg_color;
}
/*
@@ -640,45 +641,50 @@ GtkPopover {
background-color: $backdrop_base_color;
}
&.frame {
- border-width: 1px;
- border-color: $borders_color;
+ border: 1px solid $borders_color;
+ &.top { border-top-width: 0; }
+ &.bottom { border-bottom-width: 0; }
+ &.right { border-right-width: 0; }
+ &.left { border-left-width: 0; }
&:backdrop { border-color: $backdrop_borders_color; }
- border-width: 0;
}
&.header {
// FIXME: double borders in some case, can't fix it w/o a class tho
background-color: mix($bg_color, $borders_color, 60%);
- border: 1px solid $borders_color;
// this is the shading of the header behind the tabs
+ &.frame {
+ border: 1px solid $borders_color;
+ &.top { border-bottom-width: 0; }
+ &.bottom { border-top-width: 0; }
+ &.right { border-left-width: 0; }
+ &.left { border-right-width: 0; }
+ &:backdrop { border-color: $backdrop_borders_color; }
+ }
+
$_header_shade: inset 0 2px 3px -1px transparentize(black, 0.85);
&.top {
- border-bottom: none;
box-shadow: $_header_shade,
inset 0 -1px $borders_color; // border
&:backdrop { box-shadow: inset 0 -1px $backdrop_borders_color; }
}
&.bottom {
- border-top: none;
box-shadow: $_header_shade,
inset 0 1px $borders_color;
&:backdrop { box-shadow: inset 0 1px $backdrop_borders_color; }
}
&.right {
- border-left: none;
box-shadow: $_header_shade,
inset 1px 0 $borders_color;
&:backdrop { box-shadow: inset 1px 0 $backdrop_borders_color; }
}
&.left {
- border-right: none;
box-shadow: $_header_shade,
inset -1px 0 $borders_color;
&:backdrop { box-shadow: inset -1px 0 $backdrop_borders_color; }
}
&:backdrop {
- border-color: $backdrop_borders_color;
// same color as backdrop pushed button
background-color: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
box-shadow: none;
@@ -776,6 +782,9 @@ GtkPopover {
}
}
+.notebook > .frame,
+.notebook > .view { border: none; }
+
/**************
* Scrollbars *
**************/
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 789995a..cf439c6 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -37,7 +37,8 @@
.background:backdrop {
text-shadow: none;
icon-shadow: none;
- color: white; }
+ color: white;
+ background-color: #393f3f; }
/*
These wildcard seems unavoidable, need to investigate.
@@ -680,36 +681,48 @@ GtkPopover {
.notebook:backdrop {
background-color: #262626; }
.notebook.frame {
- border-width: 1px;
- border-color: #1c1f1f;
- border-width: 0; }
+ border: 1px solid #1c1f1f; }
+ .notebook.frame.top {
+ border-top-width: 0; }
+ .notebook.frame.bottom {
+ border-bottom-width: 0; }
+ .notebook.frame.right {
+ border-right-width: 0; }
+ .notebook.frame.left {
+ border-left-width: 0; }
.notebook.frame:backdrop {
border-color: #1c1f1f; }
.notebook.header {
- background-color: #2d3232;
- border: 1px solid #1c1f1f; }
+ background-color: #2d3232; }
+ .notebook.header.frame {
+ border: 1px solid #1c1f1f; }
+ .notebook.header.frame.top {
+ border-bottom-width: 0; }
+ .notebook.header.frame.bottom {
+ border-top-width: 0; }
+ .notebook.header.frame.right {
+ border-left-width: 0; }
+ .notebook.header.frame.left {
+ border-right-width: 0; }
+ .notebook.header.frame:backdrop {
+ border-color: #1c1f1f; }
.notebook.header.top {
- border-bottom: none;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #1c1f1f; }
.notebook.header.top:backdrop {
box-shadow: inset 0 -1px #1c1f1f; }
.notebook.header.bottom {
- border-top: none;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #1c1f1f; }
.notebook.header.bottom:backdrop {
box-shadow: inset 0 1px #1c1f1f; }
.notebook.header.right {
- border-left: none;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #1c1f1f; }
.notebook.header.right:backdrop {
box-shadow: inset 1px 0 #1c1f1f; }
.notebook.header.left {
- border-right: none;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #1c1f1f; }
.notebook.header.left:backdrop {
box-shadow: inset -1px 0 #1c1f1f; }
.notebook.header:backdrop {
- border-color: #1c1f1f;
background-color: #2e3333;
box-shadow: none; }
.notebook tab {
@@ -787,6 +800,10 @@ GtkPopover {
.notebook tab .button > GtkImage {
padding: 3px; }
+.notebook > .frame,
+.notebook > .view {
+ border: none; }
+
/**************
* Scrollbars *
**************/
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 9beb5a7..d5cdc66 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -37,7 +37,8 @@
.background:backdrop {
text-shadow: none;
icon-shadow: none;
- color: #454f52; }
+ color: #454f52;
+ background-color: #ededed; }
/*
These wildcard seems unavoidable, need to investigate.
@@ -680,36 +681,48 @@ GtkPopover {
.notebook:backdrop {
background-color: #fcfcfc; }
.notebook.frame {
- border-width: 1px;
- border-color: #a1a1a1;
- border-width: 0; }
+ border: 1px solid #a1a1a1; }
+ .notebook.frame.top {
+ border-top-width: 0; }
+ .notebook.frame.bottom {
+ border-bottom-width: 0; }
+ .notebook.frame.right {
+ border-right-width: 0; }
+ .notebook.frame.left {
+ border-left-width: 0; }
.notebook.frame:backdrop {
border-color: #a1a1a1; }
.notebook.header {
- background-color: #cecece;
- border: 1px solid #a1a1a1; }
+ background-color: #cecece; }
+ .notebook.header.frame {
+ border: 1px solid #a1a1a1; }
+ .notebook.header.frame.top {
+ border-bottom-width: 0; }
+ .notebook.header.frame.bottom {
+ border-top-width: 0; }
+ .notebook.header.frame.right {
+ border-left-width: 0; }
+ .notebook.header.frame.left {
+ border-right-width: 0; }
+ .notebook.header.frame:backdrop {
+ border-color: #a1a1a1; }
.notebook.header.top {
- border-bottom: none;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #a1a1a1; }
.notebook.header.top:backdrop {
box-shadow: inset 0 -1px #a1a1a1; }
.notebook.header.bottom {
- border-top: none;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #a1a1a1; }
.notebook.header.bottom:backdrop {
box-shadow: inset 0 1px #a1a1a1; }
.notebook.header.right {
- border-left: none;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #a1a1a1; }
.notebook.header.right:backdrop {
box-shadow: inset 1px 0 #a1a1a1; }
.notebook.header.left {
- border-right: none;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #a1a1a1; }
.notebook.header.left:backdrop {
box-shadow: inset -1px 0 #a1a1a1; }
.notebook.header:backdrop {
- border-color: #a1a1a1;
background-color: #d2d2d2;
box-shadow: none; }
.notebook tab {
@@ -787,6 +800,10 @@ GtkPopover {
.notebook tab .button > GtkImage {
padding: 3px; }
+.notebook > .frame,
+.notebook > .view {
+ border: none; }
+
/**************
* Scrollbars *
**************/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]