Skip to content

Commit

Permalink
Revert "Paint it black"
Browse files Browse the repository at this point in the history
This reverts commit 621f8fc.
  • Loading branch information
sbstnc committed Dec 9, 2015
1 parent 14b6d18 commit 6f83c7c
Show file tree
Hide file tree
Showing 106 changed files with 4,364 additions and 4,364 deletions.
120 changes: 60 additions & 60 deletions common/cinnamon/cinnamon.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/cinnamon/common-assets/misc/bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/cinnamon/common-assets/panel/activities-active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/cinnamon/common-assets/panel/activities.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/cinnamon/light-assets/misc/button-box.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/cinnamon/light-assets/switch/switch-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions common/cinnamon/sass/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@


$base_color: if($variant =='light', #ffffff, #404552);
$text_color: if($variant == 'light', #5e5e5e, #D3DAE3);
$text_color: if($variant == 'light', #5c616c, #D3DAE3);
$bg_color: if($variant =='light', #F5F6F7, #383C4A);
$fg_color: if($variant =='light', #5e5e5e, #D3DAE3);
$fg_color: if($variant =='light', #5c616c, #D3DAE3);

$selected_fg_color: #ffffff;
$selected_bg_color: #525252;
$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%));

Expand All @@ -29,8 +29,8 @@ $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45),
$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(#2b2b2b, 0.05); }
@if $transparency=='false' and $variant=='light' { $header_bg: #2b2b2b; }
@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; }

Expand All @@ -41,7 +41,7 @@ $header_border: if($variant == 'light' and $darker=='false', darken($header_bg,
$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(#252525, 0.05), #252525);
$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%));

Expand Down Expand Up @@ -76,7 +76,7 @@ $header_button_border: if($darker == 'true' or $variant == 'dark', transparentiz
//WM Buttons

// Close
$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #525252, #cc575d);
$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);

Expand Down
2 changes: 1 addition & 1 deletion common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/gnome-shell/3.14/common-assets/dash/dash-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/gnome-shell/3.14/common-assets/dash/dash-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/gnome-shell/3.14/common-assets/dash/dash-top.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/gnome-shell/3.14/common-assets/misc/bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/gnome-shell/3.14/common-assets/panel/activities.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/gnome-shell/3.14/dark-assets/misc/button-box.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6f83c7c

Please sign in to comment.