Skip to content

Commit 24ee6f1

Browse files
Merge branch '_bump-v3.23.3-local' into master-dist
2 parents a51780b + 7092b6d commit 24ee6f1

13 files changed

+6588
-4187
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "3.23.2",
3+
"version": "3.23.3",
44
"authors": [
55
"Red Hat"
66
],
@@ -43,7 +43,7 @@
4343
"angular-sanitize": "1.3.0 - 1.5.*",
4444
"angular-bootstrap": "0.14.x",
4545
"lodash": "3.x",
46-
"patternfly": "~3.23.2"
46+
"patternfly": "~3.23.3"
4747
},
4848
"devDependencies": {
4949
"angular-mocks": "1.3.0 - 1.5.*",

dist/docs/css/patternfly.css

Lines changed: 141 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6756,15 +6756,15 @@ button.close {
67566756
}
67576757
}
67586758
/*!
6759-
* Font Awesome 4.6.3 by @davegandy - http://fontawesome.io - @fontawesome
6759+
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
67606760
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
67616761
*/
67626762
/* FONT PATH
67636763
* -------------------------- */
67646764
@font-face {
67656765
font-family: 'FontAwesome';
6766-
src: url('../fonts/fontawesome-webfont.eot?v=4.6.3');
6767-
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.3') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.3#fontawesomeregular') format('svg');
6766+
src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
6767+
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
67686768
font-weight: normal;
67696769
font-style: normal;
67706770
}
@@ -8570,6 +8570,7 @@ button.close {
85708570
content: "\f23e";
85718571
}
85728572
.fa-battery-4:before,
8573+
.fa-battery:before,
85738574
.fa-battery-full:before {
85748575
content: "\f240";
85758576
}
@@ -8916,6 +8917,143 @@ button.close {
89168917
.fa-font-awesome:before {
89178918
content: "\f2b4";
89188919
}
8920+
.fa-handshake-o:before {
8921+
content: "\f2b5";
8922+
}
8923+
.fa-envelope-open:before {
8924+
content: "\f2b6";
8925+
}
8926+
.fa-envelope-open-o:before {
8927+
content: "\f2b7";
8928+
}
8929+
.fa-linode:before {
8930+
content: "\f2b8";
8931+
}
8932+
.fa-address-book:before {
8933+
content: "\f2b9";
8934+
}
8935+
.fa-address-book-o:before {
8936+
content: "\f2ba";
8937+
}
8938+
.fa-vcard:before,
8939+
.fa-address-card:before {
8940+
content: "\f2bb";
8941+
}
8942+
.fa-vcard-o:before,
8943+
.fa-address-card-o:before {
8944+
content: "\f2bc";
8945+
}
8946+
.fa-user-circle:before {
8947+
content: "\f2bd";
8948+
}
8949+
.fa-user-circle-o:before {
8950+
content: "\f2be";
8951+
}
8952+
.fa-user-o:before {
8953+
content: "\f2c0";
8954+
}
8955+
.fa-id-badge:before {
8956+
content: "\f2c1";
8957+
}
8958+
.fa-drivers-license:before,
8959+
.fa-id-card:before {
8960+
content: "\f2c2";
8961+
}
8962+
.fa-drivers-license-o:before,
8963+
.fa-id-card-o:before {
8964+
content: "\f2c3";
8965+
}
8966+
.fa-quora:before {
8967+
content: "\f2c4";
8968+
}
8969+
.fa-free-code-camp:before {
8970+
content: "\f2c5";
8971+
}
8972+
.fa-telegram:before {
8973+
content: "\f2c6";
8974+
}
8975+
.fa-thermometer-4:before,
8976+
.fa-thermometer:before,
8977+
.fa-thermometer-full:before {
8978+
content: "\f2c7";
8979+
}
8980+
.fa-thermometer-3:before,
8981+
.fa-thermometer-three-quarters:before {
8982+
content: "\f2c8";
8983+
}
8984+
.fa-thermometer-2:before,
8985+
.fa-thermometer-half:before {
8986+
content: "\f2c9";
8987+
}
8988+
.fa-thermometer-1:before,
8989+
.fa-thermometer-quarter:before {
8990+
content: "\f2ca";
8991+
}
8992+
.fa-thermometer-0:before,
8993+
.fa-thermometer-empty:before {
8994+
content: "\f2cb";
8995+
}
8996+
.fa-shower:before {
8997+
content: "\f2cc";
8998+
}
8999+
.fa-bathtub:before,
9000+
.fa-s15:before,
9001+
.fa-bath:before {
9002+
content: "\f2cd";
9003+
}
9004+
.fa-podcast:before {
9005+
content: "\f2ce";
9006+
}
9007+
.fa-window-maximize:before {
9008+
content: "\f2d0";
9009+
}
9010+
.fa-window-minimize:before {
9011+
content: "\f2d1";
9012+
}
9013+
.fa-window-restore:before {
9014+
content: "\f2d2";
9015+
}
9016+
.fa-times-rectangle:before,
9017+
.fa-window-close:before {
9018+
content: "\f2d3";
9019+
}
9020+
.fa-times-rectangle-o:before,
9021+
.fa-window-close-o:before {
9022+
content: "\f2d4";
9023+
}
9024+
.fa-bandcamp:before {
9025+
content: "\f2d5";
9026+
}
9027+
.fa-grav:before {
9028+
content: "\f2d6";
9029+
}
9030+
.fa-etsy:before {
9031+
content: "\f2d7";
9032+
}
9033+
.fa-imdb:before {
9034+
content: "\f2d8";
9035+
}
9036+
.fa-ravelry:before {
9037+
content: "\f2d9";
9038+
}
9039+
.fa-eercast:before {
9040+
content: "\f2da";
9041+
}
9042+
.fa-microchip:before {
9043+
content: "\f2db";
9044+
}
9045+
.fa-snowflake-o:before {
9046+
content: "\f2dc";
9047+
}
9048+
.fa-superpowers:before {
9049+
content: "\f2dd";
9050+
}
9051+
.fa-wpexplorer:before {
9052+
content: "\f2de";
9053+
}
9054+
.fa-meetup:before {
9055+
content: "\f2e0";
9056+
}
89199057
.sr-only {
89209058
position: absolute;
89219059
width: 1px;

dist/docs/fonts/FontAwesome.otf

9.59 KB
Binary file not shown.
87.1 KB
Binary file not shown.

dist/docs/fonts/fontawesome-webfont.svg

Lines changed: 2668 additions & 682 deletions
Loading
12.5 KB
Binary file not shown.
7.43 KB
Binary file not shown.
5.14 KB
Binary file not shown.

dist/docs/grunt-scripts/bootstrap-treeview.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
checkedIcon: 'glyphicon glyphicon-check',
4343
partiallyCheckedIcon: 'glyphicon glyphicon-expand',
4444
uncheckedIcon: 'glyphicon glyphicon-unchecked',
45+
tagsClass: 'badge',
4546

4647
color: undefined,
4748
backColor: undefined,
@@ -970,6 +971,11 @@
970971
$.each(node.tags, $.proxy(function addTag(id, tag) {
971972
node.$el
972973
.append(this._template.badge.clone()
974+
.addClass(
975+
typeof node.tagsClass[id] === 'string' ?
976+
node.tagsClass[id] :
977+
this._options.tagsClass
978+
)
973979
.append(tag)
974980
);
975981
}, this));
@@ -1153,7 +1159,7 @@
11531159
empty: $('<span class="icon"></span>')
11541160
},
11551161
image: $('<span class="image"></span>'),
1156-
badge: $('<span class="badge"></span>'),
1162+
badge: $('<span></span>'),
11571163
text: $('<span class="text"></span>')
11581164
};
11591165

@@ -1900,6 +1906,9 @@
19001906
$.fn[pluginName] = function (options, args) {
19011907

19021908
var result;
1909+
if (this.length == 0) {
1910+
throw "No element has been found!";
1911+
}
19031912

19041913
this.each(function () {
19051914
var _this = $.data(this, pluginName);

0 commit comments

Comments
 (0)