theme: Use gnome-shell-sass as a submodule
The sass sources now live in a project in GNOME, so they can be used in multiple projects like gnome-shell-extensions. Because of that, add gnome-shell-sass as a submodule of gnome-shell and remove the sass sources from the theme directory.
This commit is contained in:
Carlos Soriano
parent
f38263a67f
commit
e317bfdab7
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +1,6 @@
|
|||||||
[submodule "src/gvc"]
|
[submodule "src/gvc"]
|
||||||
path = src/gvc
|
path = src/gvc
|
||||||
url = git://git.gnome.org/libgnome-volume-control
|
url = git://git.gnome.org/libgnome-volume-control
|
||||||
|
[submodule "data/theme/gnome-shell-sass"]
|
||||||
|
path = data/theme/gnome-shell-sass
|
||||||
|
url = https://git.gnome.org/browse/gnome-shell-sass
|
||||||
|
|||||||
@ -14,7 +14,7 @@ PKG_NAME="gnome-shell"
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Fetch submodules if needed
|
# Fetch submodules if needed
|
||||||
if test ! -f src/gvc/Makefile.am;
|
if test ! -f src/gvc/Makefile.am || test ! -f data/theme/gnome-shell-sass/COPYING;
|
||||||
then
|
then
|
||||||
echo "+ Setting up submodules"
|
echo "+ Setting up submodules"
|
||||||
git submodule init
|
git submodule init
|
||||||
|
|||||||
3
data/theme/HACKING
Normal file
3
data/theme/HACKING
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
To generate the css files, from the project directory:
|
||||||
|
|
||||||
|
sass --sourcemap=none --update .
|
||||||
@ -1,44 +0,0 @@
|
|||||||
// When color definition differs for dark and light variant,
|
|
||||||
// it gets @if ed depending on $variant
|
|
||||||
|
|
||||||
|
|
||||||
$base_color: if($variant =='light', #ffffff, #292929);
|
|
||||||
$bg_color: if($variant =='light', #ededed, #393f3f);
|
|
||||||
$fg_color: if($variant =='light', #2e3436, #eeeeec);
|
|
||||||
|
|
||||||
$selected_fg_color: #ffffff;
|
|
||||||
$selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9,20%));
|
|
||||||
$selected_borders_color: if($variant=='light', darken($selected_bg_color, 30%),
|
|
||||||
darken($selected_bg_color, 20%));
|
|
||||||
$borders_color: if($variant =='light', darken($bg_color,30%), darken($bg_color,12%));
|
|
||||||
$borders_edge: if($variant =='light', white, transparentize($fg_color, 0.9));
|
|
||||||
$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%));
|
|
||||||
$top_hilight: $borders_edge;
|
|
||||||
|
|
||||||
$warning_color: #f57900;
|
|
||||||
$error_color: #cc0000;
|
|
||||||
$success_color: if($variant =='light', #73d216, darken(#73d216,10%));
|
|
||||||
$destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
|
|
||||||
|
|
||||||
$osd_fg_color: #eeeeec;
|
|
||||||
$osd_bg_color: #2e3436;
|
|
||||||
$osd_borders_color: transparentize(black, 0.3);
|
|
||||||
$osd_outer_borders_color: transparentize(white, 0.9);
|
|
||||||
|
|
||||||
$tooltip_borders_color: $osd_outer_borders_color;
|
|
||||||
|
|
||||||
//insensitive state derived colors
|
|
||||||
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
|
|
||||||
$insensitive_bg_color: mix($bg_color, $base_color, 60%);
|
|
||||||
$insensitive_borders_color: $borders_color;
|
|
||||||
|
|
||||||
//colors for the backdrop state, derived from the main colors.
|
|
||||||
$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
|
|
||||||
$backdrop_bg_color: $bg_color;
|
|
||||||
$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
|
|
||||||
$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
|
|
||||||
$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
|
|
||||||
$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,219 +0,0 @@
|
|||||||
// Drawing mixins
|
|
||||||
|
|
||||||
// generic drawing of more complex things
|
|
||||||
|
|
||||||
@function _widget_edge($c:$borders_edge) {
|
|
||||||
// outer highlight "used" on most widgets
|
|
||||||
@return 0 1px $c;
|
|
||||||
}
|
|
||||||
|
|
||||||
// provide font size in rem, with px fallback
|
|
||||||
@mixin fontsize($size: 24, $base: 16) {
|
|
||||||
font-size: round($size) + pt;
|
|
||||||
//font-size: ($size / $base) * 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
|
|
||||||
//
|
|
||||||
// Helper function to stack up to 4 box-shadows;
|
|
||||||
//
|
|
||||||
@if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
|
|
||||||
@else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
|
|
||||||
@else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
|
|
||||||
@else { box-shadow: $shadow1; }
|
|
||||||
}
|
|
||||||
|
|
||||||
// entries
|
|
||||||
|
|
||||||
@mixin entry($t, $fc:$selected_bg_color, $edge: $borders_edge) {
|
|
||||||
//
|
|
||||||
// Entries drawing function
|
|
||||||
//
|
|
||||||
// $t: entry type
|
|
||||||
// $fc: focus color
|
|
||||||
// $edge: set to none to not draw the bottom edge or specify a color to not
|
|
||||||
// use the default one
|
|
||||||
//
|
|
||||||
// possible $t values:
|
|
||||||
// normal, focus, insensitive
|
|
||||||
//
|
|
||||||
$_inner_shadows: inset 0 2px 4px transparentize(black, 0.6);
|
|
||||||
|
|
||||||
@if $t==normal {
|
|
||||||
background-color: $base_color;
|
|
||||||
border-color: $borders_color;
|
|
||||||
@include _shadows($_inner_shadows);
|
|
||||||
|
|
||||||
}
|
|
||||||
@if $t==focus {
|
|
||||||
@include _shadows($_inner_shadows);
|
|
||||||
border-color: if($fc==$selected_bg_color,
|
|
||||||
$selected_borders_color,
|
|
||||||
darken($fc,35%));
|
|
||||||
}
|
|
||||||
@if $t==hover { }
|
|
||||||
@if $t==insensitive {
|
|
||||||
color: $insensitive_fg_color;
|
|
||||||
border-color: $insensitive_bg_color;
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// buttons
|
|
||||||
|
|
||||||
@function _border_color ($c) { @return darken($c,25%); } // colored buttons want
|
|
||||||
// the border form the
|
|
||||||
// base color
|
|
||||||
|
|
||||||
@function _text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
|
|
||||||
//
|
|
||||||
// calculate the color of text shadows
|
|
||||||
//
|
|
||||||
// $tc is the text color
|
|
||||||
// $bg is the background color
|
|
||||||
//
|
|
||||||
$_lbg: lightness($bg)/100%;
|
|
||||||
@if lightness($tc)<50% { @return transparentize(white,1-$_lbg/($_lbg*1.3)); }
|
|
||||||
@else { @return transparentize(black,$_lbg*0.8); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@function _button_hilight_color($c) {
|
|
||||||
//
|
|
||||||
// calculate the right top hilight color for buttons
|
|
||||||
//
|
|
||||||
// $c: base color;
|
|
||||||
//
|
|
||||||
@if lightness($c)>90% { @return white; }
|
|
||||||
@else if lightness($c)>80% { @return transparentize(white, 0.3); }
|
|
||||||
@else if lightness($c)>50% { @return transparentize(white, 0.5); }
|
|
||||||
@else if lightness($c)>40% { @return transparentize(white, 0.7); }
|
|
||||||
@else { @return transparentize(white, 0.9); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
|
|
||||||
//
|
|
||||||
// helper function for the text emboss effect
|
|
||||||
//
|
|
||||||
// $tc is the optional text color, not the shadow color
|
|
||||||
//
|
|
||||||
// TODO: this functions needs a way to deal with special cases
|
|
||||||
//
|
|
||||||
|
|
||||||
$_shadow: _text_shadow_color($tc, $bg);
|
|
||||||
|
|
||||||
@if lightness($tc)<50% {
|
|
||||||
text-shadow: 0 1px $_shadow;
|
|
||||||
icon-shadow: 0 1px $_shadow;
|
|
||||||
}
|
|
||||||
@else {
|
|
||||||
text-shadow: 0 -1px $_shadow;
|
|
||||||
icon-shadow: 0 -1px $_shadow;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
|
|
||||||
//
|
|
||||||
// Button drawing function
|
|
||||||
//
|
|
||||||
// $t: button type,
|
|
||||||
// $c: base button color for colored* types
|
|
||||||
// $tc: optional text color for colored* types
|
|
||||||
// $edge: set to none to not draw the bottom edge or specify a color to not
|
|
||||||
// use the default one
|
|
||||||
//
|
|
||||||
// possible $t values:
|
|
||||||
// normal, hover, active, insensitive, insensitive-active,
|
|
||||||
// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
|
|
||||||
// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
|
|
||||||
//
|
|
||||||
|
|
||||||
$_hilight_color: _button_hilight_color($c);
|
|
||||||
$_button_edge: if($edge == none, none, _widget_edge($edge));
|
|
||||||
$_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
|
|
||||||
|
|
||||||
|
|
||||||
@if $t==normal {
|
|
||||||
//
|
|
||||||
// normal button
|
|
||||||
//
|
|
||||||
$_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
|
|
||||||
$osd_bg_color);
|
|
||||||
|
|
||||||
color: $osd_fg_color;
|
|
||||||
background-color: $_bg;
|
|
||||||
border-color: $osd_borders_color;
|
|
||||||
box-shadow: inset 0 1px lighten($osd_bg_color,10%);
|
|
||||||
text-shadow: 0 1px black;
|
|
||||||
icon-shadow: 0 1px black;
|
|
||||||
}
|
|
||||||
@if $t==focus {
|
|
||||||
//
|
|
||||||
// focused button
|
|
||||||
//
|
|
||||||
$_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
|
|
||||||
$osd_bg_color);
|
|
||||||
|
|
||||||
color: $osd_fg_color;
|
|
||||||
border-color: $selected_bg_color;
|
|
||||||
box-shadow: inset 0 1px lighten($osd_bg_color,10%);
|
|
||||||
text-shadow: 0 1px black;
|
|
||||||
icon-shadow: 0 1px black;
|
|
||||||
}
|
|
||||||
|
|
||||||
@else if $t==hover {
|
|
||||||
//
|
|
||||||
// active osd button
|
|
||||||
//
|
|
||||||
$_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
|
|
||||||
lighten($osd_bg_color,10%));
|
|
||||||
|
|
||||||
color: white;
|
|
||||||
border-color: $osd_borders_color;
|
|
||||||
background-color: $_bg;
|
|
||||||
box-shadow: inset 0 1px lighten($osd_bg_color,20%);
|
|
||||||
text-shadow: 0 1px black;
|
|
||||||
icon-shadow: 0 1px black;
|
|
||||||
|
|
||||||
}
|
|
||||||
@else if $t==active {
|
|
||||||
//
|
|
||||||
// active osd button
|
|
||||||
//
|
|
||||||
$_bg: if($c!=$bg_color, $c, $osd_borders_color);
|
|
||||||
|
|
||||||
color: white;
|
|
||||||
border-color: $osd_borders_color;
|
|
||||||
background-color: darken($_bg,5%);
|
|
||||||
box-shadow: none;
|
|
||||||
text-shadow: none;
|
|
||||||
icon-shadow: none;
|
|
||||||
}
|
|
||||||
@else if $t==insensitive {
|
|
||||||
//
|
|
||||||
// insensitive osd button
|
|
||||||
//
|
|
||||||
$_bg: transparentize(mix($insensitive_fg_color,$osd_bg_color,20%),0.3);
|
|
||||||
|
|
||||||
color: $insensitive_fg_color;
|
|
||||||
border-color: $osd_borders_color;
|
|
||||||
background-color: $_bg;
|
|
||||||
box-shadow: none;
|
|
||||||
text-shadow: none;
|
|
||||||
icon-shadow: none;
|
|
||||||
}
|
|
||||||
@else if $t==undecorated {
|
|
||||||
//
|
|
||||||
// reset
|
|
||||||
//
|
|
||||||
border-color: transparent;
|
|
||||||
background-color: transparent;
|
|
||||||
background-image: none;
|
|
||||||
|
|
||||||
@include _shadows(inset 0 1px transparentize(white,1),
|
|
||||||
$_blank_edge);
|
|
||||||
|
|
||||||
text-shadow: none;
|
|
||||||
icon-shadow: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
// When color definition differs for dark and light variant,
|
|
||||||
// it gets @if ed depending on $variant
|
|
||||||
|
|
||||||
|
|
||||||
$base_color: #222;
|
|
||||||
$bg_color: #000;
|
|
||||||
$fg_color: #fff;
|
|
||||||
|
|
||||||
$selected_fg_color: #ffffff;
|
|
||||||
$selected_bg_color: darken(#4a90d9,20%);
|
|
||||||
$selected_borders_color: darken($selected_bg_color, 20%);
|
|
||||||
$borders_color: darken($bg_color,12%);
|
|
||||||
$borders_edge: transparentize($fg_color, 0.9);
|
|
||||||
$link_color: lighten($selected_bg_color,20%);
|
|
||||||
$link_visited_color: lighten($selected_bg_color,10%);
|
|
||||||
$top_hilight: $borders_edge;
|
|
||||||
|
|
||||||
$warning_color: #f57900;
|
|
||||||
$error_color: #cc0000;
|
|
||||||
$success_color: darken(#73d216,10%);
|
|
||||||
$destructive_color: darken(#ef2929,10%);
|
|
||||||
|
|
||||||
$osd_fg_color: #eeeeec;
|
|
||||||
$osd_bg_color: #2e3436;
|
|
||||||
$osd_borders_color: transparentize(black, 0.3);
|
|
||||||
$osd_outer_borders_color: transparentize(white, 0.9);
|
|
||||||
|
|
||||||
$tooltip_borders_color: $osd_outer_borders_color;
|
|
||||||
|
|
||||||
//insensitive state derived colors
|
|
||||||
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
|
|
||||||
$insensitive_bg_color: mix($bg_color, $base_color, 60%);
|
|
||||||
$insensitive_borders_color: $borders_color;
|
|
||||||
|
|
||||||
//colors for the backdrop state, derived from the main colors.
|
|
||||||
$backdrop_base_color: lighten($base_color,1%);
|
|
||||||
$backdrop_bg_color: $bg_color;
|
|
||||||
$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
|
|
||||||
$backdrop_insensitive_color: lighten($backdrop_bg_color,15%);
|
|
||||||
$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
|
|
||||||
$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
@import "_high-contrast-colors"; //use gtk colors
|
@import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
|
||||||
@import "_drawing";
|
@import "gnome-shell-sass/_drawing";
|
||||||
@import "_common";
|
@import "gnome-shell-sass/_common";
|
||||||
|
|
||||||
//force symbolic icons
|
//force symbolic icons
|
||||||
stage {
|
stage {
|
||||||
|
|||||||
1
data/theme/gnome-shell-sass
Submodule
1
data/theme/gnome-shell-sass
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit f9e45c152f56b086baac34f111c837287b7b1806
|
||||||
@ -1,5 +1,5 @@
|
|||||||
$variant: 'dark';
|
$variant: 'dark';
|
||||||
|
|
||||||
@import "_colors"; //use gtk colors
|
@import "gnome-shell-sass/_colors"; //use gtk colors
|
||||||
@import "_drawing";
|
@import "gnome-shell-sass/_drawing";
|
||||||
@import "_common";
|
@import "gnome-shell-sass/_common";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user