Skip to content

Commit

Permalink
Fixed prettyprint and root location
Browse files Browse the repository at this point in the history
  • Loading branch information
wingedfox committed Jan 28, 2016
1 parent 8697173 commit bd117dc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 64 deletions.
2 changes: 1 addition & 1 deletion src/processors/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = function generateConfigProcessor(log) {

var title = "";
var version = "";
var root = "";
var root = "api";

return {
title: function(t) {
Expand Down
5 changes: 3 additions & 2 deletions src/templates/app/scripts/pre.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ angular.module('docApp').directive('pre', function () {
primary: 1000,
/* global prettyPrintOne */
link: function ($scope, $elem) {
var formatted = prettyPrintOne($elem.find('>code').html());
var code = $elem.find('code');
var formatted = prettyPrintOne(code.html());
$elem.addClass('prettyprint');
$elem.find('>code').html(formatted);
code.html(formatted);
}
};
});
69 changes: 9 additions & 60 deletions src/templates/app/styles/docs.css
Original file line number Diff line number Diff line change
@@ -1,68 +1,17 @@

html, body {
position:relative;
height:100%;
}

#wrapper {
min-height:100%;
position:relative;
padding-bottom:120px;
}

/*
.footer {
border-top:20px solid white;
position:absolute;
bottom:0;
left:0;
right:0;
z-index:100;
padding-top: 2em;
background-color: #333;
color: white;
padding-bottom: 2em;
}*/

.header-fixed {
position:fixed;
z-index:1000;
top:0;
left:0;
right:0;
.definition-table > tbody > tr > td,
.definition-table > tbody > tr > th {
padding: 3px 6px;
}

.header-branding {
min-height:41px!important;
}

.docs-navbar-primary {
border-radius:0!important;
margin-bottom:0!important;
.definition-table > tbody > tr > td > a,
.definition-table > tbody > tr > td > p
{
line-height: normal;
padding: 0;
margin: 0;
}

/* Logo */
/*.dropdown-menu {
display:none;
}
*/
h1,h2,h3,h4,h5,h6 {
font-family: "Open Sans";
}

.subnav-body {
margin:70px 0 20px;
}

.header .brand {
padding-top: 6px;
padding-bottom: 0px;
}

.header .brand img {
margin-top:5px;
height: 30px;
}

.docs-search {
margin:10px 0;
Expand Down
2 changes: 1 addition & 1 deletion src/templates/module.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>Installation</h2>
</ul>
<p>Then load the module in your application by adding it as a dependent module:</p>
{% code %}
angular.module('app', ['{$ doc.name $}']);
angular.module('app', [{% for require in doc.requires %}'{$ require $}', {% endfor %}'{$ doc.name $}']);
{% endcode %}

<p>With that you&apos;re ready to get started!</p>
Expand Down

0 comments on commit bd117dc

Please sign in to comment.