Skip to content

Commit

Permalink
Merge pull request techx#106 from techx/jackcook/updates
Browse files Browse the repository at this point in the history
Small updates
  • Loading branch information
jackcook authored Dec 3, 2018
2 parents 098804e + 905058b commit 6adb2b8
Show file tree
Hide file tree
Showing 6 changed files with 708 additions and 2,748 deletions.
10 changes: 6 additions & 4 deletions app/client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title> HackMIT 2015 </title>

<!-- jQuery -->
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
<link rel="stylesheet" href="./stylesheets/normalize.css">

<!-- Semantic-UI -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.css" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.js"></script>

<!-- Angular app -->
<script src="./build/app.js"></script>

<!-- Semantic-UI -->
<link rel="stylesheet" href="./semantic/semantic.min.css" />

<!-- Custom styling -->
<link rel="stylesheet" href="./stylesheets/normalize.css">
<link rel="stylesheet" href="./build/site.css">
<link href='//fonts.googleapis.com/css?family=Montserrat:700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
Expand Down
1 change: 0 additions & 1 deletion app/client/src/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const $ = require('jquery');
const semantic = require('../semantic/semantic.min.js');

var angular = require('angular');
var uiRouter = require('angular-ui-router');
Expand Down
5 changes: 0 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ gulp.task('js', function () {
.pipe(gulp.dest('app/client/build'));
});

gulp.task('semantic', function() {
gulp.src(['semantic/dist/**/*'])
.pipe(gulp.dest('app/client/semantic'));
});

gulp.task('sass', function() {
gulp.src('app/client/stylesheets/site.scss')
.pipe(sass())
Expand Down
Loading

0 comments on commit 6adb2b8

Please sign in to comment.