zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-28 11:12:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
Victoria Wang 2014-10-24 15:50:05 -07:00
commit f26ee30b74
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
views/layout.erb
View file

@ -68,6 +68,8 @@
callback(suggestionObjects) callback(suggestionObjects)
}) })
} }
}).on('typeahead:selected', function(e) {
e.target.form.submit()
}) })
</script> </script>
</body> </body>

3
views/site_files/text_editor.erb
View file

@ -16,6 +16,9 @@
<div class="header-Outro"> <div class="header-Outro">
<div class="row content"> <div class="row content">
<h1>Editing <%= @filename %></h1> <h1>Editing <%= @filename %></h1>
<% if @filename.match /index.html$/ %>
<h3 class="subtitle">Note: index.html is the first web page that gets loaded when users visit your site. Make sure there are <a href="http://www.w3schools.com/html/html_links.asp" target="_blank">HTML links</a> to your other pages from this page.</h3>
<% end %>
</div> </div>
</div> </div>

9
views/surf.erb
View file

@ -132,6 +132,10 @@
display: inline; display: inline;
font-size: 11px; font-size: 11px;
} }
.hidden {
display:none!important;
visibility:hidden
}
</style> </style>
</head> </head>
<body> <body>
@ -154,7 +158,8 @@
<li> <li>
<form id="search_criteria" onsubmit="getPage(1); return false"> <form id="search_criteria" onsubmit="getPage(1); return false">
<input type="hidden" name="sort_by" value="<%= params[:sort_by] %>"> <input type="hidden" name="sort_by" value="<%= params[:sort_by] %>">
<input class="typeahead" name="tag" type="text" placeholder="Browse by tag..." value="<%= params[:tag] %>" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" dir="auto" /> <input class="typeahead" name="tag" type="text" placeholder="Browse by tag..." value="<%= params[:tag] %>" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" />
<input class="hidden" type="submit" tabindex="-1"/>
</form> </form>
</li> </li>
<li> <li>
@ -220,6 +225,8 @@
callback(suggestionObjects) callback(suggestionObjects)
}) })
} }
}).on('typeahead:selected', function(e) {
e.target.form.submit()
}) })
function toggleFollow(id) { function toggleFollow(id) {