Skip to content

Commit

Permalink
Merge branch 'release/0.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pc035860 committed Feb 19, 2017
2 parents fad4f5d + 8474fb9 commit 60c0440
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion angular-highlightjs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*! angular-highlightjs
version: 0.6.3
version: 0.7.0
build date: 2017-02-19
author: Chih-Hsuan Fan
https://github.com/pc035860/angular-highlightjs.git */
Expand Down
2 changes: 1 addition & 1 deletion angular-highlightjs.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-highlightjs",
"version": "0.6.3",
"version": "0.7.0",
"description": "AngularJS directive for syntax highlighting with highlight.js.",
"main": "./build/angular-highlightjs.js",
"ignore": [
Expand Down
2 changes: 1 addition & 1 deletion build/angular-highlightjs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*! angular-highlightjs
version: 0.6.3
version: 0.7.0
build date: 2017-02-19
author: Chih-Hsuan Fan
https://github.com/pc035860/angular-highlightjs.git */
Expand Down
2 changes: 1 addition & 1 deletion build/angular-highlightjs.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<title>angular-highlightjs examples</title>

<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.0/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/github.min.css">
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/github.min.css">
<link rel="stylesheet/less" type="text/css" href="styles.less" />

<script src="//cdnjs.cloudflare.com/ajax/libs/less.js/1.7.5/less.min.js"></script>

<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.26/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.26/angular-route.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-route.min.js"></script>
<script src="../build/angular-highlightjs.js"></script>

<script src="scripts/app.js"></script>
Expand All @@ -30,7 +30,7 @@

<ul class="nav navbar-nav">
<li ng-repeat="link in linkList" ng-class="{'active': path == link}">
<a ng-href="#{{ link }}" ng-bind="getNavName(link)"></a>
<a ng-href="#!{{ link }}" ng-bind="getNavName(link)"></a>
</li>
</ul>
<button class="btn btn-primary show-source" ng-click="toggleSource()" ng-show="!source">show source</button>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-highlightjs",
"version": "0.6.3",
"version": "0.7.0",
"description": "AngularJS directive for syntax highlighting with highlight.js",
"main": "./build/angular-highlightjs.js",
"directories": {},
Expand Down

0 comments on commit 60c0440

Please sign in to comment.