Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 7784209

Browse files
l-linl-lin
committed
Merge branch 'milooy-dev' into dev
2 parents 43efd55 + 5952e9d commit 7784209

File tree

7 files changed

+47
-41
lines changed

7 files changed

+47
-41
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@ bower install angular-datatables
4646

4747
### Installation
4848

49-
Include the JS file in your `index.html` file:
49+
Include the CSS, JS file in your `index.html` file:
5050

5151
```html
5252
<script src="jquery.min.js"></script>
5353
<script src="jquery.dataTables.min.js"></script>
5454
<script src="angular.min.js"></script>
5555
<script src="angular-datatables.min.js"></script>
56+
<link rel="stylesheet" href="angular-datatables.css">
5657
```
5758

5859
**IMPORTANT**: You must include the JS in this order. AngularJS **MUST** use jQuery and not its jqLite!

‎demo/partials/gettingStarted.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,15 @@ <h4>With <a href="http://bower.io">Bower</a></h4>
4444
<section>
4545
<h3>Installation</h3>
4646
<p>
47-
Include the JS file in your <code>index.html</code> file:
47+
Include the CSS, JS file in your <code>index.html</code> file:
4848
<br />
4949
</p>
5050
<div hljs language="html">
5151
<script src="jquery.min.js"></script>
5252
<script src="jquery.dataTables.min.js"></script>
5353
<script src="angular.min.js"></script>
5454
<script src="angular-datatables.min.js"></script>
55+
<link rel="stylesheet" href="angular-datatables.css">
5556
</div>
5657
<p class="text-danger">
5758
<i class="fa fa-warning"></i>&nbsp;You must include the JS file in this order. AngularJS <strong>MUST</strong> use <code>jQuery</code> and not its <code>jqLite</code>!

