Skip to content

Commit fb7578c

Browse files
jmdobryjmdobry
committed
Restyled documentation site. #124.
1 parent b0f7421 commit fb7578c

10 files changed

+570
-479
lines changed

‎Gruntfile.js

+80-71
Original file line numberDiff line numberDiff line change
@@ -146,82 +146,91 @@ module.exports = function (grunt) {
146146
},
147147

148148
concat: {
149-
libs: {
150-
src: [
151-
'doc/resources/js/jquery.js',
152-
'doc/resources/js/jquery.goto.js',
153-
'doc/resources/js/jquery.cookie.js',
154-
'doc/resources/angular/angular.js',
155-
'doc/resources/angular/angular-bootstrap.js',
156-
'doc/resources/angular/angular-bootstrap-prettify.js',
157-
'doc/resources/angular/angular-cookies.js',
158-
'doc/resources/angular/angular-resource.js',
159-
'doc/resources/angular/angular-sanitize.js'
149+
dist: {
150+
files: [
151+
{
152+
src: [
153+
'doc/resources/js/jquery.js',
154+
'doc/resources/js/jquery.goto.js',
155+
'doc/resources/js/jquery.cookie.js',
156+
'doc/resources/angular/angular.js',
157+
'doc/resources/angular/angular-route.js',
158+
'doc/resources/libraries/angular-bootstrap.js',
159+
'doc/resources/angular/angular-cookies.js',
160+
'doc/resources/angular/angular-resource.js',
161+
'doc/resources/angular/angular-sanitize.js'
160162

161-
],
162-
dest: 'doc/resources/js/libs.js'
163-
},
164-
scripts: {
165-
src: [
166-
'doc/resources/js/docs_module_begin.js',
167-
'guide/angular-data.js',
168-
'doc/resources/doc_api_resources/doc_api.js',
169-
'doc/resources/js/docs_module_end.js',
170-
'doc/documentation/docs-metadata.js',
171-
'doc/documentation/groups-metadata.js',
172-
'doc/documentation/layout-metadata.js'
163+
],
164+
dest: 'doc/resources/js/libs.js'
165+
},
166+
{
167+
src: [
168+
'bower_components/bootstrap/dist/css/bootstrap.min.css',
169+
'doc/resources/css/font-awesome.css',
170+
'doc/resources/css/docular.css',
171+
'doc/resources/css/custom.css',
172+
'guide/angular-data.css'
173+
],
174+
dest: 'doc/resources/css/styles.css'
175+
},
176+
{
177+
src: [
178+
'doc/resources/js/docs_module_begin.js',
179+
'doc/resources/js/controllers/index.js',
180+
'doc/resources/js/directives/index.js',
181+
'doc/resources/js/services/index.js',
182+
'doc/resources/js/directives/doc.js',
183+
'doc/resources/js/docs_module_end.js',
184+
'doc/documentation/docs-metadata.js',
185+
'doc/documentation/groups-metadata.js',
186+
'doc/documentation/layout-metadata.js'
173187

174-
],
175-
dest: 'doc/resources/js/scripts.js'
176-
},
177-
css: {
178-
src: [
179-
'doc/resources/css/bootstrap.min.css',
180-
'doc/resources/css/font-awesome.css',
181-
'doc/resources/css/docular.css',
182-
'doc/resources/css/custom.css',
183-
'doc/resources/doc_api_resources/doc_api.css',
184-
'guide/angular-data.css'
185-
],
186-
dest: 'doc/resources/css/styles.css'
188+
],
189+
dest: 'doc/resources/js/scripts.js'
190+
}
191+
]
187192
}
188193
},
189194

190195
copy: {
191-
favicon: {
192-
expand: true,
193-
cwd: 'guide/',
194-
src: 'favicon.ico',
195-
dest: 'doc/',
196-
flatten: true
197-
},
198-
index: {
199-
expand: true,
200-
cwd: 'guide/',
201-
src: 'index.html',
202-
dest: 'doc/',
203-
flatten: true
204-
},
205-
data_white: {
206-
expand: true,
207-
cwd: 'guide/',
208-
src: 'data_white.png',
209-
dest: 'doc/resources/img/',
210-
flatten: true
211-
},
212-
chart: {
213-
expand: true,
214-
cwd: 'guide/',
215-
src: 'chart.png',
216-
dest: 'doc/resources/img/',
217-
flatten: true
218-
},
219-
cream_dust: {
220-
expand: true,
221-
cwd: 'guide/',
222-
src: 'cream_dust.png',
223-
dest: 'doc/resources/img/',
224-
flatten: true
196+
dist: {
197+
files: [
198+
{
199+
expand: true,
200+
cwd: 'guide/',
201+
src: 'index.html',
202+
dest: 'doc/',
203+
flatten: true
204+
},
205+
{
206+
expand: true,
207+
cwd: 'guide/',
208+
src: 'data_grey.png',
209+
dest: 'doc/resources/img/',
210+
flatten: true
211+
},
212+
{
213+
expand: true,
214+
cwd: 'guide/',
215+
src: 'chart.png',
216+
dest: 'doc/resources/img/',
217+
flatten: true
218+
},
219+
{
220+
expand: true,
221+
cwd: 'guide/',
222+
src: 'cream_dust.png',
223+
dest: 'doc/resources/img/',
224+
flatten: true
225+
},
226+
{
227+
expand: true,
228+
cwd: 'guide/',
229+
src: 'favicon.ico',
230+
dest: 'doc/',
231+
flatten: true
232+
}
233+
]
225234
}
226235
},
227236
docular: {
@@ -372,7 +381,7 @@ module.exports = function (grunt) {
372381
});
373382

374383
grunt.registerTask('test', ['build', 'karma:ci', 'karma:cacheFactory', 'karma:DSCacheFactory', 'karma:min']);
375-
grunt.registerTask('doc', ['clean:doc', 'docular', 'concat', 'copy', 'clean:afterDoc', 'uglify:scripts']);
384+
grunt.registerTask('doc', ['clean:doc', 'docular', 'concat', 'copy', 'uglify:scripts']);
376385
grunt.registerTask('build', [
377386
'clean',
378387
'jshint',

‎bower.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"angular-mocks": "~1.2.16",
3131
"angular-cache": "~3.1.0",
3232
"observe-js": "0.3.4",
33-
"angular-data-mocks": "~0.5.3"
33+
"angular-data-mocks": "~0.5.3",
34+
"bootstrap": "~3.2.0"
3435
}
3536
}

‎guide/angular-data.css

+106-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,77 @@
11
body {
22
background-size: auto;
33
background: url(/resources/img/cream_dust.png) repeat repeat;
4-
font-family: 'Open sans', Arial, Helvetica, sans-serif;
4+
font-family: 'Nunito', Arial, Helvetica, sans-serif;
5+
font-weight: 300;
56
}
67

7-
.main-nav {
8+
h1, h2, h3, h4, h5, h6, p, a, small {
9+
font-family: 'Nunito', Arial, Helvetica, sans-serif;
10+
font-weight: 300;
11+
}
12+
13+
#home-page .row {
14+
15+
}
16+
17+
#home-section-1 {
18+
background-color: #0088cc;
19+
color: #fff;
20+
margin-top: -20px;
21+
}
22+
23+
#home-section-2, #home-section-3, #home-section-4 {
24+
padding: 5em 0;
25+
font-size: 17px;
26+
}
27+
28+
#home-section-3 {
29+
background-color: #0088cc;
30+
color: #fff;
31+
}
32+
33+
#home-section-3 li {
34+
list-style: none;
35+
}
36+
37+
#home-section-3 li:before {
38+
font-family: 'FontAwesome';
39+
content: '\f054';
40+
margin: 0 5px 0 -15px;
41+
}
42+
43+
#home-section-5 {
44+
padding: 5em 0;
45+
background-color: #0088cc;
46+
color: #fff;
47+
margin-bottom: -60px;
48+
}
49+
50+
#main-header {
851
border-bottom: 2px solid #0088cc;
952
}
1053

