Skip to content
Snippets Groups Projects
Commit 96b23d10 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'find-0.47'

parents df8a0eb4 b02e231d
No related branches found
No related tags found
3 merge requests!424Feature autosubpatching,!402Improved positioning of the find widget elements for the nw.js 0.47.,!399Autosubpatching feature, final stage
Pipeline #2140 canceled
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    pd/nw/css/default.css
    + 2
    − 2
    View file @ 96b23d10
    ...@@ -514,8 +514,8 @@ text { ...@@ -514,8 +514,8 @@ text {
    #canvas_find { #canvas_find {
    width: 100%; width: 100%;
    height: 1em; height: 1em;
    padding-top: 4px; padding-top: 2px;
    padding-left: 8px; padding-left: 2px;
    padding-bottom: 8px; padding-bottom: 8px;
    background: silver; background: silver;
    position: fixed; position: fixed;
    ......
    pd/nw/pd_canvas.html
    + 5
    − 3
    View file @ 96b23d10
    ...@@ -39,11 +39,13 @@ ...@@ -39,11 +39,13 @@
    defaultValue="Search in Canvas" defaultValue="Search in Canvas"
    style="width:10em"/> style="width:10em"/>
    </label> </label>
    <label><span data-i18n="canvas.find.whole_word"></span> <label><span data-i18n="canvas.find.whole_word"
    <input type="checkbox" style="margin-left: 7px; margin-right: -3px;"></span>
    <input type="checkbox"
    id="canvas_find_whole_word" id="canvas_find_whole_word"
    name="canvas_find_whole_word" name="canvas_find_whole_word"
    onchange="canvas_find_whole_word(this);"/> onchange="canvas_find_whole_word(this);"
    style="position: relative; top: 2px; margin-right: 5px;"/>
    </label> </label>
    <button type="button" <button type="button"
    id="canvas_find_button" id="canvas_find_button"
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment