diff options
Diffstat (limited to 'common/gtk-3.0/3.18/sass')
| -rw-r--r-- | common/gtk-3.0/3.18/sass/_applications.scss | 34 | ||||
| -rw-r--r-- | common/gtk-3.0/3.18/sass/_colors.scss | 63 | ||||
| -rw-r--r-- | common/gtk-3.0/3.18/sass/_common.scss | 61 | ||||
| -rw-r--r-- | common/gtk-3.0/3.18/sass/_drawing.scss | 12 | ||||
| -rw-r--r-- | common/gtk-3.0/3.18/sass/_granite.scss | 7 | ||||
| -rw-r--r-- | common/gtk-3.0/3.18/sass/_unity.scss | 2 |
6 files changed, 108 insertions, 71 deletions
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index a499f77..1bbcde6 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -5,8 +5,7 @@ GeditNotebook.notebook, ScratchMainWindow .notebook, EphyNotebook.notebook, MidoriNotebook .notebook, -TerminalWindow .notebook, -PantheonTerminalPantheonTerminalWindow .notebook { +TerminalWindow .notebook { tab.reorderable-page.top, tab.top { &:active, &.active-page, &.active-page:hover { @@ -18,8 +17,7 @@ PantheonTerminalPantheonTerminalWindow .notebook { } } -TerminalWindow .notebook, -PantheonTerminalPantheonTerminalWindow .notebook { +TerminalWindow .notebook { tab.reorderable-page.top, tab.top { padding-top: 7px; @@ -97,7 +95,7 @@ EelEditableLabel.entry { transition: none; } // Workaround for invisible text i } .nautilus-desktop.nautilus-canvas-item { - color: $selected_fg_color; + color: white; text-shadow: 1px 1px transparentize(black, 0.4); &:active { color: $fg_color; } @@ -555,7 +553,7 @@ PanelApplet .button:hover { PanelApplet .button:active, PanelApplet .button:active:backdrop, PanelApplet .button:checked, PanelApplet .button:checked:backdrop { background-clip: padding-box; - color: $selected_fg_color; + color: white; background-color: transparentize(black, 0.75); border-radius: 0; border-color: transparentize(black, 0.75); @@ -563,7 +561,7 @@ PanelApplet .button:checked, PanelApplet .button:checked:backdrop { } PanelApplet:hover { - color: $selected_fg_color; + color: white; } PanelApplet:active, @@ -699,6 +697,11 @@ MarlinViewWindow { text-shadow: 0 1px 2px transparentize(black, 0.4); icon-shadow: 0 1px 2px transparentize(black, 0.4); + .maximized { + background-color: $panel_bg; + box-shadow: inset 0 -1px darken($panel_bg, 7%); + } + &-shadow { background-image: none; background-color: transparent; @@ -744,6 +747,13 @@ MarlinViewWindow { padding-top: 8px; padding-bottom: 8px; } + + .color-light & { + color: transparentize(black, 0.35); + + text-shadow: 0 0 2px transparentize(white, 0.7), 0 1px 0 transparentize(white, 0.75); + icon-shadow: 0 0 2px transparentize(white, 0.7), 0 1px 0 transparentize(white, 0.75); + } } .panel-app-button > GtkWidget > GtkWidget:first-child { @@ -759,23 +769,23 @@ MarlinViewWindow { WingpanelWidgetsIndicatorPopover.popover { padding: 0; + font: initial; text-shadow: none; icon-shadow: none; + .sidebar { background: none; } + .menuitem { padding: 5px; outline-color: transparent; text-shadow: none; icon-shadow: none; - border: solid transparent; - border-width: 1px 0; GtkLabel, GtkImage { padding: 0 3px; } &:hover, &:active { - background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95)); - border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93)); - border-width: 1px 0; + color: $selected_fg_color; + background-color: $selected_bg_color; } *:insensitive { color: $insensitive_fg_color; } } diff --git a/common/gtk-3.0/3.18/sass/_colors.scss b/common/gtk-3.0/3.18/sass/_colors.scss index 3659c08..8d3a5f2 100644 --- a/common/gtk-3.0/3.18/sass/_colors.scss +++ b/common/gtk-3.0/3.18/sass/_colors.scss @@ -2,13 +2,13 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #fdf6e3, #073642); -$text_color: if($variant == 'light', #5c616c, #657b83); -$bg_color: if($variant =='light', #F5F6F7, #002b36); -$fg_color: if($variant =='light', #5c616c, #657b83); +$base_color: if($variant =='light', #ffffff, #404552); +$text_color: if($variant == 'light', #5c616c, #D3DAE3); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); +$fg_color: if($variant =='light', #5c616c, #D3DAE3); -$selected_fg_color: #fdf6e3; -$selected_bg_color: #268bd2; +$selected_fg_color: #ffffff; +$selected_bg_color: #5294e2; $selected_borders_color: darken($selected_bg_color, 20%); $borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); @@ -18,31 +18,38 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%)); $selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color); -$warning_color: #cb4b16; -$error_color: #dc322f; -$success_color: #859900; -$destructive_color: #dc322f; -$suggested_color: #2aa198; +$selection_mode_fg: $selected_fg_color; +$warning_color: #F27835; +$error_color: #FC4138; +$warning_fg_color: white; +$error_fg_color: white; +$success_color: #73d216; +$destructive_color: #F04A50; +$suggested_color: #4DADD4; +$destructive_fg_color: white; +$suggested_fg_color: white; + +$drop_target_color: #F08437; //insensitive state derived colors $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); $header_bg: red; -@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#eee8d5, 0.05); } -@if $transparency=='false' and $variant=='light' { $header_bg: #eee8d5; } -@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#002b36, 0.03); } -@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #002b36; } +@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } +@if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); $header_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); -$header_fg: if($darker == 'true', saturate(transparentize(#657b83, 0.2), 10%), $header_fg); +$header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true', transparentize(#073642, 0.05), #073642); -$dark_sidebar_fg: #657b83; +$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); +$dark_sidebar_fg: #BAC3CF; $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; @@ -62,7 +69,7 @@ $panel_bg: darken($dark_sidebar_bg, 4.7%); $panel_fg: $dark_sidebar_fg; $entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); -$entry_border: if($variant == 'light', #657b83, darken($borders_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); $header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); $header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); @@ -76,19 +83,19 @@ $header_button_border: if($darker == 'true' or $variant == 'dark', transparentiz //WM Buttons // Close -$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #dc322f); -$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #cb4b16); -$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #dc322f); +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #002b36); +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // Minimize, Maximize -$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #657b83); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $wm_button_active_bg: $selected_bg_color; -$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #002b36); +$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #93a1a1); -$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #657b83); -$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #93a1a1); +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 83aff34..86ae0b7 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -237,20 +237,20 @@ $vert_padding: 5px; box-shadow: none; } - @each $e_type, $e_color in (warning, $warning_color), - (error, $error_color) { + @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color), + (error, $error_color, $error_fg_color) { &.#{$e_type} { color: $selected_fg_color; border-color: if($variant=='light', $e_color, $entry_border); background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%)); &:focus { - color: $selected_fg_color; + color: $e_fg_color; background-image: linear-gradient(to bottom, $e_color); box-shadow: none; } &:selected, &:selected:focus { - background-color: $selected_fg_color; + background-color: $e_fg_color; color: $e_color; } } @@ -327,6 +327,8 @@ $_dot_color: $selected_bg_color; background-clip: if($variant=='light', border-box, padding-box); @include button(active); transition-duration: 50ms; + + &:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; } } //Webkitgtk workaround start @@ -389,10 +391,10 @@ $_dot_color: $selected_bg_color; .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active) + &:not(:checked):not(:active) { box-shadow: none; } // Suggested and Destructive Action buttons - @each $b_type, $b_color in (suggested-action, $suggested_color), - (destructive-action, $destructive_color) { + @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color), + (destructive-action, $destructive_color, $destructive_fg_color) { &.#{$b_type} { - @include button(suggested_destructive, $b_color); + @include button(suggested_destructive, $b_color, $b_fg); &.flat { @include button(undecorated); @@ -400,10 +402,10 @@ $_dot_color: $selected_bg_color; outline-color: transparentize($b_color, 0.7); } &:hover { - @include button(suggested_destructive, lighten($b_color, 10%)); + @include button(suggested_destructive, lighten($b_color, 10%), $b_fg); } &:active, &:checked { - @include button(suggested_destructive, darken($b_color, 10%)); + @include button(suggested_destructive, darken($b_color, 10%), $b_fg); } &.flat:insensitive { @include button(undecorated); @@ -971,14 +973,14 @@ GtkComboBox { // Selectionmode &.selection-mode, &.titlebar.selection-mode { - color: $selected_fg_color; + color: $selection_mode_fg; background-color: $selection_mode_bg; border-color: darken($selection_mode_bg, 4%); box-shadow: none; &:backdrop { background-color: $selection_mode_bg; - color: transparentize($selected_fg_color, 0.4); + color: transparentize($selection_mode_fg, 0.4); } .subtitle:link { @extend *:link:selected; } @@ -1128,19 +1130,19 @@ GtkComboBox { background-color: transparent; } - @each $e_type, $e_color in (warning, $warning_color), - (error, $error_color) { + @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color), + (error, $error_color, $error_fg_color) { &.#{$e_type} { - color: $selected_fg_color; + color: $e_fg_color; border-color: if($darker=='false' and $variant=='light', $e_color, $header_entry_border); background-image: linear-gradient(to bottom, mix($e_color, $header_bg, 60%)); &:focus { - color: $selected_fg_color; + color: $e_fg_color; background-image: linear-gradient(to bottom, $e_color); } &:selected, &:selected:focus { - background-color: $selected_fg_color; + background-color: $e_fg_color; color: $e_color; } } @@ -1205,10 +1207,10 @@ GtkComboBox { } // Headerbar Suggested and Destructive Action buttons - @each $b_type, $b_color in (suggested-action, $suggested_color), - (destructive-action, $destructive_color) { + @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color), + (destructive-action, $destructive_color, $destructive_fg_color) { .button.#{$b_type} { - @include button(suggested_destructive, $b_color); + @include button(suggested_destructive, $b_color, $b_fg); &.flat { @include button(undecorated); @@ -1216,10 +1218,10 @@ GtkComboBox { outline-color: transparentize($b_color, 0.7); } &:hover { - @include button(suggested_destructive, lighten($b_color, 10%)); + @include button(suggested_destructive, lighten($b_color, 10%), $b_fg); } &:active, &:checked { - @include button(suggested_destructive, darken($b_color, 10%)); + @include button(suggested_destructive, darken($b_color, 10%), $b_fg); } &.flat:insensitive, &:insensitive { @include button(header-insensitive); } @@ -1394,22 +1396,29 @@ GtkTreeView.view { // treeview grid lines a } } - &.progressbar { // progress bar in treeviews + &.progressbar, &.progressbar:focus { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; background-image: linear-gradient(to bottom, $selected_bg_color); - &:selected { + &:selected, &:selected:focus { color: $selected_bg_color; box-shadow: none; background-image: linear-gradient(to bottom, $selected_fg_color); } } - &.trough, &.trough:selected { // progress bar trough in treeviews + &.trough { // progress bar trough in treeviews color: $fg_color; background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; + + &:selected, &:selected:focus { + color: $selected_fg_color; + background-image: linear-gradient(to bottom, transparentize(black, 0.8)); + border-radius: 3px; + border-width: 0; + } } } @@ -1916,6 +1925,7 @@ GtkSwitch { background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); } + WingpanelWidgetsIndicatorPopover.popover .menuitem:hover GtkSwitch.trough#{$k}, .menu .menuitem:hover GtkSwitch.trough#{$k}, .list-row:selected GtkSwitch.trough#{$k}, GtkInfoBar GtkSwitch.trough#{$k} { @@ -1955,6 +1965,7 @@ GtkSwitch { // the borders of checks and radios are // too similar in luminosity to the selected background color, hence // we need special casing. + WingpanelWidgetsIndicatorPopover.popover .menuitem:hover .#{$w}#{$s}, .menu .menuitem.#{$w}#{$s}:hover, GtkTreeView.view.#{$w}#{$s}:selected, .list-row:selected .#{$w}#{$s}, @@ -2036,6 +2047,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders + WingpanelWidgetsIndicatorPopover.popover .menuitem:hover &, .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { @@ -2085,6 +2097,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars + WingpanelWidgetsIndicatorPopover.popover .menuitem:hover &, .menu .menuitem:hover &, .list-row:selected &, GtkInfoBar & { diff --git a/common/gtk-3.0/3.18/sass/_drawing.scss b/common/gtk-3.0/3.18/sass/_drawing.scss index 93f9386..36a5f36 100644 --- a/common/gtk-3.0/3.18/sass/_drawing.scss +++ b/common/gtk-3.0/3.18/sass/_drawing.scss @@ -108,12 +108,12 @@ // Buttons -@mixin button($t, $actionb_color:red) { +@mixin button($t, $actionb_bg:red, $actionb_fg: green) { // // Button drawing function // // $t: button type, -// $actionb_color: used for destructive and suggested action buttons +// $actionb_bg, $actionb_fg: used for destructive and suggested action buttons @if $t==normal { // @@ -266,10 +266,10 @@ // background-clip: border-box; - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - background-color: $actionb_color; - border-color: $actionb_color; + color: $actionb_fg; + outline-color: transparentize($actionb_fg, 0.7); + background-color: $actionb_bg; + border-color: $actionb_bg; } @else if $t==undecorated { diff --git a/common/gtk-3.0/3.18/sass/_granite.scss b/common/gtk-3.0/3.18/sass/_granite.scss index 8e3b35d..c6c59dd 100644 --- a/common/gtk-3.0/3.18/sass/_granite.scss +++ b/common/gtk-3.0/3.18/sass/_granite.scss @@ -143,6 +143,13 @@ GraniteWidgetsStaticNotebook .frame { } // +// Notebook +// +.dynamic-notebook .notebook tab { + .button > GtkImage { padding: 0; } +} + +// // Welcome // GraniteWidgetsWelcome { diff --git a/common/gtk-3.0/3.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss index 501d480..2441035 100644 --- a/common/gtk-3.0/3.18/sass/_unity.scss +++ b/common/gtk-3.0/3.18/sass/_unity.scss @@ -44,7 +44,7 @@ UnityDecoration { // Panel Style UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #002b36); + background-image: linear-gradient(to bottom, #2f343f); color: lighten($panel_fg, 20%); box-shadow: none; |