Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/j201/searc2h6o
Browse files Browse the repository at this point in the history
  • Loading branch information
j201 committed May 23, 2014
2 parents ead0c69 + 4bec1f1 commit 67b7a95
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.bat
@@ -1,2 +1,2 @@
call lessc styles.less styles.css
call browserify js/main.js | uglifyjs -c -m > bundle.js
call lessc styles.less searc2h6o-public/styles.css
call browserify js/main.js | uglifyjs -c -m > searc2h6o-public/bundle.js
6 changes: 3 additions & 3 deletions index.html
Expand Up @@ -3,8 +3,8 @@
<head>
<meta charset="UTF-8">
<link href='http://fonts.googleapis.com/css?family=Oxygen' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="reset.css">
<link rel="stylesheet" href="styles.css">
<link rel="stylesheet" href="searc2h6o-public/reset.css">
<link rel="stylesheet" href="searc2h6o-public/styles.css">
<title>searC₂H₆O</title>
</head>
<body>
Expand All @@ -23,6 +23,6 @@ <h2>A high-proof LCBO search engine</h2>
<p>© 2014 j201</p>
</footer>

<script src="bundle.js"></script>
<script src="searc2h6o-public/bundle.js"></script>
</body>
</html>
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 67b7a95

Please sign in to comment.