diff --git a/gtk-3.20/scss/apps/_nemo.scss b/gtk-3.20/scss/apps/_nemo.scss
index d8526d5..0faca10 100644
--- a/gtk-3.20/scss/apps/_nemo.scss
+++ b/gtk-3.20/scss/apps/_nemo.scss
@@ -27,6 +27,20 @@
-NemoPathbarButton-border-radius: $roundness;
}
+ .sidebar .view {
+ -NemoPlacesTreeView-disk-full-bg-color: shade($bg_color, .8);
+ -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color;
+ -NemoPlacesTreeView-disk-full-bar-width: 1px;
+ -NemoPlacesTreeView-disk-full-bar-radius: 0px;
+ -NemoPlacesTreeView-disk-full-bottom-padding: 2px;
+ -NemoPlacesTreeView-disk-full-max-length: 75px;
+
+ &:selected {
+ -NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color;
+ -NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2);
+ }
+ }
+
.nemo-window {
toolbar {
border-width: 0 0 1px;
@@ -44,20 +58,6 @@
margin: 0px;
}
- .sidebar .view {
- -NemoPlacesTreeView-disk-full-bg-color: shade($toolbar_bg_color, .8);
- -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color;
- -NemoPlacesTreeView-disk-full-bar-width: 2px;
- -NemoPlacesTreeView-disk-full-bar-radius: 1px;
- -NemoPlacesTreeView-disk-full-bottom-padding: 0px;
- -NemoPlacesTreeView-disk-full-max-length: 75px;
-
- &:selected {
- -NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color;
- -NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2);
- }
- }
-
.sidebar frame {
border: 0;
}
@@ -90,36 +90,36 @@
}
toolbar {
- button {
- @include button($bg_color, $fg_color);
- }
-
- button.linked, .linked .button {
- @include linked_button($bg_color);
- }
-
- combobox button {
- padding: $spacing - 1px;
-
- &.text-button {
- padding: $spacing;
+ button {
+ @include button($bg_color, $fg_color);
}
- &.image-button {
- padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing;
+ button.linked, .linked .button {
+ @include linked_button($bg_color);
+ }
+
+ combobox button {
+ padding: $spacing - 1px;
+
+ &.text-button {
+ padding: $spacing;
+ }
+
+ &.image-button {
+ padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing;
+ }
+ }
+
+ separator, separator:disabled {
+ color: shade($bg_color, ($contrast + .1));
+ border-color: currentColor;
+ -GtkWidget-window-dragging: true;
+ }
+
+ &.primary-toolbar button {
+ padding: 5px 6px;
}
}
-
- separator, separator:disabled {
- color: shade($bg_color, ($contrast + .1));
- border-color: currentColor;
- -GtkWidget-window-dragging: true;
- }
-
- &.primary-toolbar button {
- padding: 5px 6px;
- }
- }
}
NemoQueryEditor {
@@ -146,8 +146,6 @@
border-bottom-color: border_normal($toolbar_bg_color);
}
}
-
}
}
-
}
diff --git a/gtk-3.20/scss/widgets/_base.scss b/gtk-3.20/scss/widgets/_base.scss
index fa6a5e7..2d5b27d 100755
--- a/gtk-3.20/scss/widgets/_base.scss
+++ b/gtk-3.20/scss/widgets/_base.scss
@@ -113,11 +113,6 @@ label {
}
}
-.dim-label {
- opacity: 0.55;
- text-shadow: none;
-}
-
assistant {
.sidebar {
background-color: $base_color;
diff --git a/gtk-3.20/scss/widgets/_grid.scss b/gtk-3.20/scss/widgets/_grid.scss
index 3b84110..12f03ed 100644
--- a/gtk-3.20/scss/widgets/_grid.scss
+++ b/gtk-3.20/scss/widgets/_grid.scss
@@ -33,7 +33,7 @@
}
.grid-child {
- &, flowBox & {
+ &, flowbox & {
padding: $spacing;
border-radius: $roundness;
diff --git a/gtk-3.20/scss/widgets/_notebook.scss b/gtk-3.20/scss/widgets/_notebook.scss
index ba97327..23e5b14 100644
--- a/gtk-3.20/scss/widgets/_notebook.scss
+++ b/gtk-3.20/scss/widgets/_notebook.scss
@@ -7,22 +7,17 @@
@include exports("notebook") {
notebook {
- padding: 0;
- border-width: 1px 0 0;
- border-style: solid;
- border-color: border_normal($base_color);
- border-radius: 0;
background-color: $base_color;
- background-image: none;
- background-clip: border-box;
- color: $text_color;
-
- &.frame { border-width: 1px; }
> header {
+ padding: 0;
margin: 0;
border-width: 0;
+ border-radius: 0;
+ background-image: none;
+ background-clip: border-box;
background-color: shade($base_color, .9);
+ color: $text_color;
&.frame {
border-color: border_normal($base_color);
@@ -48,7 +43,7 @@
}
tab {
- padding: ($spacing + 1px) ($spacing * 2);
+ padding: ($spacing + 1) ($spacing * 2);
border: 1px solid transparent;
background-color: transparent;
background-image: none;
@@ -62,9 +57,8 @@
background-color: $base_color;
background-image: none;
border-color: shade($base_color, .85);
- label {
- color: $text_color;
- }
+
+ label { color: $text_color; }
}
&.top {
@@ -92,10 +86,30 @@
border-bottom-right-radius: 0;
}
- label { color: mix($text_color, $base_color, .3); }
+ button.flat {
+ &:hover { color: shade(currentColor, .95); }
- /* close button styling */
- button { @extend %close_button; }
+ &, &:backdrop { color: gtkalpha(currentColor, .3); }
+
+ padding: 0;
+ margin-top: 4px;
+ margin-bottom: 4px;
+ // FIXME: generalize .small-button?
+ min-width: 20px;
+ min-height: 20px;
+
+ &:last-child {
+ margin-left: 4px;
+ margin-right: -4px;
+ }
+
+ &:first-child {
+ margin-left: -4px;
+ margin-right: 4px;
+ }
+ }
+
+ label { color: mix($text_color, $base_color, .3); }
}
.prelight-page {
@@ -109,8 +123,8 @@
.reorderable-page {
&:hover {
background-color: shade($base_color, .85);
- border-left: 0;
- border-right: 0;
+ //border-left: 0; // TODO: I turned it off because it made the tabs to collide, eg gedit. It needs fixing.
+ //border-right: 0;
/* using box shadows instead of borders due to slanted edges */
box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03),
inset 1px 0 shade($base_color, .7), inset -1px 0 shade($base_color, .7);
@@ -118,8 +132,8 @@
&:checked {
background-color: shade($base_color, .9);
- border-left: 0;
- border-right: 0;
+ //border-left: 0;
+ //border-right: 0;
box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03),
inset 1px 0 shade($base_color, .75), inset -1px 0 shade($base_color, .75);
}
diff --git a/gtk-3.20/scss/widgets/_sidebar.scss b/gtk-3.20/scss/widgets/_sidebar.scss
index 18e5963..3316b8b 100755
--- a/gtk-3.20/scss/widgets/_sidebar.scss
+++ b/gtk-3.20/scss/widgets/_sidebar.scss
@@ -48,6 +48,7 @@
}
.frame, frame { border-width: 0; }
+
.sidebar-icon {
padding-left: $spacing * 2;
padding-right: $spacing * 2;
diff --git a/gtk-3.20/scss/widgets/_toolbar.scss b/gtk-3.20/scss/widgets/_toolbar.scss
index f93040e..0e0d688 100755
--- a/gtk-3.20/scss/widgets/_toolbar.scss
+++ b/gtk-3.20/scss/widgets/_toolbar.scss
@@ -52,7 +52,7 @@
@include exports("toolbar") {
toolbar {
- @include toolbar($bg_color, $fg_color);
+ @include toolbar($toolbar_bg_color, $toolbar_fg_color);
border-style: none;
diff --git a/gtk-3.20/scss/widgets/_view.scss b/gtk-3.20/scss/widgets/_view.scss
index f0aa5c5..82280bc 100644
--- a/gtk-3.20/scss/widgets/_view.scss
+++ b/gtk-3.20/scss/widgets/_view.scss
@@ -167,39 +167,54 @@
@if $variant == light { color: $base_color; }
border: 1px solid $selected_borders_color;
- border-radius: 4px;
background-color: $selected_bg_color;
- background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color,10%));
- box-shadow: inset 0 1px if($variant == 'light', transparentize(white,0.7), transparentize(white,0.85)),
- 0 1px if($variant == 'light', transparentize(black, 0.8), transparentize(black,0.9));
+ //background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1));
+ box-shadow: inset 0 1px if($variant == 'light', transparentize(white, .7), transparentize(white, .85)),
+ 0 1px if($variant == 'light', transparentize(black, .8), transparentize(black, .9));
&:selected {
&:focus, & {
- border-radius: 4px;
-
@if $variant == 'light' {
- color: $selected_bg_color;
+ color: $selected_fg_color;
box-shadow: none;
- } @else { box-shadow: inset 0 1px transparentize(white, 0.95); }
+ } @else {
+ box-shadow: inset 0 1px transparentize(white, .95);
+ }
- background-image: linear-gradient(to bottom,
- $base_color,
- darken($base_color,10%));
+ background-color: linear-gradient(to bottom, $base_color, darken($base_color, .1));
&:backdrop {
@if $variant == 'light' {
color: $selected_bg_color;
border-color: $selected_borders_color; // otherwise it gets inherited by .view(?!?)
- } @else { border-color: $backdrop_base_color; }
+ } @else {
+ border-color: $backdrop_base_color;
+ }
- background-color: $backdrop_base_color;
+ background-color: mix($backdrop_base_color, $selected_bg_color, .9);
}
}
}
+ /* transmission fix. */
+ &:insensitive {
+ &:insensitive {
+ @include linear-gradient($bg_color);
+ border-color: border_insensitive($bg_color);
+ }
+ }
+
+ &:disabled {
+ @include linear-gradient($bg_color);
+ border-color: border_disabled($bg_color);
+ }
+
&:backdrop {
- @if $variant == 'light' { color: $backdrop_base_color;
- } @else { border-color: $backdrop_base_color; }
+ @if $variant == 'light' {
+ color: $backdrop_base_color;
+ } @else {
+ border-color: $backdrop_base_color;
+ }
background-image: none;
box-shadow: none;
@@ -207,15 +222,11 @@
}
&.trough { // progress bar trough in treeviews
- background-color: transparentize($fg_color,0.9);
- border-radius: 4px;
+ background-color: transparentize($fg_color, .9);
&:selected {
&:focus, & {
- background-color: if($variant == 'light',
- transparentize($selected_fg_color, 0.7),
- darken($selected_bg_color, 10%));
- border-radius: 4px;
+ background-color: if($variant == 'light', transparentize($selected_fg_color, .7), darken($selected_bg_color, .1));
@if $variant == 'light' {
border-width: 1px 0;