54+
#main-header li {
55+
border: none;
56+
}
57+
58+
#main-header li > a:hover, #main-header li > a:focus, #main-header li > a.active {
59+
color: #000;
60+
}
61+
62+
#main-header .dropdown-menu li > a {
63+
font-weight: 300;
64+
}
65+
66+
#main-header .dropdown-menu li > a:hover, #main-header .dropdown-menu .active > a, #main-header .dropdown-menu .active > a:hover {
67+
color: #fff;
68+
}
69+
70+
#main-header.navbar-inverse .navbar-nav > .open > a, #main-header.navbar-inverse .navbar-nav > .open > a:hover, #main-header.navbar-inverse .navbar-nav > .open > a:focus {
71+
background-color: #0088cc;
72+
color: #fff !important;
73+
}
74+
1175
.main-nav .dropdown-menu {
1276
min-width: 250px;
1377
}
@@ -16,11 +80,33 @@ body {
1680
content: " ";
1781
position: absolute;
1882
z-index: -1;
19-
top: 5px;
2083
left: 0px;
84+
width: 100%;
2185
right: 0px;
2286
bottom: -4px;
23-
border: 2px solid #11c8fa;
87+
border: 1px solid #11C8FA;
88+
}
89+
90+
ul.navbar-nav {
91+
margin-bottom: 0;
92+
}
93+
94+
.footer .navbar-nav {
95+
float: none;
96+
}
97+
98+
.navbar.navbar-inverse {
99+
min-height: 42px;
100+
background-color: #fff;
101+
}
102+
103+
.navbar-brand {
104+
height: 42px;
105+
}
106+
107+
.navbar-brand small {
108+
font-size: 12px;
109+
color: #737373;
24110
}
25111

