diff --git a/Gruntfile.js b/Gruntfile.js index 9292ce56..efb3bee5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -19,6 +19,14 @@ module.exports = function(grunt) { } } }, + copy: { + fonts: { + files: [ + // includes files within path + {expand: true, flatten: true, src: ['bower_components/font-awesome/fonts/*'], dest: 'sphinx_rtd_theme/static/fonts/', filter: 'isFile'} + ] + } + }, compass: { build: { @@ -45,7 +53,8 @@ module.exports = function(grunt) { } }, clean: { - build: ["demo_docs/build"] + build: ["demo_docs/build"], + fonts: ["sphinx_rtd_theme/static/fonts"] }, watch: { @@ -73,8 +82,10 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-compass'); grunt.loadNpmTasks('grunt-contrib-clean'); + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-open'); + grunt.registerTask('fonts', ['clean:fonts','copy:fonts']); grunt.registerTask('default', ['exec:bower_update','clean:build','compass:dev','exec:build_sphinx','connect','open','watch']); grunt.registerTask('build', ['exec:bower_update','clean:build','compass:build','exec:build_sphinx']); } diff --git a/bower.json b/bower.json index eebcdabf..c068a63e 100644 --- a/bower.json +++ b/bower.json @@ -27,7 +27,7 @@ "src" ], "dependencies": { - "wyrm": "~0.0.84" + "wyrm": "~0.0.x" } } diff --git a/compass.rb b/compass.rb index a5dc816e..41f0b9d9 100644 --- a/compass.rb +++ b/compass.rb @@ -18,6 +18,7 @@ fonts_dir = "font" add_import_path "../../bower_components/bourbon/app/assets/stylesheets" add_import_path "../../bower_components/neat/app/assets/stylesheets" add_import_path "../../bower_components/wyrm/sass" +add_import_path "../../bower_components/font-awesome/scss" # You can select your preferred output style here (can be overridden via the command line): # output_style = :expanded or :nested or :compact or :compressed diff --git a/package.json b/package.json index 963416a3..5dbb8967 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "grunt-contrib-watch": "~0.4.3", "grunt-contrib-connect": "0.5.0", "grunt-contrib-clean": "0.5.0", + "grunt-contrib-copy": "0.5.0", "connect-livereload": "~0.3.0", "grunt-exec": "~0.4.2", "grunt-open": "0.2.2", diff --git a/sass/_theme_badge.sass b/sass/_theme_badge.sass index a5c8d9b5..6b6fa001 100644 --- a/sass/_theme_badge.sass +++ b/sass/_theme_badge.sass @@ -22,9 +22,9 @@ cursor: pointer color: $green +clearfix - .icon + .fa color: $section-background-color - .icon-book + .fa-book float: left &.rst-out-of-date background-color: $red @@ -60,11 +60,11 @@ left: auto border: none max-width: $nav-desktop-width - .icon-book + .fa-book float: none &.shift-up .rst-current-version text-align: right - .icon-book + .fa-book float: left .rst-current-version width: auto diff --git a/sass/_theme_badge_fa.sass b/sass/_theme_badge_fa.sass index 6230b943..9ea343ba 100644 --- a/sass/_theme_badge_fa.sass +++ b/sass/_theme_badge_fa.sass @@ -2,7 +2,7 @@ +font-face(fontawesome-webfont, '#{$font-awesome-dir}fontawesome_webfont') -.icon:before +.fa:before display: inline-block font-family: fontawesome-webfont font-style: normal @@ -11,43 +11,43 @@ text-decoration: inherit +font-smooth -a .icon +a .fa display: inline-block text-decoration: inherit li - .icon + .fa display: inline-block - .icon-large:before, - .icon-large:before - /* 1.5 increased font size for icon-large * 1.25 width + .fa-large:before, + .fa-large:before + /* 1.5 increased font size for fa-large * 1.25 width width: 1.5 * 1.25em -ul.icons +ul.fas list-style-type: none margin-left: 2em text-indent: -0.8em li - .icon + .fa width: .8em - .icon-large:before, - .icon-large:before - /* 1.5 increased font size for icon-large * 1.25 width + .fa-large:before, + .fa-large:before + /* 1.5 increased font size for fa-large * 1.25 width vertical-align: baseline // width: 1.5*1.25em -.icon-book:before +.fa-book:before content: "\f02d" -.icon-caret-down:before +.fa-caret-down:before content: "\f0d7" -.icon-caret-up:before +.fa-caret-up:before content: "\f0d8" -.icon-caret-left:before +.fa-caret-left:before content: "\f0d9" -.icon-caret-right:before +.fa-caret-right:before content: "\f0da" diff --git a/sass/_theme_rst.sass b/sass/_theme_rst.sass index 562a399a..2430d2f6 100644 --- a/sass/_theme_rst.sass +++ b/sass/_theme_rst.sass @@ -45,8 +45,8 @@ margin-bottom: 0 .admonition-title @extend .wy-alert-title - @extend .icon - @extend .icon-exclamation-sign + @extend .fa + @extend .fa-exclamation-circle &:before margin-right: 4px .note, .seealso @@ -98,7 +98,7 @@ display: none visibility: hidden font-size: 14px - @extend .icon + @extend .fa &:after visibility: visible content: "\f0c1" diff --git a/sass/theme.sass b/sass/theme.sass index 9aea7c29..3a31607d 100644 --- a/sass/theme.sass +++ b/sass/theme.sass @@ -29,8 +29,11 @@ // Wyrm mixins @import wyrm_core/mixin -// Wyrm core styles used in this theme +// Font Awesome 4.0 with wyrm extras +@import font-awesome @import wyrm_core/font_awesome_extra + +// Wyrm core styles used in this theme @import wyrm_core/alert @import wyrm_core/button @import wyrm_core/dropdown diff --git a/sphinx_rtd_theme/breadcrumbs.html b/sphinx_rtd_theme/breadcrumbs.html index 982c856f..d9b29371 100644 --- a/sphinx_rtd_theme/breadcrumbs.html +++ b/sphinx_rtd_theme/breadcrumbs.html @@ -7,9 +7,9 @@
  • {{ title }}
  • {% if display_github %} - Edit on GitHub + Edit on GitHub {% elif display_bitbucket %} - Edit on Bitbucket + Edit on Bitbucket {% elif show_source and has_source and sourcename %} View page source {% endif %} diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html index d7a59e1c..9100b150 100644 --- a/sphinx_rtd_theme/layout.html +++ b/sphinx_rtd_theme/layout.html @@ -105,7 +105,7 @@ {# SIDE NAV, TOGGLES ON MOBILE #}