Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit db7adf7

Browse files
committed
feat(tabs): add CSS to css file
- Add tab specific CSS to separate CSS file Closes #5211
1 parent 79fa363 commit db7adf7

File tree

3 files changed

+50
-51
lines changed

3 files changed

+50
-51
lines changed

Diff for: Gruntfile.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ module.exports = function(grunt) {
251251
css: [],
252252
js: []
253253
};
254-
module.cssFiles.forEach(processCSS.bind(null, styles, true));
254+
module.cssFiles.forEach(processCSS.bind(null, module.name, styles, true));
255255
if (styles.css.length) {
256256
module.css = styles.css.join('\n');
257257
module.cssJs = styles.js.join('\n');
@@ -413,7 +413,7 @@ module.exports = function(grunt) {
413413
* Logic from AngularJS
414414
* https://github.com/angular/angular.js/blob/36831eccd1da37c089f2141a2c073a6db69f3e1d/lib/grunt/utils.js#L121-L145
415415
*/
416-
function processCSS(state, minify, file) {
416+
function processCSS(moduleName, state, minify, file) {
417417
var css = fs.readFileSync(file).toString(),
418418
js;
419419
state.css.push(css);
@@ -433,7 +433,7 @@ module.exports = function(grunt) {
433433
.replace(/\\/g, '\\\\')
434434
.replace(/'/g, "\\'")
435435
.replace(/\r?\n/g, '\\n');
436-
js = `angular.module('ui.bootstrap.carousel').run(function() {!angular.$$csp() && angular.element(document).find('head').prepend('<style type="text/css">${css}</style>'); });`;
436+
js = `angular.module('ui.bootstrap.${moduleName}').run(function() {!angular.$$csp() && angular.element(document).find('head').prepend('<style type="text/css">${css}</style>'); });`;
437437
state.js.push(js);
438438

439439
return state;

Diff for: src/tabs/docs/demo.html

-48
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,4 @@
11
<style type="text/css">
2-
.uib-tab > div {
3-
position: relative;
4-
display: block;
5-
padding: 10px 15px;
6-
outline: 0;
7-
color: #337ab7;
8-
}
9-
.uib-tab > div:focus,
10-
.uib-tab > div:hover {
11-
background-color: #eee;
12-
color: #23527c;
13-
}
14-
.uib-tab.disabled > div {
15-
color: #777;
16-
}
17-
.uib-tab.disabled > div:focus,
18-
.uib-tab.disabled > div:hover {
19-
color: #777;
20-
cursor: not-allowed;
21-
background-color: transparent;
22-
}
23-
.nav-tabs > .uib-tab > div {
24-
margin-right: 2px;
25-
line-height: 1.42857143;
26-
border: 1px solid transparent;
27-
border-radius: 4px 4px 0 0;
28-
}
29-
.nav-tabs > .uib-tab > div:hover {
30-
border-color: #eee #eee #ddd;
31-
}
32-
.nav-tabs > .uib-tab.active > div,
33-
.nav-tabs > .uib-tab.active > div:focus,
34-
.nav-tabs > .uib-tab.active > div:hover {
35-
color: #555;
36-
cursor: default;
37-
background-color: #fff;
38-
border-color: #ddd #ddd transparent #ddd;
39-
}
40-
.nav-pills > .uib-tab > div {
41-
border-radius: 4px;
42-
}
43-
.nav-pills > .uib-tab.active > div,
44-
.nav-pills > .uib-tab.active > div:focus,
45-
.nav-pills > .uib-tab.active > div:hover {
46-
color: #fff;
47-
background-color: #337ab7;
48-
}
49-
502
form.tab-form-demo .tab-pane {
513
margin: 20px 20px;
524
}

Diff for: src/tabs/tabs.css

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
.uib-tab > div {
2+
position: relative;
3+
display: block;
4+
padding: 10px 15px;
5+
outline: 0;
6+
color: #337ab7;
7+
}
8+
.uib-tab > div:focus,
9+
.uib-tab > div:hover {
10+
background-color: #eee;
11+
color: #23527c;
12+
}
13+
.uib-tab.disabled > div {
14+
color: #777;
15+
}
16+
.uib-tab.disabled > div:focus,
17+
.uib-tab.disabled > div:hover {
18+
color: #777;
19+
cursor: not-allowed;
20+
background-color: transparent;
21+
}
22+
.nav-tabs > .uib-tab > div {
23+
margin-right: 2px;
24+
line-height: 1.42857143;
25+
border: 1px solid transparent;
26+
border-radius: 4px 4px 0 0;
27+
}
28+
.nav-tabs > .uib-tab > div:hover {
29+
border-color: #eee #eee #ddd;
30+
}
31+
.nav-tabs > .uib-tab.active > div,
32+
.nav-tabs > .uib-tab.active > div:focus,
33+
.nav-tabs > .uib-tab.active > div:hover {
34+
color: #555;
35+
cursor: default;
36+
background-color: #fff;
37+
border-color: #ddd #ddd transparent #ddd;
38+
}
39+
.nav-pills > .uib-tab > div {
40+
border-radius: 4px;
41+
}
42+
.nav-pills > .uib-tab.active > div,
43+
.nav-pills > .uib-tab.active > div:focus,
44+
.nav-pills > .uib-tab.active > div:hover {
45+
color: #fff;
46+
background-color: #337ab7;
47+
}

0 commit comments

Comments
 (0)