diff --git a/gtk-3.0/scss/_grid.scss b/gtk-3.0/scss/_grid.scss new file mode 100644 index 0000000..7975977 --- /dev/null +++ b/gtk-3.0/scss/_grid.scss @@ -0,0 +1,29 @@ +@import "functions"; + +.list { + background-color: shade($bg_color, 0.97); + color: $fg_color; + + &-row { + border: none; + border-radius: 0; + padding: 3px; + background-image: none; + background-color: transparent; + + &:hover { + background-image: none; + background-color: shade($bg_color, 1.02); + } + + &:selected { + &, &:hover, &:focus { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + } +} + +.grid-child { padding: $spacing; } diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index 491a507..600bd30 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -16,20 +16,20 @@ .title { font: bold; - padding: 0 12px; + padding: 0 ($spacing * 2); } .subtitle { font: smaller; - padding: 0 12px; + padding: 0 ($spacing * 2); } .button { @include button($bg, $fg); } GtkComboBox, .button { - padding: 2px; + padding: $spacing - 1px; - &.text-button { padding: 4px; } + &.text-button { padding: $spacing; } &.image-button { padding: $spacing ($spacing - 1px) ($spacing - 1px) $spacing; } } @@ -84,10 +84,12 @@ border: none; background: none; color: mix($titlebar_fg_color, $titlebar_bg_color, 0.90); + box-shadow: none; &:hover, &:hover:focus { background: none; color: $selected_bg_color; + box-shadow: none; } &:active, &:active:hover { @@ -97,7 +99,7 @@ } &:backdrop { - background-image: none; + background: none; color: mix($titlebar_fg_color, $titlebar_bg_color, 0.60); icon-shadow: none; } diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss new file mode 100644 index 0000000..6c7b01c --- /dev/null +++ b/gtk-3.0/scss/_view.scss @@ -0,0 +1,103 @@ +@import "functions"; + +.cell { + border-width: 0; + border-radius: 0; + + &:selected, &:selected:focus { + background-color: $selected_bg_color; + color: $selected_fg_color; + } +} + +row { + &:selected { + &, &:hover, &:focus { + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; + + border-width: 1px 0; + border-style: solid; + border-color: border_normal($selected_bg_color); + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + } +} + +column-header { + .button { + &, &:active { + border-width: 0 1px 1px 0; + border-radius: 0; + } + + &, &:active, &:focus, &:active:focus { + border-color: shade($base_color, 0.9); + border-bottom-color: shade($base_color, 0.8); + background-color: shade($base_color, 0.97); + background-image: none; + } + + &:hover, &:active:hover, &:hover:focus, &:active:hover:focus { + border-color: shade($base_color, 0.9); + border-bottom-color: shade($base_color, 0.8); + background-color: shade($base_color, 0.99); + background-image: none; + } + + &:last-child .button { border-width: 0 0 1px 0; } + } +} + +.content-view { + &.view { + background-color: $base_color; + + &:prelight { background-color: alpha($selected_bg_color, 0.6); } + + &:selected, &:active { background-color: $selected_bg_color; } + + &:insensitive { background-color: shade($base_color, 0.9); } + + &.check { + &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } + } + } + + .subtitle { + font: smaller; + padding: 0 12px; + } +} + +GtkIconView { + &.content-view.check { + &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } + } + + &.view.cell { + &:selected, &:selected:focus { + border-width: 1px; + border-style: solid; + border-color: border_normal($selected_bg_color); + border-radius: 2px; + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + } +} + +.rubberband { + &, &.view, &.content-view.view { + border-width: 1px; + border-style: solid; + border-color: $selected_bg_color; + border-radius: 0; + background-color: alpha($selected_bg_color, 0.3); + } +} + +GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } diff --git a/gtk-3.0/scss/_window.scss b/gtk-3.0/scss/_window.scss index eb91653..cad2ef9 100755 --- a/gtk-3.0/scss/_window.scss +++ b/gtk-3.0/scss/_window.scss @@ -1,14 +1,14 @@ .window-frame { - border-style: none; - border-radius: 2px 2px 0 0; - box-shadow: 0 3px 7px 1px alpha(black, 0.7), + border: none; + border-radius: $roundness $roundness 0 0; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); /* this is used for the resize cursor area */ - margin: 10px; + margin: $spacing * 3; &:backdrop { - box-shadow: 0 3px 5px 1px alpha(black, 0.5), + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24), 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); } @@ -17,18 +17,18 @@ &.csd { &.popup { border-radius: 0; - box-shadow: 0 1px 2px alpha(black, 0.8), + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); } &.tooltip { - border-radius: 2px; + border-radius: $roundness; box-shadow: none; } &.message-dialog { - border-radius: 2px; - box-shadow: 0 1px 2px alpha(black, 0.8), + border-radius: $roundness; + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); } } diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index e1ca55a..a4912a2 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -6,4 +6,6 @@ @import "menu"; @import "toolbar"; @import "sidebar"; +@import "view"; +@import "grid"; @import "window";