[devdocsgjs/main: 447/1867] Fix merge conflict
- From: Andy Holmes <andyholmes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devdocsgjs/main: 447/1867] Fix merge conflict
- Date: Fri, 19 Nov 2021 23:47:15 +0000 (UTC)
commit 536fa35ff9cf1520d68d4c3f596256105b7cd46f
Merge: e894a2f3 e8d52c9c
Author: Jasper van Merle <jaspervmerle gmail com>
Date: Sun Oct 21 17:33:35 2018 +0200
Fix merge conflict
.editorconfig | 8 +
.travis.yml | 3 +
Dockerfile | 2 +
Dockerfile-alpine | 2 +
Gemfile | 1 +
Gemfile.lock | 58 +-
README.md | 12 +-
assets/images/docs-2.png | Bin 17646 -> 20060 bytes
assets/images/docs-2 2x png | Bin 42718 -> 48657 bytes
assets/javascripts/app/app.coffee | 7 +-
assets/javascripts/app/shortcuts.coffee | 3 +
assets/javascripts/lib/page.coffee | 2 +-
assets/javascripts/news.json | 9 +
assets/javascripts/templates/error_tmpl.coffee | 11 +-
.../javascripts/templates/pages/about_tmpl.coffee | 37 +-
.../javascripts/templates/pages/help_tmpl.coffee | 3 +
.../templates/pages/root_tmpl.coffee.erb | 11 -
assets/javascripts/vendor/prism.js | 985 +++++++++++++--------
assets/javascripts/views/content/root_page.coffee | 4 -
.../javascripts/views/content/settings_page.coffee | 7 +-
assets/javascripts/views/search/search.coffee | 5 +
assets/stylesheets/application-dark.css.scss | 105 ---
assets/stylesheets/application.css.scss | 8 +-
assets/stylesheets/components/_app.scss | 10 +-
assets/stylesheets/components/_content.scss | 59 +-
assets/stylesheets/components/_fail.scss | 4 +-
assets/stylesheets/components/_header.scss | 60 +-
assets/stylesheets/components/_mobile.scss | 4 +-
assets/stylesheets/components/_notice.scss | 10 +-
assets/stylesheets/components/_notif.scss | 24 +-
assets/stylesheets/components/_page.scss | 8 +-
assets/stylesheets/components/_path.scss | 12 +-
assets/stylesheets/components/_prism.scss | 57 +-
assets/stylesheets/components/_settings.scss | 24 +-
assets/stylesheets/components/_sidebar.scss | 76 +-
assets/stylesheets/global/_base.scss | 68 +-
assets/stylesheets/global/_classes.scss | 49 +-
assets/stylesheets/global/_icons.scss | 11 +-
assets/stylesheets/global/_mixins.scss | 6 +
assets/stylesheets/global/_print.scss | 4 +-
assets/stylesheets/global/_variables-dark.scss | 122 ++-
assets/stylesheets/global/_variables-light.scss | 76 ++
assets/stylesheets/global/_variables.scss | 107 +--
assets/stylesheets/pages/_angularjs.scss | 2 +-
assets/stylesheets/pages/_async.scss | 4 +-
assets/stylesheets/pages/_bash.scss | 12 +
assets/stylesheets/pages/_bootstrap.scss | 2 +-
assets/stylesheets/pages/_c.scss | 4 +-
assets/stylesheets/pages/_clojure.scss | 2 +-
assets/stylesheets/pages/_d.scss | 6 +-
assets/stylesheets/pages/_dart.scss | 12 +
assets/stylesheets/pages/_dojo.scss | 2 +-
assets/stylesheets/pages/_ember.scss | 4 +-
assets/stylesheets/pages/_erlang.scss | 2 +-
assets/stylesheets/pages/_graphite.scss | 7 +
assets/stylesheets/pages/_jquery.scss | 4 +-
assets/stylesheets/pages/_love.scss | 4 +-
assets/stylesheets/pages/_mdn.scss | 6 +-
assets/stylesheets/pages/_meteor.scss | 4 +-
assets/stylesheets/pages/_npm.scss | 2 +-
assets/stylesheets/pages/_phalcon.scss | 2 +-
assets/stylesheets/pages/_php.scss | 4 +-
assets/stylesheets/pages/_postgres.scss | 2 +-
assets/stylesheets/pages/_qt.scss | 9 +
assets/stylesheets/pages/_rdoc.scss | 8 +-
assets/stylesheets/pages/_react_native.scss | 2 +-
assets/stylesheets/pages/_redis.scss | 4 +-
assets/stylesheets/pages/_rfc.scss | 2 +-
assets/stylesheets/pages/_rust.scss | 11 +-
assets/stylesheets/pages/_simple.scss | 32 +-
assets/stylesheets/pages/_sphinx.scss | 4 +-
assets/stylesheets/pages/_sphinx_simple.scss | 2 +-
assets/stylesheets/pages/_support_tables.scss | 2 +-
assets/stylesheets/pages/_yard.scss | 2 +-
assets/stylesheets/pages/_yii.scss | 2 +-
lib/app.rb | 18 +-
lib/docs/filters/bash/clean_html.rb | 74 ++
lib/docs/filters/bash/entries.rb | 56 ++
lib/docs/filters/dart/clean_html.rb | 66 ++
lib/docs/filters/dart/entries.rb | 42 +
lib/docs/filters/dom/entries.rb | 3 +
lib/docs/filters/elixir/clean_html.rb | 1 +
lib/docs/filters/express/clean_html.rb | 5 +
lib/docs/filters/graphite/clean_html.rb | 27 +
lib/docs/filters/graphite/entries.rb | 46 +
lib/docs/filters/handlebars/clean_html.rb | 44 +
lib/docs/filters/handlebars/entries.rb | 19 +
lib/docs/filters/puppeteer/clean_html.rb | 24 +
lib/docs/filters/puppeteer/entries.rb | 41 +
lib/docs/filters/pygame/clean_html.rb | 102 +++
lib/docs/filters/pygame/entries.rb | 29 +
lib/docs/filters/python/clean_html.rb | 8 +-
lib/docs/filters/python/entries_v3.rb | 22 +-
lib/docs/filters/qt/clean_html.rb | 31 +
lib/docs/filters/qt/entries.rb | 141 +++
lib/docs/filters/redis/entries.rb | 3 +-
lib/docs/filters/rust/clean_html.rb | 43 +-
lib/docs/filters/rust/entries.rb | 13 +-
lib/docs/filters/typescript/entries.rb | 1 +
lib/docs/scrapers/apache.rb | 2 +-
lib/docs/scrapers/apache_pig.rb | 2 +-
lib/docs/scrapers/bash.rb | 21 +
lib/docs/scrapers/bootstrap.rb | 2 +-
lib/docs/scrapers/bower.rb | 2 +-
lib/docs/scrapers/chai.rb | 2 +-
lib/docs/scrapers/cmake.rb | 14 +-
lib/docs/scrapers/codeceptjs.rb | 2 +-
lib/docs/scrapers/crystal.rb | 2 +-
lib/docs/scrapers/dart.rb | 37 +
lib/docs/scrapers/django.rb | 6 +
lib/docs/scrapers/docker.rb | 2 +-
lib/docs/scrapers/electron.rb | 2 +-
lib/docs/scrapers/elixir.rb | 13 +
lib/docs/scrapers/express.rb | 2 +-
lib/docs/scrapers/fish.rb | 2 +-
lib/docs/scrapers/flow.rb | 4 +-
lib/docs/scrapers/gnu.rb | 2 +-
lib/docs/scrapers/graphite.rb | 21 +
lib/docs/scrapers/grunt.rb | 2 +-
lib/docs/scrapers/handlebars.rb | 23 +
lib/docs/scrapers/haxe.rb | 2 +-
lib/docs/scrapers/immutable.rb | 2 +-
lib/docs/scrapers/influxdata.rb | 2 +-
lib/docs/scrapers/jasmine.rb | 6 +-
lib/docs/scrapers/jest.rb | 4 +-
lib/docs/scrapers/julia.rb | 24 +-
lib/docs/scrapers/laravel.rb | 15 +-
lib/docs/scrapers/less.rb | 2 +-
lib/docs/scrapers/lodash.rb | 2 +-
lib/docs/scrapers/marionette.rb | 9 +-
lib/docs/scrapers/markdown.rb | 2 +-
lib/docs/scrapers/mocha.rb | 2 +-
lib/docs/scrapers/mongoose.rb | 2 +-
lib/docs/scrapers/nim.rb | 2 +-
lib/docs/scrapers/node.rb | 6 +-
lib/docs/scrapers/npm.rb | 2 +-
lib/docs/scrapers/php.rb | 2 +-
lib/docs/scrapers/puppeteer.rb | 18 +
lib/docs/scrapers/pygame.rb | 20 +
lib/docs/scrapers/qt.rb | 121 +++
lib/docs/scrapers/redis.rb | 2 +-
lib/docs/scrapers/redux.rb | 2 +-
lib/docs/scrapers/requirejs.rb | 2 +-
lib/docs/scrapers/rust.rb | 10 +-
lib/docs/scrapers/typescript.rb | 4 +-
lib/docs/scrapers/vagrant.rb | 2 +-
lib/docs/scrapers/vulkan.rb | 2 +-
lib/docs/scrapers/webpack.rb | 2 +-
lib/docs/scrapers/yarn.rb | 4 +-
lib/tasks/docs.thor | 8 +-
public/icons/docs-2.pxm | Bin 1215418 -> 1411876 bytes
public/icons/docs-2 2x pxm | Bin 1320761 -> 1523904 bytes
public/icons/docs/bash/16.png | Bin 0 -> 547 bytes
public/icons/docs/bash/16 2x png | Bin 0 -> 1157 bytes
public/icons/docs/bash/SOURCE | 1 +
public/icons/docs/dart/16.png | Bin 0 -> 472 bytes
public/icons/docs/dart/16 2x png | Bin 0 -> 749 bytes
public/icons/docs/dart/SOURCE | 1 +
public/icons/docs/handlebars/16.png | Bin 0 -> 303 bytes
public/icons/docs/handlebars/16 2x png | Bin 0 -> 534 bytes
public/icons/docs/handlebars/SOURCE | 1 +
public/icons/docs/puppeteer/16.png | Bin 0 -> 484 bytes
public/icons/docs/puppeteer/16 2x png | Bin 0 -> 857 bytes
public/icons/docs/puppeteer/SOURCE | 1 +
public/icons/docs/pygame/16.png | Bin 0 -> 791 bytes
public/icons/docs/pygame/16 2x png | Bin 0 -> 2311 bytes
public/icons/docs/qt/16.png | Bin 0 -> 362 bytes
public/icons/docs/qt/16 2x png | Bin 0 -> 681 bytes
public/icons/docs/qt/SOURCE | 1 +
public/images/webapp-icon-512.png | Bin 0 -> 246851 bytes
public/manifest.json | 5 +
test/app_test.rb | 64 +-
views/index.erb | 4 +-
views/other.erb | 4 +-
views/unsupported.erb | 11 +-
175 files changed, 2513 insertions(+), 1128 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