26112
a {
@@ -35,15 +121,15 @@ a:hover {
35121
color: #0088cc;
36122
}
37123

38-
.nav-list .active>a, .nav-list .active>a:hover {
124+
.nav-list .active > a, .nav-list .active > a:hover {
39125
background-color: #0088cc;
40126
}
41127

42128
.rounded-list a:before {
43129
background: #0088cc;
44130
}
45131

46-
.dropdown-menu li>a:hover, .dropdown-menu .active>a, .dropdown-menu .active>a:hover {
132+
.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
47133
color: #ffffff;
48134
text-decoration: none;
49135
background-color: #0088cc;
@@ -52,6 +138,7 @@ a:hover {
52138
.footer {
53139
border-top: 2px solid #0088cc;
54140
position: relative;
141+
padding: 0;
55142
}
56143

57144
.footer:before {
@@ -69,16 +156,22 @@ a:hover {
69156
color: #fff;
70157
}
71158

72-
.footer .nav>li>a:hover {
159+
.footer li.button-item {
160+
height: 50px;
161+
padding-top: 15px;
162+
}
163+
164+
.footer .nav > li > a:hover {
73165
text-decoration: underline;
74166
}
75167

76-
.nav>li>a:hover {
168+
.nav > li > a:hover {
77169
background: none;
78170
}
79171

80172
.jumbotron {
81173
margin: 80px 0;
174+
background-color: transparent;
82175
text-align: center;
83176
}
84177

@@ -100,3 +193,8 @@ a:hover {
100193
.home-lists li {
101194
font-size: 16px;
102195
}
196+
197+
li.nav-header.module {
198+
background-color: #0088cc;
199+
color: #fff;
200+
}

‎guide/angular-data.js

-23
This file was deleted.

‎guide/data_grey.png

4.33 KB
Loading

0 commit comments

Comments
 (0)