Skip to content

Commit

Permalink
Merge pull request #14 from enthought/feat/new-enthought-branding
Browse files Browse the repository at this point in the history
New Enthought Branding
  • Loading branch information
corranwebster authored Mar 3, 2022
2 parents 1bb438c + ecde0b0 commit f802c76
Show file tree
Hide file tree
Showing 16 changed files with 61 additions and 38 deletions.
2 changes: 1 addition & 1 deletion enthought_sphinx_theme/enthought/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
{%- if favicon %}
<link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}">
{%- elif theme_use_default_favicon %}
<link rel="shortcut icon" href="{{ pathto('_static/img/favicon.ico', 1) }}">
<link rel="shortcut icon" href="{{ pathto('_static/img/favicon.png', 1) }}">
{%- endif %}
{%- endif %}
{%- block linktags %}
Expand Down
6 changes: 3 additions & 3 deletions enthought_sphinx_theme/enthought/static/css/spc-bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ textarea {
}
body {
margin: 0;
font-family: 'Source Sans Pro', sans-serif;
font-family: 'Poppins', sans-serif;
font-size: 16px;
line-height: 21px;
color: #333333;
Expand Down Expand Up @@ -887,7 +887,7 @@ input,
button,
select,
textarea {
font-family: 'Source Sans Pro', sans-serif;
font-family: 'Poppins', sans-serif;
}
label {
display: block;
Expand Down Expand Up @@ -3799,7 +3799,7 @@ input[type="submit"].btn.btn-mini {
.navbar-search .search-query {
margin-bottom: 0;
padding: 4px 14px;
font-family: 'Source Sans Pro', sans-serif;
font-family: 'Poppins', sans-serif;
font-size: 13px;
font-weight: normal;
line-height: 1;
Expand Down
66 changes: 37 additions & 29 deletions enthought_sphinx_theme/enthought/static/enthought.css_t
Original file line number Diff line number Diff line change
Expand Up @@ -32,35 +32,35 @@
}

@font-face{
font-family: 'Source Sans Pro';
font-family: 'Poppins';
font-weight: 400;
font-style: normal;
font-stretch: normal;
src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('fonts/SourceSansPro-Regular.otf.woff') format('woff');
src: local('Poppins'), local('Poppins-Regular'), url('fonts/poppins-v19-latin-regular.otf.woff2') format('woff2');
}

@font-face{
font-family: 'Source Sans Pro';
font-family: 'Poppins';
font-weight: 600;
font-style: normal;
font-stretch: normal;
src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('fonts/SourceSansPro-Semibold.otf.woff') format('woff');
src: local('Poppins Semibold'), local('Poppins-SemiBold'), url('fonts/poppins-v19-latin-600.otf.woff2') format('woff2');
}

@font-face{
font-family: 'Source Sans Pro';
font-family: 'Poppins';
font-weight: 400;
font-style: italic;
font-stretch: normal;
src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('fonts/SourceSansPro-It.otf.woff') format('woff');
src: local('Poppins Italic'), local('Poppins-Italic'), url('fonts/poppins-v19-latin-italic.otf.woff2') format('woff2');
}

@font-face{
font-family: 'Source Sans Pro';
font-family: 'Poppins';
font-weight: 600;
font-style: italic;
font-stretch: normal;
src: local('Source Sans Pro Semibold Italic'), local('SourceSansPro-SemiboldIt'), url('fonts/SourceSansPro-SemiboldIt.otf.woff') format('woff');
src: local('Poppins Semibold Italic'), local('Poppins-SemiBoldItalic'), url('fonts/poppins-v19-latin-600italic.otf.woff2') format('woff2');
}

/*
Expand Down Expand Up @@ -192,15 +192,15 @@ pre {
.nav-pills > .active > a:hover,
.nav-pills > .active > a:focus {
color: #ffffff;
background-color: #253370;
background-color: #0f384d;
}

.nav-pills.pull-right > li {
float: right;
}

a {
color: #253370;
color: #00767c;
text-decoration: none;
}

Expand Down Expand Up @@ -295,12 +295,12 @@ form.search > input[type="text"] {
* Headers
*/

h1 a { color: #333333; }
h2 a { color: #333333; }
h3 a { color: #333333; }
h4 a { color: #333333; }
h5 a { color: #333333; }
h6 a { color: #333333; }
h1 a { color: #00767c; }
h2 a { color: #00767c; }
h3 a { color: #58b1bf; }
h4 a { color: #58b1bf; }
h5 a { color: #58b1bf; }
h6 a { color: #58b1bf; }

h1 tt { font: inherit; border-bottom: none; }
h2 tt { font: inherit; border-bottom: none; }
Expand All @@ -310,17 +310,17 @@ h5 tt { font: inherit; border-bottom: none; }
h6 tt { font: inherit; border-bottom: none; }

div#spc-section-body h1, h2, h3, h4, h5, h6{
color: #444444;
color: #00767c;
font-weight: normal;
border-bottom: 0px solid #656565;
margin-bottom: 0.5em;
}
div#spc-section-body h1 { font-size: 200%; font-weight: bold; color: #333333; }
div#spc-section-body h2 { font-size: 160%; font-weight: bold; }
div#spc-section-body h3 { font-size: 140%; }
div#spc-section-body h4 { font-size: 120%; border-bottom: none; }
div#spc-section-body h5 { font-size: 110%; border-bottom: none; }
div#spc-section-body h6 { font-size: 100%; border-bottom: none; }
div#spc-section-body h1 { font-size: 200%; font-weight: bold; color: #0f384d; }
div#spc-section-body h2 { font-size: 160%; font-weight: bold; color: #0f384d; }
div#spc-section-body h3 { font-size: 140%; color: #00767c; }
div#spc-section-body h4 { font-size: 120%; border-bottom: none; color: #00767c; }
div#spc-section-body h5 { font-size: 110%; border-bottom: none; color: #00767c; }
div#spc-section-body h6 { font-size: 100%; border-bottom: none; color: #00767c; }

/* Styling for hyperlinks */
div#spc-section-body a{
Expand All @@ -336,7 +336,7 @@ div#spc-section-body .align-center{
}

p.rubric {
color: #333333;
color: #58b1bf;
font-size: 120%;
font-weight: normal;
border-bottom: 1px solid #DDDDDD;
Expand Down Expand Up @@ -385,8 +385,8 @@ p.admonition-title:after {
}

div.seealso {
background-color: #ffc;
border: 1px solid #ff6;
background-color: #d9d8d7;
border: 1px solid #0f384d;
}

div.seealso dt {
Expand All @@ -402,11 +402,19 @@ div.seealso dd {
}

div.warning {
background-color: #ffe4e4;
background-color: #e6d358;
border: 1px solid #f66;
}

div.note {
background-color: #eee;
border: 1px solid #ccc;
background-color: #d9d8d7;
border: 1px solid #0f384d;
}

.label {
background=color: #add3db;
}

:not(li) > ul > li:first-child > :first-child {
margin-top: 2px;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified enthought_sphinx_theme/enthought/static/img/e-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
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 less/spc-bootstrap.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@baseLineHeight: 21px;

//Colors
@blue: #253370;
@blue: #0f384d;

//Sprites
@iconSpritePath: '../../img/glyphicons-halflings.png';
Expand Down
23 changes: 19 additions & 4 deletions licenses/fonts.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
enthought-sphinx-theme uses and distributes the fonts Source Sans Pro and
Source Code Pro from Adobe Systems Incorporated under the following SIL Open
Font License.
-----
Fonts
-----

enthought-sphinx-theme uses and distributes the font Source Code Pro from Adobe
Systems Incorporated and the font Poppins from under the following SIL Open Font License.

enthought_sphinx_theme/enthought/static/fonts/

Source Code Pro
---------------

Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/),
with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of
Adobe Systems Incorporated in the United States and/or other countries.
Expand All @@ -12,6 +18,15 @@ This Font Software is licensed under the SIL Open Font License, Version 1.1.

This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

Poppins
-------

Copyright 2014-2019 Indian Type Foundry ([email protected])

This Font Software is licensed under the SIL Open Font License, Version 1.1.

This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
Expand All @@ -26,7 +41,7 @@ with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
Expand Down

0 comments on commit f802c76

Please sign in to comment.