aboutsummaryrefslogtreecommitdiff
path: root/common/gnome-shell
diff options
context:
space:
mode:
authorHorst31802015-06-10 09:28:54 +0200
committerHorst31802015-06-10 09:28:54 +0200
commit5b43e892e8f27054ddda82097a6cf4f3ef4e6660 (patch)
tree141efc664dccf72c6f887bc4c0292dc938a44836 /common/gnome-shell
parent8dff786fd670d173fdd01d97d57fe1b090ea1569 (diff)
parent697b2c390d6b68831b02ba6b8b1491ab9c5970b1 (diff)
downloadsolarc-theme-5b43e892e8f27054ddda82097a6cf4f3ef4e6660.tar.gz
solarc-theme-5b43e892e8f27054ddda82097a6cf4f3ef4e6660.tar.xz
solarc-theme-5b43e892e8f27054ddda82097a6cf4f3ef4e6660.zip
Merge branch 'master' into dark_variant
Diffstat (limited to 'common/gnome-shell')
-rw-r--r--common/gnome-shell/3.16/_common.scss3
-rw-r--r--common/gnome-shell/3.16/gnome-shell.css2
2 files changed, 2 insertions, 3 deletions
diff --git a/common/gnome-shell/3.16/_common.scss b/common/gnome-shell/3.16/_common.scss
index 5f9d48c..08a711c 100644
--- a/common/gnome-shell/3.16/_common.scss
+++ b/common/gnome-shell/3.16/_common.scss
@@ -25,8 +25,7 @@ $panel-corner-radius: 0px;
// Globals
//
$font-size: 9;
-//$font-family: Cantarell, Sans-Serif;
-$font-family: Futura Bk bt, Sans-Serif;
+$font-family: Cantarell, 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);
diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css
index 76e83a9..8b46878 100644
--- a/common/gnome-shell/3.16/gnome-shell.css
+++ b/common/gnome-shell/3.16/gnome-shell.css
@@ -17,7 +17,7 @@
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
stage {
- font-family: Futura Bk bt, Sans-Serif;
+ font-family: Cantarell, Sans-Serif;
font-size: 9pt;
color: #5c616c; }