diff --git a/gtk-3.0/scss/widgets/_notebook.scss b/gtk-3.0/scss/widgets/_notebook.scss index 9447d30..b2ce88e 100644 --- a/gtk-3.0/scss/widgets/_notebook.scss +++ b/gtk-3.0/scss/widgets/_notebook.scss @@ -12,8 +12,7 @@ border-style: solid; border-color: border_normal($base_color); border-radius: 0; - background-color: $base_color; - background-image: none; + @include linear-gradient($base_color); background-clip: border-box; color: $text_color; @@ -32,11 +31,11 @@ &.frame { border-color: border_normal($base_color); - &.top { border-width: 1px 1px 0; } + &.top { border-width: 1px 1px 0 1px; } &.right { border-width: 1px 1px 1px 0; } - &.bottom { border-width: 0 1px 1px; } + &.bottom { border-width: 0 1px 1px 1px; } &.left { border-width: 1px 0 1px 1px; } } @@ -49,51 +48,94 @@ } tab { - padding: ($spacing + 1px) ($spacing * 2); + padding: ($spacing + 1px) $spacing * 2; border: 1px solid transparent; background-color: transparent; background-image: none; - &:hover { - background-color: shade($base_color, .95); - border-color: shade($base_color, .8); - } - &:active { - background-color: $base_color; + background-color: transparent; background-image: none; - border-color: shade($base_color, .85); } &.top { - border-bottom-width: 0; + border-bottom-width: 2px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; + + &:hover { + border-bottom-color: alpha($selected_bg_color, 0.3); + } + + &:active { + border-bottom-color: $selected_bg_color; + } } &.right { - border-left-width: 0; + border-left-width: 2px; border-bottom-left-radius: 0; border-top-left-radius: 0; + + &:hover { + border-left-color: alpha($selected_bg_color, 0.3); + } + + &:active { + border-left-color: $selected_bg_color; + } } - &.bottom { - border-top-width: 0; + border-top-width: 2px; border-top-right-radius: 0; border-top-left-radius: 0; + + &:hover { + border-top-color: alpha($selected_bg_color, 0.3); + } + + &:active { + border-top-color: $selected_bg_color; + } } &.left { - border-right-width: 0; + border-right-width: 2px; border-top-right-radius: 0; border-bottom-right-radius: 0; + + &:hover { + border-right-color: alpha($selected_bg_color, 0.3); + } + + &:active { + border-right-color: $selected_bg_color; + } } GtkLabel { color: mix($text_color, $base_color, .3); } + &.reorderable-page { + &:hover { + background-color: shade($base_color, .85); + border-left: 0; + 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); + } + + &:active { + background-color: shade($base_color, .9); + 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); + } + } + /* close button styling */ .button { @extend %close_button; } + } .prelight-page { @@ -104,23 +146,5 @@ &, GtkLabel { color: $text_color; } } - .reorderable-page { - &:hover { - background-color: shade($base_color, .85); - border-left: 0; - 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); - } - - &:active { - background-color: shade($base_color, .9); - 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); - } - } } }