diff options
Diffstat (limited to 'common/gtk-3.0/3.14/sass')
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_applications.scss | 70 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_common.scss | 15 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_granite.scss | 6 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_transparent_widgets.scss | 21 | ||||
| -rw-r--r-- | common/gtk-3.0/3.14/sass/_unity.scss | 3 |
5 files changed, 64 insertions, 51 deletions
diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index 5c0841f..2f6738b 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -71,8 +71,6 @@ TerminalWindow { // // Nautilus // -NautilusCanvasViewContainer.view .entry { border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -96,62 +94,56 @@ NautilusNotebook.notebook { } } -//NautilusNotebook.notebook { -// background-color: $base_color; -//} - NautilusQueryEditor .search-bar.toolbar { padding: 5px; box-shadow: none; background-color: $base_color; } - // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } - -NemoWindow .sidebar .frame { - border-width: 0; -} - -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} - .nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoWindow .primary-toolbar NemoPathBar.linked > .button { - $_linked_separator_color: $header_button_border; +NemoWindow { - @include button(header-hover); + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:insensitive { color: transparentize($header_fg, 0.4); } + .sidebar .frame { border-width: 0; } - @extend %linked; + GtkSeparator.separator.horizontal { color: $borders_color; } - &:hover { - box-shadow: inset 1px 0 $_linked_separator_color, - inset -1px 0 $_linked_separator_color; - } - &:active, &:checked { box-shadow: none; } + .primary-toolbar NemoPathBar.linked > .button { + $_linked_separator_color: $header_button_border; - &: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; } + @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); } + + @extend %linked; + + &: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; } + } } } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 8ed1d94..05abc85 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -473,6 +473,7 @@ $_dot_color: $selected_bg_color; &:hover { @include button(osd-hover); @extend %linked; + &, &:first-child, &:last-child { box-shadow: none; } } &:active, &:checked { background-clip: padding-box; @@ -489,6 +490,7 @@ $_dot_color: $selected_bg_color; box-shadow: none; &:hover { @include button(osd-hover); + &, &:first-child, &:last-child { box-shadow: none; } } &:insensitive { @include button(osd-insensitive); @@ -1481,16 +1483,17 @@ GtkTreeView.view { // treeview grid lines a &.progressbar { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; + background-image: linear-gradient(to bottom, $selected_bg_color); &:selected { color: $selected_bg_color; box-shadow: none; - background-color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_fg_color); } } &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; - background-color: $button_border; + background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; } @@ -1584,7 +1587,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1630,6 +1633,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2684,6 +2689,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } &.csd { &.popup, &.menu { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/sass/_granite.scss b/common/gtk-3.0/3.14/sass/_granite.scss index 1e53c7f..8e3b35d 100644 --- a/common/gtk-3.0/3.14/sass/_granite.scss +++ b/common/gtk-3.0/3.14/sass/_granite.scss @@ -192,6 +192,11 @@ GraniteWidgetsPopOver * { } // +// Xs Entry +// +GraniteWidgetsXsEntry.entry { padding: 4px; } + +// // Text Styles // .h1 { font: open sans 24px; } @@ -201,7 +206,6 @@ GraniteWidgetsPopOver * { .category-label { color: mix($bg_color, $text_color, 30%); font-weight: 600; - text-shadow: 0 1px transparentize(white, 0.4); } .h4 { diff --git a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss index b04ed38..c89875f 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -53,10 +53,13 @@ MarlinViewWindow { .scrollbar { @extend %dark_sidebar_scrollbar } } &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - - .pane-separator { background-color: $dark_sidebar_border; } } +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {background-color: $dark_sidebar_border} + GtkFileChooserDialog { &.background.csd, &.background { background-color: $dark_sidebar_bg } @@ -100,8 +103,6 @@ GeditWindow.background.csd { > .titlebar .pane-separator:backdrop, &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } - > .titlebar { background-color: transparent; } - > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: $header_bg; @@ -115,11 +116,17 @@ GeditWindow.background.csd { } } -// Gedit -GeditWindow.background.csd { +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { background-color: transparent; +} + +// Gedit +GeditWindow.background { + &.csd { background-color: transparent; } - .pane-separator { background-color: $dark_sidebar_border; } + .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } + .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } > .titlebar.default-decoration, > .titlebar.default-decoration:backdrop { background-color: opacify($header_bg, 1); } // fix for elementary OS diff --git a/common/gtk-3.0/3.14/sass/_unity.scss b/common/gtk-3.0/3.14/sass/_unity.scss index 48ebb2b..00fec8f 100644 --- a/common/gtk-3.0/3.14/sass/_unity.scss +++ b/common/gtk-3.0/3.14/sass/_unity.scss @@ -53,6 +53,7 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: $selected_bg_color; + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_bg_color); border-bottom: none; } |