Nabile
/
Arc-39-theme
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shell overview caption fix (#145) 

* Separate gnome-shell 3.26 theme from 3.18

* Update gnome-shell overview window-caption colors

Since gnome-shell 3.26, the window-caption in application overview was
moved from below the window preview, to the bottom edge of the preview.
Subsequently, colors of the window-caption were also changed.

3ce23ca964

This commit reflects the change in Arc shell theme.

* Remove unused CSS property from shell captions

The -shell-caption-spacing property in .window-caption has not been
used since gnome 3.26.

d0f74b58c3
master
jnsh 2018-10-20 19:01:19 +03:00 committed by David Mohammed
parent 875eb9d83f
commit 7b3b3cdaeb
11 changed files with 2779 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/gnome-shell/3.26
View File

@ -1 +0,0 @@
3.18

1
common/gnome-shell/3.26/common-assets Symbolic link
View File

@ -0,0 +1 @@
../3.18/common-assets

1
common/gnome-shell/3.26/dark-assets Symbolic link
View File

@ -0,0 +1 @@
../3.18/dark-assets

1
common/gnome-shell/3.26/light-assets Symbolic link
View File

@ -0,0 +1 @@
../3.18/light-assets

101
common/gnome-shell/3.26/sass/_colors.scss Normal file
View File

@ -0,0 +1,101 @@
// When color definition differs for dark and light variant,
// it gets @if ed depending on $variant
$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: #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%));
$link_color: if($variant == 'light', darken($selected_bg_color,10%),
lighten($selected_bg_color,20%));
$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);
$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(#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(#D3DAE3, 0.2), 10%), $header_fg);
$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;
$osd_bg_color: $dark_sidebar_bg;
$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6);
$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6);
$osd_insensitive_bg_color: darken($osd_bg_color, 3%);
$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%);
$osd_borders_color: transparentize(black, 0.3);
$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', #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));
$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%));
$button_border: $entry_border;
$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1));
$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
//WM Buttons
// Close
$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 , #2f343f);
// Minimize, Maximize
$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, #262932);
$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;

2487
common/gnome-shell/3.26/sass/_common.scss Normal file
View File

File diff suppressed because it is too large Load Diff

171
common/gnome-shell/3.26/sass/_drawing.scss Normal file
View File

@ -0,0 +1,171 @@
// Drawing mixins
// generic drawing of more complex things
// provide font size in rem, with px fallback
@mixin fontsize($size: 24, $base: 16) {
font-size: round($size) + pt;
//font-size: ($size / $base) * 1rem;
}
// Entries
@mixin entry($t, $dark:false) {
//
// Entries drawing function
//
//@extend %reset_style;
@if $t==normal {
color: $text_color;
background-color: $entry_bg;
border: 1px solid $entry_border;
box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95);
}
@if $t==focus {
color: $fg_color;
background-color: $entry_bg;
border: 1px solid $selected_bg_color;
box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95);
}
@if $t==insensitive {
color: $insensitive_fg_color;
background-color: mix($entry_bg, $bg_color, 55%);
border-color: 1px solid mix($entry_border, $bg_color, 55%);
box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.95);
}
@if $t==osd {
color: $osd_fg_color;
background-color: $osd_entry_bg;
border: 1px solid $osd_entry_border;
box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
@if $t==osd-focus {
color: $selected_fg_color;
background-color: $selected_bg_color;
border: 1px solid $osd_entry_border;
box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
@if $t==osd-insensitive {
color: transparentize($osd_fg_color, 0.45);
background-color: transparentize($osd_entry_bg, 0.15);
border: 1px solid $osd_entry_border;
box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
}
// Buttons
@mixin button($t) {
//
// Button drawing function
//
//@extend %reset_style;
text-shadow: 0 1px transparentize($base_color, 1);
@if $t==normal {
//
// normal button
//
color: $fg_color;
background-color: $button_bg;
border: 1px solid $button_border;
box-shadow: inset 0 1px transparentize($button_bg, 0.95);
}
@else if $t==focus {
//
// focused button
//
color: $fg_color;
background-color: $button_bg;
border: 1px solid $selected_bg_color;
box-shadow: inset 0 1px transparentize($button_bg, 0.95);
}
@else if $t==focus-hover {
//
// focused button
//
color: $fg_color;
background-color: $button_bg;
border: 1px solid $selected_bg_color;
box-shadow: inset 0 1px transparentize($button_bg, 0.95);
}
@else if $t==hover {
//
// hovered button
//
color: $fg_color;
background-color: lighten($button_bg, 5%);
border: 1px solid $button_border;
box-shadow: inset 0 1px transparentize(lighten($button_bg, 5%), 0.95);
}
@else if $t==active {
//
// pushed button
//
color: $selected_fg_color;
background-color: $selected_bg_color;
border: 1px solid if($variant=='light', $selected_bg_color, $button_border);
box-shadow: inset 0 1px transparentize($selected_bg_color, 0.95);
}
@else if $t==insensitive {
//
// insensitive button
//
color: $insensitive_fg_color;
border: 1px solid transparentize($button_border, 0.45);
background-color: transparentize($button_bg, 0.45);
box-shadow: inset 0 1px transparentize($button_bg, 0.95);
}
@else if $t==osd {
//
// normal osd button
//
color: $osd_fg_color;
border: 1px solid $osd_button_border;
background-color: $osd_button_bg;
box-shadow: inset 0 1px transparentize(black, 0.95);
}
@else if $t==osd-hover {
//
// active osd button
//
color: $osd_fg_color;
border: 1px solid $osd_button_border;
background-color: opacify(lighten($osd_button_bg, 7%), 0.1);
box-shadow: inset 0 1px transparentize(black, 0.95);
}
@else if $t==osd-active {
//
// active osd button
//
color: $selected_fg_color;
border: 1px solid $osd_button_border;
background-color: $selected_bg_color;
box-shadow: inset 0 1px transparentize($selected_bg_color, 0.95);
}
@else if $t==osd-insensitive {
//
// insensitive osd button
//
color: $osd_insensitive_fg_color;
border: 1px solid $osd_button_border;
background-color: transparentize($osd_button_bg, 0.15);
box-shadow: inset 0 1px transparentize(black, 0.95);
}
}

7
common/gnome-shell/3.26/sass/gnome-shell-dark.scss Normal file
View File

@ -0,0 +1,7 @@
$variant: 'dark';
$transparency: 'true';
$darker: 'false';
@import "_colors"; //use gtk colors
@import "_drawing";
@import "_common";

7
common/gnome-shell/3.26/sass/gnome-shell.scss Normal file
View File

@ -0,0 +1,7 @@
$variant: 'light';
$transparency: 'true';
$darker: 'false';
@import "_colors"; //use gtk colors
@import "_drawing";
@import "_common";

2
common/gnome-shell/3.28
View File

@ -1 +1 @@
3.18
3.26

5
common/gnome-shell/3.30/sass/_common.scss
View File

@ -1552,11 +1552,10 @@ StScrollBar {
.window-caption, .window-caption:hover {
spacing: 25px;
color: $osd_fg_color;
background-color: transparentize(black, 0.3);
color: $selected_fg_color;
background-color: $selected_bg_color;
border-radius: 2px;
padding: 4px 12px;
-shell-caption-spacing: 12px;
}
//