aboutsummaryrefslogtreecommitdiff
path: root/common/cinnamon/sass
diff options
context:
space:
mode:
authorMartin Schenck2016-10-07 11:42:04 +0200
committerMartin Schenck2016-10-07 11:42:04 +0200
commitc1d604affb2909b114ab7d5f5f5f8130e3286356 (patch)
treea72f9d05f9b41552e9d0e9ec19d845291183ce4c /common/cinnamon/sass
parent672c95170b6b1d79e7c69ef5202638abecedea97 (diff)
parent5acba9421b028a6bcf94f2b52a035f51f854d269 (diff)
downloadsolarc-theme-c1d604affb2909b114ab7d5f5f5f8130e3286356.tar.gz
solarc-theme-c1d604affb2909b114ab7d5f5f5f8130e3286356.tar.xz
solarc-theme-c1d604affb2909b114ab7d5f5f5f8130e3286356.zip
Merge branch 'master' of github.com:horst3180/arc-theme
Diffstat (limited to 'common/cinnamon/sass')
-rw-r--r--common/cinnamon/sass/_colors.scss63
-rw-r--r--common/cinnamon/sass/_common.scss33
2 files changed, 51 insertions, 45 deletions
diff --git a/common/cinnamon/sass/_colors.scss b/common/cinnamon/sass/_colors.scss
index 3659c08..8d3a5f2 100644
--- a/common/cinnamon/sass/_colors.scss
+++ b/common/cinnamon/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/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index c1788b0..6760dcc 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -8,6 +8,7 @@ $font-family: Futura Bk bt, sans, Sans-Serif;
$_bubble_bg_color: opacify($osd_bg_color,0.25);
$_bubble_fg_color: $osd_fg_color;
$_bubble_borders_color: transparentize($osd_fg_color,0.8);
+$_shell_fg_color: white;
stage {
font-family: $font-family;
@@ -266,7 +267,8 @@ StScrollBar {
//
// Popvers/Menus
//
-.popup-menu {
+.popup-menu,
+%menu {
color: white;
min-width: 200px;
color: $fg_color;
@@ -324,13 +326,9 @@ StScrollBar {
-arrow-rise: 0;
}
-/*Don't know what this does*/
.popup-combo-menu {
- background-color: rgba(0,0,0,0.4);
- padding: 1em 0em;
- color: red;
- border: 1px solid rgba(0,0,0,0.6);
- border-radius: 3px;
+ @extend %menu;
+ padding: 10px 1px;
}
.popup-image-menu-item {}
@@ -397,9 +395,10 @@ StScrollBar {
}
.panel {
+ $_panel_fg_color: $_shell_fg_color;
&-top, &-bottom {
- color: $selected_fg_color;
+ color: $_panel_fg_color;
font-size: 1em;
padding: 0px;
}
@@ -833,7 +832,7 @@ StScrollBar {
&:highlighted {
border-color: rgba(0,0,0,0);
- color: $selected_fg_color;
+ color: $_shell_fg_color;
}
}
@@ -1186,7 +1185,7 @@ StScrollBar {
font-weight: bold;
spacing: 1em;
padding: 16px;
- color: $selected_fg_color;
+ color: $_shell_fg_color;
border-image: url("common-assets/misc/osd.svg") 9 9 9 9;
}
@@ -1199,7 +1198,7 @@ StScrollBar {
min-width: 64px;
min-height: 64px;
- color: $selected_fg_color;
+ color: $_shell_fg_color;
background: none;
border: none;
border-radius: 5px;
@@ -1241,14 +1240,14 @@ StScrollBar {
padding-left: 8px;
padding-right: 8px;
transition-duration: 100;
- color: transparentize($selected_fg_color, 0.4);
+ color: transparentize($_shell_fg_color, 0.4);
- &:hover {color: $selected_fg_color;}
+ &:hover {color: $_shell_fg_color;}
&:active,
&:checked,
&:focus {
- color: $selected_fg_color;
+ color: $_shell_fg_color;
.panel-bottom & { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
@@ -1485,7 +1484,7 @@ StScrollBar {
&-box {
padding-left: 3px;
padding-right: 3px;
- color: $selected_fg_color;
+ color: $_shell_fg_color;
text-shadow: none;
transition-duration: 100;
@@ -1497,7 +1496,7 @@ StScrollBar {
&-label {
font-weight: bold;
- color: $selected_fg_color;
+ color: $_shell_fg_color;
&:hover, .applet-box:hover > & {
color: $selected_fg_color;
@@ -1506,7 +1505,7 @@ StScrollBar {
}
&-icon {
- color: $selected_fg_color;
+ color: $_shell_fg_color;
icon-size: 22px;
&:hover, .applet-box:hover > & {