‎dist/plugins/buttons/angular-datatables.buttons.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function initButtonsPlugin(DTRendererService) {
7373
DTRendererService.registerPlugin(buttonsPlugin);
7474

7575
function preRender(options) {
76-
if (angular.isArray(options.buttons)) {
76+
if (options && angular.isArray(options.buttons)) {
7777
// The extension buttons seems to clear the content of the options.buttons for some reasons...
7878
// So, we save it in a tmp variable so that we can restore it afterwards
7979
// See https://github.com/l-lin/angular-datatables/issues/502
@@ -82,7 +82,7 @@ function initButtonsPlugin(DTRendererService) {
8282
}
8383

8484
function postRender(options) {
85-
if (angular.isDefined(options.buttonsTmp)) {
85+
if (options && angular.isDefined(options.buttonsTmp)) {
8686
// Restore the buttons options
8787
options.buttons = options.buttonsTmp;
8888
delete options.buttonsTmp;

‎dist/plugins/buttons/angular-datatables.buttons.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
33
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
44
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
@@ -13,6 +13,7 @@
1313

1414
<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
1515
<link rel="stylesheet" href="vendor/font-awesome-animation/dist/font-awesome-animation.min.css">
16+
<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,500,300,700' rel='stylesheet' type='text/css'>
1617
<link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap.min.css">
1718
<link rel="stylesheet" href="vendor/datatables/media/css/jquery.dataTables.min.css">
1819
<link rel="stylesheet" href="vendor/datatables-colreorder/css/dataTables.colReorder.css">
@@ -28,12 +29,13 @@
2829
<link rel="stylesheet" href="vendor/highlightjs/styles/github.css">
2930
<link rel="stylesheet" href="dist/plugins/bootstrap/datatables.bootstrap.min.css">
3031
<link rel="stylesheet" href="styles/main.css">
32+
<link rel="stylesheet" href="dist/css/angular-datatables.css">
3133
</head>
3234
<body ng-app="showcase">
3335
<div class="github-ribbon">
3436
<a href="https://github.com/l-lin/angular-datatables" class="github-corner">
3537
<svg width="60" height="60" viewBox="0 0 250 250"
36-
style="fill:#FD6C6C; color:#fff; position: absolute; top: 0; border: 0; right: 0;">
38+
style="fill:#E84A5F; color:#fff; position: absolute; top: 0; border: 0; right: 0;">
3739
<path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
3840
<path
3941
d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"

‎src/plugins/buttons/angular-datatables.buttons.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function initButtonsPlugin(DTRendererService) {
6161
DTRendererService.registerPlugin(buttonsPlugin);
6262

6363
function preRender(options) {
64-
if (angular.isArray(options.buttons)) {
64+
if (options && angular.isArray(options.buttons)) {
6565
// The extension buttons seems to clear the content of the options.buttons for some reasons...
6666
// So, we save it in a tmp variable so that we can restore it afterwards
6767
// See https://github.com/l-lin/angular-datatables/issues/502
@@ -70,7 +70,7 @@ function initButtonsPlugin(DTRendererService) {
7070
}
7171

7272
function postRender(options) {
73-
if (angular.isDefined(options.buttonsTmp)) {
73+
if (options && angular.isDefined(options.buttonsTmp)) {
7474
// Restore the buttons options
7575
options.buttons = options.buttonsTmp;
7676
delete options.buttonsTmp;

‎styles/main.css

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88

99
a, a:visited {
10-
color: #b4052c;
10+
color: #E84A5F;
1111
text-decoration: none;
1212
}
1313

@@ -19,7 +19,12 @@ a:hover {
1919
hr {
2020
border-bottom: 2px solid #eee;
2121
border-top: 0;
22-
margin: 10px 0;
22+
margin: 20px 0 50px;
23+
}
24+
25+
body {
26+
background: #fafafa;
27+
line-height: 2;
2328
}
2429

2530
/* ---------------------------------------- */
@@ -62,9 +67,9 @@ hr {
6267

6368
.header {
6469
text-align: center;
65-
border-bottom: solid 6px #dd1b16;
70+
border-bottom: solid 6px #FECEA8;
6671
position: relative;
67-
background: #333;
72+
background: #2A363B;
6873
}
6974

7075
.header::before,
@@ -79,12 +84,11 @@ hr {
7984
width: 50%;
8085
position: absolute;
8186
left: 50%;
82-
background: #8089d6;
87+
background: #99B898;
8388
}
8489

8590
.header .container h1 {
86-
margin: 0;
87-
text-shadow: -1px 1px #8f8f8f;
91+
margin: 3px;
8892
}
8993

9094
.header p {
@@ -94,7 +98,8 @@ hr {
9498
.header-icon {
9599
position: absolute;
96100
right: 4em;
97-
top: 0;
101+
top: 6px;
102+
font-size: 3.3rem;
98103
}
99104

100105
.header a {
@@ -116,7 +121,6 @@ hr {
116121
.footer-note {
117122
margin: auto;
118123
width: 900px;
119-
border-top: 1px solid #CACACA;
120124
padding-top: 15px;
121125
text-align: center;
122126
}
@@ -131,7 +135,7 @@ code {
131135
white-space: nowrap;
132136
border-radius: 4px;
133137
background-color: #F9F1F1;
134-
color: #b4052c;
138+
color: #E84A5F;
135139
}
136140

137141
code, kbd, pre, samp {
@@ -157,9 +161,9 @@ pre code {
157161

158162
.container h1 {
159163
color: #434343;
160-
font: 40px 'Nunito', sans-serif;
164+
font: 40px 'Ubuntu', sans-serif;
165+
font-weight: 500;
161166
line-height: 60px;
162-
text-shadow: 1px 1px #ccc;
163167
}
164168

165169
.main-content {
@@ -172,9 +176,9 @@ pre code {
172176
}
173177

174178
.main-content h3 {
175-
font-size: x-large;
176-
margin-bottom: 10px;
177-
margin-top: 0;
179+
font-family: 'Ubuntu', san-serif;
180+
margin: 0px 0 15px;
181+
color: #2A363B;
178182
}
179183

180184
.nav {
@@ -189,7 +193,7 @@ pre code {
189193
.nav-tabs>li>a:hover {
190194
border-bottom-color: #c2c2c2;
191195
background-color: #F9F1F1;
192-
color: #b4052c;
196+
color: #E84A5F;
193197
}
194198

195199
.nav-tabs>li.active>a,
@@ -206,22 +210,24 @@ pre code {
206210
}
207211

208212
.article-header {
209-
padding: 10px 30px 0 30px;
213+
padding: 2rem 2.5rem;
210214
color: #333;
211-
border-bottom: 1px solid #c2c2c2;
212-
border-left: 1px solid #c2c2c2;
213215
background: #fafafa;
214216
}
217+
.article-header h1 {
218+
margin: 0;
219+
font-family: 'Ubuntu', san-serif;
220+
font-size: 3rem;
221+
color: #2A363B;
222+
}
215223

216224
.article-content {
217225
padding: 30px;
218-
border-top: 2px solid #ededed;
219-
border-left: 1px solid #c2c2c2;
226+
border-left: 1px solid #FAFAFA;
220227
}
221228

222229
.showcase {
223-
border-left: 1px solid #c2c2c2;
224-
border-bottom: 1px solid #c2c2c2;
230+
padding: 2rem;
225231
}
226232

227233
.showcase.no-tab {
@@ -292,12 +298,10 @@ pre code {
292298
/* ---------------------------------------- */
293299

294300
.sidebar {
295-
font-family: 'Open Sans', serif;
301+
font-family: 'Ubuntu', san-serif;
296302
width: 200px;
297303
float: left;
298304
position: absolute;
299-
border: 1px solid #ccc;
300-
border-width: 0 1px 0 0;
301305
background-color: #f2f2f2;
302306
-webkit-transition: all .1s linear 0s;
303307
-moz-transition: all .1s linear 0s;
@@ -314,7 +318,6 @@ pre code {
314318
.sidebar .nav-list>li,
315319
.sidebar>.sidebar-collapse.first {
316320
border-top: 1px solid #fcfcfc;
317-
border-bottom: 1px solid #e5e5e5;
318321
}
319322

320323
.sidebar .nav-list>li>a {
@@ -331,7 +334,7 @@ pre code {
331334
.sidebar .nav-list>li>a:hover,
332335
.sidebar .nav-list>li.active>a {
333336
background-color: #FFF;
334-
color: #D3433E;
337+
color: #E84A5F;
335338
}
336339

337340
.sidebar .nav-list>li.active>a:before,
@@ -342,10 +345,10 @@ pre code {
342345
top: -1px;
343346
bottom: 0;
344347
left: 0;
345-
width: 3px;
346-
max-width: 3px;
348+
width: 4px;
349+
max-width: 4px;
347350
overflow: hidden;
348-
background-color: #dd1b16;
351+
background-color: #E84A5F;
349352
}
350353

351354
.sidebar .nav-list>li:hover:before {
@@ -389,7 +392,6 @@ pre code {
389392
}
390393

391394
.sidebar-item.nav-list>li>.submenu {
392-
border-top: 1px solid;
393395
background-color: #fff;
394396
border-color: #e5e5e5;
395397
list-style: none;

0 commit comments

Comments
 (0)