diff options
Diffstat (limited to 'common/gtk-3.0/3.18/sass')
-rw-r--r-- | common/gtk-3.0/3.18/sass/_applications.scss | 65 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/sass/_common.scss | 37 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/sass/_granite.scss | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/sass/_transparent_widgets.scss | 19 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/sass/_unity.scss | 3 |
5 files changed, 80 insertions, 50 deletions
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index e95a754..6418e56 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -90,8 +90,6 @@ TerminalWindow { // // Nautilus // -NautilusCanvasViewContainer.view .entry { border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -162,50 +160,47 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } +.nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoWindow .sidebar .frame { - border-width: 0; -} +NemoWindow { -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry -.nemo-desktop.nemo-canvas-item { - @extend .nautilus-desktop.nautilus-canvas-item; -} + .sidebar .frame { border-width: 0; } -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button { + GtkSeparator.separator.horizontal { color: $borders_color; } - @include button(header-hover); + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button { - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:insensitive { color: transparentize($header_fg, 0.4); } -} + @include button(header-hover); -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 { 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) { + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive { + @extend %linked; + @extend %linked_button; + } - $_linked_separator_color: $header_button_border; + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) { - > .button:hover:not(:checked):not(:active):not(:only-child) { + $_linked_separator_color: $header_button_border; - &: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; } + > .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 1ce7d17..db4fb6c 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1594,16 +1594,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; } @@ -1697,7 +1698,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1743,6 +1744,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2569,7 +2572,6 @@ GtkCalendar { &:inconsistent { color: gtkalpha(currentColor,0.55); } &.highlight { color: $fg_color; - background-color: transparentize($button_border, 0.5); } } @@ -2707,6 +2709,23 @@ GtkPlacesSidebar.sidebar { } // +// File chooser +// +GtkPlacesView { + .server-list-button > GtkImage { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(0turn); + } + + .server-list-button:checked > GtkImage { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(-0.5turn); + } + + .list-row.activatable:hover { background-color: transparent; } +} + +// // Paned // GtkPaned { // this is for the standard paned separator @@ -2951,6 +2970,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } // server-side decorations as used by mutter &.ssd { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); @@ -2959,7 +2982,7 @@ GtkVolumeButton.button { padding: 8px; } &.maximized { border-radius: 0; } } &.csd { - &.popup, &.menu { + &.popup { border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px if($variant == 'light', $_wm_border, darken($bg_color, 10%)); @@ -2990,11 +3013,10 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1); - border-width: 0; &:hover { @include button(header-hover); @@ -3009,6 +3031,7 @@ GtkVolumeButton.button { padding: 8px; } background-color: transparent; background-position: center; background-repeat: no-repeat; + border-width: 0; &:backdrop { opacity: 1; } } diff --git a/common/gtk-3.0/3.18/sass/_granite.scss b/common/gtk-3.0/3.18/sass/_granite.scss index 1e53c7f..8e3b35d 100644 --- a/common/gtk-3.0/3.18/sass/_granite.scss +++ b/common/gtk-3.0/3.18/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.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss index 92c1b59..c738981 100644 --- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss @@ -96,9 +96,12 @@ MarlinViewWindow { } &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - .pane-separator { background-color: $dark_sidebar_border; } } +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 } @@ -142,8 +145,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; @@ -157,11 +158,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; } } .gedit-bottom-panel-paned { background-color: $base_color; } diff --git a/common/gtk-3.0/3.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss index 48ebb2b..00fec8f 100644 --- a/common/gtk-3.0/3.18/sass/_unity.scss +++ b/common/gtk-3.0/3.18/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; } |