aboutsummaryrefslogtreecommitdiff
path: root/common/gtk-3.0/3.18/sass
diff options
context:
space:
mode:
Diffstat (limited to 'common/gtk-3.0/3.18/sass')
-rw-r--r--common/gtk-3.0/3.18/sass/_applications.scss38
-rw-r--r--common/gtk-3.0/3.18/sass/_common.scss367
-rw-r--r--common/gtk-3.0/3.18/sass/_drawing.scss9
-rw-r--r--common/gtk-3.0/3.18/sass/_unity.scss2
4 files changed, 216 insertions, 200 deletions
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index 13fc8b9..d90000f 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -157,34 +157,36 @@ NemoWindow GtkSeparator.separator.horizontal {
@extend .nautilus-desktop.nautilus-canvas-item;
}
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
- $_linked_separator_color: $header_button_border;
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
@include button(header-hover);
&:hover { background-color: lighten($header_button_bg, 15%); }
&:active, &:checked { @include button(header-active); }
&:insensitive { color: transparentize($header_fg, 0.4); }
+}
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
@extend %linked;
+ @extend %linked_button;
+}
- &:hover {
- box-shadow: inset 1px 0 $_linked_separator_color,
- inset -1px 0 $_linked_separator_color;
- }
- &:active, &:checked { box-shadow: none; }
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) {
- &:first-child {
- &:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
- &:active, &:checked { box-shadow: none; }
- }
- &:last-child {
- &:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
- &:active, &:checked { box-shadow: none; }
- }
- &:only-child {
- &:hover { box-shadow: none; }
- &:active, &:checked { box-shadow: none; }
+ $_linked_separator_color: $header_button_border;
+
+ > .button:hover:not(:checked):not(:active):not(:only-child) {
+
+ &:hover {
+ box-shadow: inset 1px 0 $_linked_separator_color,
+ inset -1px 0 $_linked_separator_color;
+ }
+ &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
+ &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
}
}
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 408b429..c24eee0 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -240,7 +240,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
&:selected,
&:selected:focus {
- @extend %selected_items;
+ background-color: $selected_bg_color;
+ color: $selected_fg_color;
}
&.progressbar {
@@ -254,20 +255,6 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
box-shadow: none;
}
- .linked > & { //FIXME: use same buttons linking logic and template
- &:first-child {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- &:dir(rtl) { border-right-style: none;}
- }
- &:last-child {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- border-left-style: none;
- &:dir(rtl) { border-left-style: solid; }
- }
- }
-
&.error {
color: white;
border-color: $error_color;
@@ -302,52 +289,6 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
&:active { color: $selected_bg_color; }
}
- .linked.vertical > & { //FIXME comment stuff and make the whole thing smarter.
- border-bottom-color: mix($borders_color, $base_color, 30%);
- box-shadow: none;
- @extend %linked_vertical;
-
- &:focus {
- border-color: $selected_bg_color;
- box-shadow: 0 -1px 0 0 $selected_bg_color;
- @extend %linked_vertical;
- }
-
- &:insensitive {
- border-bottom-color: mix($borders_color, $base_color, 30%);
- @extend %linked_vertical;
- }
-
- &:first-child {
- border-bottom-color: mix($borders_color, $base_color, 30%);
-
- &:focus {
- border-bottom-color: $selected_bg_color;
- box-shadow: none;
- }
-
- &:insensitive {
- border-bottom-color: mix($borders_color, $base_color, 30%);
- @extend %linked_vertical:first-child;
- }
- }
-
- &:last-child {
- border-bottom-color: rgba(0,0,0,0.14);
- &:focus {
- border-bottom-color: $selected_bg_color;
- box-shadow: 0 -1px 0 0 $selected_bg_color;
- @extend %linked_vertical:last-child;
- }
-
- &:insensitive {
- border-bottom-color: rgba(0,0,0,0.14);
- @extend %linked_vertical:last-child;
-
- }
- }
- }
-
.osd & {
@include entry(osd);
&:focus { @include entry(osd-focus); }
@@ -616,15 +557,21 @@ $_dot_color: $selected_bg_color;
@extend %linked;
}
- .linked > &,
- .linked > &:hover,
- .linked > &:active,
- .linked > &:checked { @extend %linked; }
+ .linked:not(.vertical) > &,
+ .linked:not(.vertical) > &:hover,
+ .linked:not(.vertical) > &:active,
+ .linked:not(.vertical) > &:checked {
+ @extend %linked;
+ @extend %linked_button;
+ }
.linked.vertical > &,
.linked.vertical > &:hover,
.linked.vertical > &:active,
- .linked.vertical > &:checked { @extend %linked_vertical; }
+ .linked.vertical > &:checked {
+ @extend %linked_vertical;
+ @extend %linked_vertical_button;
+ }
}
// all the following is for the +|- buttons on inline toolbars, that way
@@ -643,99 +590,137 @@ $_dot_color: $selected_bg_color;
// More inline toolbar buttons
.inline-toolbar.toolbar GtkToolButton {
& > .button.flat { @extend %linked_middle; }
- &:dir(rtl) > .button.flat { @extend %linked_middle:dir(rtl); }
&:first-child > .button.flat { @extend %linked:first-child; }
&:last-child > .button.flat { @extend %linked:last-child; }
- &:last-child:dir(rtl) > .button.flat { @extend %linked:last-child:dir(rtl); }
&:only-child > .button.flat { @extend %linked:only-child; }
}
+// Some crazy linking stuff
+
+// horizontal
+.linked:not(.vertical):not(.pathbar) {
+ > .entry { @extend %linked; }
+
+ > .entry + .entry { border-left-color: transparentize($entry_border, 0.7); }
+ > .entry + .entry:focus:not(:last-child),
+ > .entry + .entry:focus:last-child { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+ > .entry + .button,
+ > .entry + .button:hover,
+ > .entry + .button:active,
+ > .entry + .button:checked,
+ > .entry + .button:insensitive { border-left-style: solid; }
+
+ > .entry:focus:not(:only-child) + .entry,
+ > .entry:focus:not(:only-child) + .button,
+ > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+ > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+ > .button:hover:not(:checked):not(:active):not(:only-child),
+ > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 $button_border; }
+ > .button:first-child:hover:not(:checked):not(:active) { box-shadow: none; }
+ > .button:checked + .button:not(:checked):not(:active):hover { box-shadow: none; }
+ > .button:checked + .entry { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
+ > .entry + .button:not(:checked):not(:active):hover { box-shadow: none; }
+}
+
+// special case for path-bars
+.linked:not(.vertical).path-bar {
+
$_linked_separator_color: if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5));
-%linked_middle {
- border-radius: 0;
- border-left-style: none;
- border-right-style: none;
+ > .button:hover:not(:checked):not(:active):not(:only-child) {
- &:hover {
- box-shadow: inset 1px 0 $_linked_separator_color,
- inset -1px 0 $_linked_separator_color;
+ &:hover {
+ box-shadow: inset 1px 0 $_linked_separator_color,
+ inset -1px 0 $_linked_separator_color;
+ }
+ &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
+ &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
}
- &:active, &:checked { box-shadow: none; }
+}
- &:dir(rtl) {
- border-radius: 0; // needed when including %linked_middle:dir(rtl)
- }
+// vertical
+.linked.vertical {
+ > .entry { @extend %linked_vertical; }
+
+ > .entry + .entry { border-top-color: transparentize($entry_border, 0.7); }
+ > .entry + .entry:focus:not(:last-child),
+ > .entry + .entry:focus:last-child { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+ > .entry + .button,
+ > .entry + .button:hover,
+ > .entry + .button:active,
+ > .entry + .button:checked,
+ > .entry + .button:insensitive { border-top-style: solid; }
+
+ > .entry:focus:not(:only-child) + .entry,
+ > .entry:focus:not(:only-child) + .button,
+ > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+ > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+ > .button:hover:not(:checked):not(:active):not(:only-child),
+ > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px $button_border; }
+ > .button:first-child:hover:not(:checked):not(:active) { box-shadow: none; }
+ > .button:checked + .button:not(:checked):not(:active):hover { box-shadow: none; }
+ > .button:checked + .entry { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
+ > .entry + .button:not(:checked):not(:active):hover { box-shadow: none; }
+}
+
+%linked_middle {
+ border-radius: 0;
+ border-right-style: none;
}
%linked {
@extend %linked_middle;
-
&:first-child {
- border-radius: 3px 0 0 3px;
- border-left-style: solid;
-
- &:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
- &:active, &:checked { box-shadow: none; }
+ border-top-left-radius: 3px;
+ border-bottom-left-radius: 3px;
}
&:last-child {
- border-radius: 0 3px 3px 0;
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
border-right-style: solid;
-
- &:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
- &:active, &:checked { box-shadow: none; }
-
- &:dir(rtl) { border-bottom-left-radius: 0; }
-
}
&:only-child {
border-radius: 3px;
border-style: solid;
-
- &:hover { box-shadow: none; }
- &:active, &:checked { box-shadow: none; }
}
}
%linked_vertical_middle {
- border-style: solid;
- border-bottom-style: none;
- border-top-style: none;
border-radius: 0;
-
- &:hover {
- box-shadow: inset 0 -1px $_linked_separator_color,
- inset 0 1px $_linked_separator_color;
- }
- &:active, &:checked { box-shadow: none; }
+ border-bottom-style: none;
}
%linked_vertical{
@extend %linked_vertical_middle;
-
&:first-child {
- border-radius: 3px 3px 0 0;
- border-top-style: solid;
-
- &:hover { box-shadow: inset 0 -1px $_linked_separator_color; }
- &:active, &:checked { box-shadow: none; }
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
}
&:last-child {
- border-radius: 0 0 3px 3px;
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
border-bottom-style: solid;
-
- &:hover { box-shadow: inset 0 1px $_linked_separator_color; }
- &:active, &:checked { box-shadow: none; }
}
&:only-child {
border-radius: 3px;
border-style: solid;
-
- &:hover { box-shadow: none; }
- &:active, &:checked { box-shadow: none; }
}
}
+%linked_button {
+ border-left-style: none;
+ &:first-child { border-left-style: solid; }
+}
+
+%linked_vertical_button {
+ border-top-style: none;
+ &:first-child { border-top-style: solid; }
+}
+
%undecorated_button {
border-color: transparent;
background-color: transparent;
@@ -919,59 +904,59 @@ GtkComboBox {
&:insensitive {
color: $insensitive_fg_color;
}
-
.separator.vertical {
// always disable separators
-GtkWidget-wide-separators: true;
}
-
&.combobox-entry .entry {
- @extend %linked;
-
&:dir(ltr) {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
border-right-style: none;
- &:focus { box-shadow: 1px 0 $selected_bg_color; }
+ @if $variant=='light' { &:focus { box-shadow: 1px 0 $selected_bg_color; } }
}
&:dir(rtl) {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
border-left-style: none;
- &:focus { box-shadow: -1px 0 $selected_bg_color; }
+ @if $variant=='light' { &:focus { box-shadow: -1px 0 $selected_bg_color; } }
}
}
-
- &.combobox-entry .the-button-in-the-combobox {
- @extend %linked;
-
+ &.combobox-entry .button {
&:dir(ltr) {
- box-shadow: inset 1px 0 $button_border;
-
- &:insensitive { box-shadow: inset 1px 0 transparentize($button_border, 0.45); }
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
}
&:dir(rtl) {
- box-shadow: inset -1px 0 $button_border;
-
- &:insensitive { box-shadow: inset -1px 0 transparentize($button_border, 0.45); }
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
}
}
}
-.linked > GtkComboBox > .the-button-in-the-combobox {
- // the combo is a composite widget so the way we do button linking doesn't
+.linked > GtkComboBox > .the-button-in-the-combobox,
+.linked > GtkComboBoxText > .the-button-in-the-combobox {
+ // the combo is a composite widget so the way we do button linkind doesn't
// work, special case needed. See
// https://bugzilla.gnome.org/show_bug.cgi?id=733979
- &:dir(ltr) { @extend %linked_middle; } // specificity bump
- &:dir(rtl) { @extend %linked_middle:dir(rtl); }
+ &:dir(ltr),
+ &:dir(rtl) { @extend %linked_middle; } // specificity bump
}
-.linked > GtkComboBox:first-child > .the-button-in-the-combobox {
+.linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
@extend %linked:first-child;
}
-.linked > GtkComboBox:last-child > .the-button-in-the-combobox {
+.linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
@extend %linked:last-child;
}
-.linked > GtkComboBox:only-child > .the-button-in-the-combobox {
+.linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
@extend %linked:only-child;
}
+
.linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
.linked.vertical > GtkComboBox > .the-button-in-the-combobox { @extend %linked_vertical_middle; }
.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
@@ -1242,42 +1227,72 @@ GtkComboBox {
&:insensitive:active, &:insensitive:checked { @include button(header-insensitive-active); }
}
- .linked > .button { border-radius: 3px; border-style: solid}
-
- .linked > .button:hover { box-shadow: none; }
-
- .linked.stack-switcher > .button,
- .linked.path-bar > .button {
+ // Linking stuff
+ .linked:not(.vertical):not(.path-bar) > .button,
+ .linked:not(.vertical):not(.path-bar) > .button:hover,
+ .linked:not(.vertical):not(.path-bar) > .button:active,
+ .linked:not(.vertical):not(.path-bar) > .button:checked,
+ .linked:not(.vertical):not(.path-bar) > .button:insensitive {
+ border-radius: 3px;
+ border-style: solid;
+
+ }
+ .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+ .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+ .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+ .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: none; }
+
+ // special case for path-bars and stack-switchers
+ .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+ .linked:not(.vertical).path-bar > .button {
+
+ @include button(header-hover);
+
+ &:hover { background-color: lighten($header_button_bg, 15%); }
+ &:active, &:checked { @include button(header-active); }
+ &:insensitive { color: transparentize($header_fg, 0.4); }
+ }
+
+ .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+ .linked:not(.vertical).path-bar > .button,
+ .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+ .linked:not(.vertical).path-bar > .button:hover,
+ .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+ .linked:not(.vertical).path-bar > .button:active,
+ .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+ .linked:not(.vertical).path-bar > .button:checked,
+ .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+ .linked:not(.vertical).path-bar > .button:insensitive {
+ @extend %linked;
+ @extend %linked_button;
+ }
- $_linked_separator_color: $header_button_border;
+ .linked:not(.vertical).path-bar,
+ .linked:not(.vertical):not(.path-bar).stack-switcher {
- @include button(header-hover);
+ $_linked_separator_color: $header_button_border;
- &:hover { background-color: lighten($header_button_bg, 15%); }
- &:active, &:checked { @include button(header-active); }
- &:insensitive { color: transparentize($header_fg, 0.4); }
-
- @extend %linked;
+ > .button:hover:not(:checked):not(:active):not(:only-child) {
&:hover {
box-shadow: inset 1px 0 $_linked_separator_color,
inset -1px 0 $_linked_separator_color;
}
- &:active, &:checked { box-shadow: none; }
-
- &:first-child {
- &:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
- &:active, &:checked { box-shadow: none; }
- }
- &:last-child {
- &:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
- &:active, &:checked { box-shadow: none; }
- }
- &:only-child {
- &:hover { box-shadow: none; }
- &:active, &:checked { box-shadow: none; }
- }
+ &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
+ &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
}
+ }
+
+ .linked:not(.vertical):not(.pathbar) {
+ > .entry + .entry { border-left-color: transparentize($header_entry_border, 0.5); }
+ > .entry + .entry:focus:not(:last-child),
+ > .entry + .entry:focus:last-child { border-left-color: if($darker=='false' and $variant=='light', $selected_bg_color, $header_entry_border); }
+
+ > .entry:focus:not(:only-child) + .entry,
+ > .entry:focus:not(:only-child) + .button,
+ > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+ > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: if($darker=='false' and $variant=='light', $selected_bg_color, $header_entry_border); }
+ }
// Header-bar Suggested and Destructive Action buttons
@each $b_type, $b_color in (suggested-action, $suggested_color),
@@ -1338,25 +1353,19 @@ GtkComboBox {
}
&.combobox-entry .entry {
&:dir(ltr) {
+ border-right-style: none;
+
&:focus { box-shadow: none; }
+ @if $variant=='light' and $darker=='false' { &:focus { box-shadow: 1px 0 $selected_bg_color; } }
}
&:dir(rtl) {
+ border-left-style: none;
+
&:focus { box-shadow: none; }
+ @if $variant=='light' and $darker=='false' { &:focus { box-shadow: -1px 0 $selected_bg_color; } }
}
}
- &.combobox-entry .button {
- &:dir(ltr) {
- box-shadow: inset 1px 0 $header_button_border;
-
- &:insensitive { box-shadow: inset 1px 0 transparentize($header_button_border, 0.45); }
- }
- &:dir(rtl) {
- box-shadow: inset -1px 0 $header_button_border;
-
- &:insensitive { box-shadow: inset -1px 0 transparentize($header_button_border, 0.45); }
- }
- }
}
// Header-bar Switches
diff --git a/common/gtk-3.0/3.18/sass/_drawing.scss b/common/gtk-3.0/3.18/sass/_drawing.scss
index 1e54c38..2b24642 100644
--- a/common/gtk-3.0/3.18/sass/_drawing.scss
+++ b/common/gtk-3.0/3.18/sass/_drawing.scss
@@ -37,9 +37,14 @@
// focused entry
//
color: $text_color;
- border-color: $selected_bg_color;
+ border-color: if($variant=='light', $selected_bg_color, $button_border);
background-color: $entry_bg;
background-image: linear-gradient(to bottom, $entry_bg);
+
+ @if $variant == 'dark' {
+ box-shadow: inset 1px 1px $selected_bg_color,
+ inset -1px -1px $selected_bg_color;
+ }
}
@if $t==insensitive {
@@ -148,7 +153,7 @@
color: $selected_fg_color;
outline-color: transparentize($selected_fg_color, 0.7);
- border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
+ border-color: if($variant=='light', $selected_bg_color, $button_border);
background-color: $selected_bg_color;
}
diff --git a/common/gtk-3.0/3.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss
index 89439d2..c0b9060 100644
--- a/common/gtk-3.0/3.18/sass/_unity.scss
+++ b/common/gtk-3.0/3.18/sass/_unity.scss
@@ -47,7 +47,7 @@ UnityPanelWidget,
color: lighten($panel_fg, 20%);
box-shadow: none;
- &:backdrop { color: darken($panel_fg, 5%); }
+ &:backdrop { color: lighten($panel_fg, 1%); }
}
.unity-panel.menubar.menuitem:hover,