Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for issue 391 and dependencies updated #396

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+103 −29
Open

fix for issue 391 and dependencies updated #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f61abde
id replaced with class
cancerberoSgx Jul 7, 2018
65c7e4e
dependencies updated - npm run build
cancerberoSgx Jul 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docco.js
View file
Open in desktop

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

62 changes: 62 additions & 0 deletions package-lock.json
View file
Open in desktop

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

40 changes: 26 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,38 @@
{
"name": "docco",
"description": "The Quick and Dirty Literate Programming Documentation Generator",
"keywords": ["documentation", "docs", "generator", "literate", "coffeescript"],
"author": "Jeremy Ashkenas",
"version": "0.8.0",
"license": "MIT",
"name": "docco",
"description": "The Quick and Dirty Literate Programming Documentation Generator",
"keywords": [
"documentation",
"docs",
"generator",
"literate",
"coffeescript"
],
"scripts": {
"build": "cake build && cake doc"
},
"author": "Jeremy Ashkenas",
"version": "0.8.0",
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/jashkenas/docco.git"
},
"engines": {
"node": ">=0.2.0"
"node": ">=0.2.0"
},
"dependencies": {
"commander": ">= 0.5.2",
"marked": ">= 0.2.7",
"fs-extra": ">= 0.6.0",
"underscore": ">= 1.0.0",
"highlight.js": ">= 8.0.x"
"commander": "^2.16.0",
"fs-extra": "^6.0.1",
"highlight.js": "^9.12.0",
"marked": "^0.4.0",
"underscore": "^1.9.1"
},
"main" : "./docco",
"main": "./docco",
"bin": {
"docco": "./bin/docco"
"docco": "./bin/docco"
},
"devDependencies": {
"coffeescript": "^2.3.1"
}
}
8 changes: 4 additions & 4 deletions resources/classic/docco.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body {
margin: 0; padding: 0;
height:100%;
}
#container { min-height: 100%; }
.container { min-height: 100%; }

a {
color: #261a3b;
Expand Down Expand Up @@ -166,7 +166,7 @@ ul.sections > li > div {

/*---------------------- (> 481px) ---------------------*/
@media only screen and (min-width: 481px) {
#container {
.container {
position: relative;
}
body {
Expand Down Expand Up @@ -200,7 +200,7 @@ ul.sections > li > div {



#background {
.background {
position: absolute;
top: 0; bottom: 0;
width: 350px;
Expand Down Expand Up @@ -275,7 +275,7 @@ ul.sections > li > div {
/*---------------------- (> 1025px) ---------------------*/
@media only screen and (min-width: 1025px) {

#background {
.background {
width: 525px;
}
ul.sections > li > div.annotation {
Expand Down
6 changes: 3 additions & 3 deletions resources/classic/docco.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<link rel="stylesheet" media="all" href="<%= css %>" />
</head>
<body>
<div id="container">
<div id="background"></div>
<div class="container">
<div class="background"></div>
<% if (sources.length > 1) { %>
<ul id="jump_to">
<li>
Expand All @@ -29,7 +29,7 @@
<% } %>
<ul class="sections">
<% if (!hasTitle) { %>
<li id="title">
<li class="title">
<div class="annotation">
<h1><%= title %></h1>
</div>
Expand Down
8 changes: 4 additions & 4 deletions resources/parallel/docco.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ body {
margin: 0; padding: 0;
height:100%;
}
#container { min-height: 100%; }
.container { min-height: 100%; }

a {
color: #000;
Expand Down Expand Up @@ -248,7 +248,7 @@ ul.sections > li > div {

/*---------------------- (> 481px) ---------------------*/
@media only screen and (min-width: 481px) {
#container {
.container {
position: relative;
}
body {
Expand Down Expand Up @@ -286,7 +286,7 @@ ul.sections > li > div {



#background {
.background {
position: absolute;
top: 0; bottom: 0;
width: 350px;
Expand Down Expand Up @@ -365,7 +365,7 @@ ul.sections > li > div {
line-height: 24px;
}

#background {
.background {
width: 525px;
}
ul.sections > li > div.annotation {
Expand Down
6 changes: 3 additions & 3 deletions resources/parallel/docco.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<link rel="stylesheet" media="all" href="<%= css %>" />
</head>
<body>
<div id="container">
<div id="background"></div>
<div class="container">
<div class="background"></div>
<% if (sources.length > 1) { %>
<ul id="jump_to">
<li>
Expand All @@ -31,7 +31,7 @@
<% } %>
<ul class="sections">
<% if (!hasTitle) { %>
<li id="title">
<li class="title">
<div class="annotation">
<h1><%= title %></h1>
</div>
Expand Down