Commit 9b5efdaa authored by Prakhar Agarwal's avatar Prakhar Agarwal 🎯
Browse files

Fixed merge conflicts

parents 2a02f550 bab22574
......@@ -36,7 +36,6 @@
<!-- View Section -->
<li id="menu-view">
<ul class="rounded shadow">
<li id="view-zoomout"></li>
<li id="view-fullscreen"></li>
</ul>
</li>
......
......@@ -110,12 +110,6 @@ function menu_options(type, w, cid) {
},
// View entries
"view-zoomout": {
label: l("menu.zoomout"),
key: pdbundle.shortcuts.menu.zoomout_web.key,
modifiers: pdbundle.shortcuts.menu.zoomout_web.modifiers,
tooltip: l("menu.zoomout_tt")
},
"view-fullscreen": {
label: l("menu.fullscreen"),
key: pdbundle.shortcuts.menu.fullscreen_web.key,
......@@ -436,6 +430,12 @@ function menu_options(type, w, cid) {
modifiers: pdbundle.shortcuts.menu.zoomin_web.modifiers,
tooltip: l("menu.zoomin_tt")
},
"view-zoomout": {
label: l("menu.zoomout"),
key: pdbundle.shortcuts.menu.zoomout_web.key,
modifiers: pdbundle.shortcuts.menu.zoomout_web.modifiers,
tooltip: l("menu.zoomout_tt")
},
...view_base,
// View entries
......
......@@ -184,7 +184,7 @@ function add_shortcuts(cid){
switch(shortcut) {
case "Ctrl+0":
case "Ctrl+=":
break;
case "Ctrl+-":
case "F11":
break;
default:
......
Markdown is supported
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