Merge pull request #496 from dstansby/v0.5.2

0.5.2 Backports
heliopython · Jun 18, 2018 · 6b3740a · 6b3740a
2 parents 56755d5 + 0d2a8ca
commit 6b3740a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,19 @@
+Version 0.5.2
+-------------
+
+New features
+^^^^^^^^^^^^
+
+- The new HelioPy logo has been added to the documentation.
+  :issue:`448`, :issue:`447`
+
+Fixed bugs
+^^^^^^^^^^
+
+- The new data version number of :meth:`.data.mms.fpi_dis_moms` has been
+  updated.
+
+
 Version 0.5.1
 -------------
 

diff --git a/artwork/favicon.ico b/artwork/favicon.ico
diff --git a/doc/heliopy_theme/navbar.html b/doc/heliopy_theme/navbar.html
@@ -6,11 +6,9 @@
 	      <span class="icon-bar"></span>
 	      <span class="icon-bar"></span>
 	    </button>
-	    <a class="navbar-brand" href="{{ theme_logo_url }}">HelioPy</a>
 	  </div>
 	  <div class="collapse navbar-collapse nav-collapse">
-	    <ul class="nav navbar-nav">
-	        </ul>
+      <img src="{{ pathto('_static/navbar.svg', 1) }}" alt="HelioPy logo" height=70px/>
 	    </div>
       </ul>
 	  </div>

diff --git a/doc/heliopy_theme/static/navbar.svg b/doc/heliopy_theme/static/navbar.svg
diff --git a/doc/heliopy_theme/static/style.css b/doc/heliopy_theme/static/style.css
@@ -68,6 +68,9 @@ span.caption-text {
 
 /* Navbar */
 
+.navbar-fixed-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse {
+  max-height: 60px;
+}
 .navbar {
   background-color: #444;
 }

diff --git a/doc/heliopy_theme/theme.conf b/doc/heliopy_theme/theme.conf
@@ -7,7 +7,7 @@ source_link_position = False
 bootswatch_theme = flatly
 bootstrap_version = 3
 
-logo_url = http://heliopy.org/
+logo_url = https://heliopy.org/
 opengraph_image =
 twitter_id =
 github_user = heliopython

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -26,7 +26,7 @@
 matplotlib.use('agg')
 sys.path.insert(0, os.path.abspath('../../'))
 
-
+html_favicon = '../../artwork/favicon.ico'
 html_sidebars = {'**': ['docsidebar.html']}
 
 # Pretend these modules exits so readthedocs builds

diff --git a/heliopy/data/mms.py b/heliopy/data/mms.py
@@ -60,7 +60,7 @@ def fpi_dis_moms(probe, mode, starttime, endtime):
                                              str(date.year),
                                              str(date.month).zfill(2))
             filename = ('mms{}_fpi_{}_l2_dis-moms_'
-                        '{}{:02}{:02}{:02}0000_v3.1.1.cdf').format(
+                        '{}{:02}{:02}{:02}0000_v3.3.0.cdf').format(
                             probe, mode, date.year, date.month, date.day, h)
 
             # Absolute path to local directory for this data file