rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/The-Compiler/qutebrowser

Browse Source
This commit is contained in:
avk 2016-02-15 08:45:30 +01:00
commit cee017cc96
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc
View File

@ -30,7 +30,7 @@ rules:
no-unneeded-ternary: 2 no-unneeded-ternary: 2
operator-assignment: [2, "always"] operator-assignment: [2, "always"]
operator-linebreak: [2, "after"] operator-linebreak: [2, "after"]
space-after-keywords: [2, "always"] keyword-spacing: 2
space-before-blocks: [2, "always"] space-before-blocks: [2, "always"]
space-before-function-paren: [2, {"anonymous": "never", "named": "never"}] space-before-function-paren: [2, {"anonymous": "never", "named": "never"}]
object-curly-spacing: [2, "never"] object-curly-spacing: [2, "never"]

2
requirements.txt
View File

@ -1,6 +1,6 @@
Jinja2==2.8.0 Jinja2==2.8.0
MarkupSafe==0.23 MarkupSafe==0.23
Pygments==2.1 Pygments==2.1.1
pyPEG2==2.15.2 pyPEG2==2.15.2
PyYAML==3.11 PyYAML==3.11
colorama==0.3.6 colorama==0.3.6

2
tests/integration/data/misc/hello.txt.html
View File

@ -77,7 +77,7 @@ body .il { color: #666666 } /* Literal.Number.Integer.Long */
<h2></h2> <h2></h2>
<table class="highlighttable"><tbody><tr><td class="linenos"><div class="linenodiv"><pre>1 <table class="highlighttable"><tbody><tr><td class="linenos"><div class="linenodiv"><pre>1
2</pre></div></td><td class="code"><div class="highlight"><pre><span class="p">&lt;</span><span class="nt">html</span><span class="p">&gt;&lt;</span><span class="nt">head</span><span class="p">&gt;&lt;/</span><span class="nt">head</span><span class="p">&gt;&lt;</span><span class="nt">body</span><span class="p">&gt;&lt;</span><span class="nt">pre</span> <span class="na">style</span><span class="o">=</span><span class="s">"word-wrap: break-word; white-space: pre-wrap;"</span><span class="p">&gt;</span>Hello World! 2</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="p">&lt;</span><span class="nt">html</span><span class="p">&gt;&lt;</span><span class="nt">head</span><span class="p">&gt;&lt;/</span><span class="nt">head</span><span class="p">&gt;&lt;</span><span class="nt">body</span><span class="p">&gt;&lt;</span><span class="nt">pre</span> <span class="na">style</span><span class="o">=</span><span class="s">"word-wrap: break-word; white-space: pre-wrap;"</span><span class="p">&gt;</span>Hello World!
<span class="p">&lt;/</span><span class="nt">pre</span><span class="p">&gt;&lt;/</span><span class="nt">body</span><span class="p">&gt;&lt;/</span><span class="nt">html</span><span class="p">&gt;</span> <span class="p">&lt;/</span><span class="nt">pre</span><span class="p">&gt;&lt;/</span><span class="nt">body</span><span class="p">&gt;&lt;/</span><span class="nt">html</span><span class="p">&gt;</span>
</pre></div> </pre></div>
</td></tr></tbody></table> </td></tr></tbody></table>

2
tox.ini
View File

@ -41,7 +41,7 @@ deps =
six==1.10.0 six==1.10.0
termcolor==1.1.0 termcolor==1.1.0
vulture==0.8.1 vulture==0.8.1
Werkzeug==0.11.3 Werkzeug==0.11.4
wheel==0.29.0 wheel==0.29.0
xvfbwrapper==0.2.8 xvfbwrapper==0.2.8
cherrypy==5.0.1 cherrypy==5.0.1