Skip to content

Commit 1316b55

Browse files
author
unknown
committed
Changing tag to 2.2.2;
Exclude video.js from flat-ui.js, use it separately; Exclude docs from bower; Changing examples titles to match Free version;
1 parent 26a3e2a commit 1316b55

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+239
-237
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ module.exports = function (grunt) {
8080
'<%= bower_conf.directory %>/bootstrap-tagsinput/dist/bootstrap-tagsinput.js',
8181
'<%= bower_conf.directory %>/holderjs/holder.js',
8282
'<%= bower_conf.directory %>/typeahead.js/dist/typeahead.bundle.js',
83-
'<%= bower_conf.directory %>/videojs/dist/video-js/video.js',
8483
'<%= bower_conf.directory %>/select2/select2.js',
8584

8685
'js/*.js',
@@ -247,6 +246,7 @@ module.exports = function (grunt) {
247246
'jquery/dist/jquery.min.map',
248247
'respond/dest/respond.min.js',
249248
'html5shiv/dist/html5shiv.js',
249+
'videojs/dist/video-js/video.js',
250250
'videojs/dist/video-js/video-js.swf'
251251
],
252252
dest: 'dist/js/vendor/'

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ To get started, check out [getting started page](http://designmodo.github.io/Fla
99

1010
+ [Demo Page](http://designmodo.github.io/Flat-UI/)
1111
+ [Download PSD](http://designmodo.com/flat-free/) (for designers)
12-
+ [Flat UI Pro 1.3.0](http://designmodo.com/flat/) (from $39)
12+
+ [Flat UI Pro 1.3.2](http://designmodo.com/flat/) (from $39)
1313

1414

1515
## Quick start
1616

1717
Three quick start options are available:
1818

19-
- [Download the latest release](https://github.com/designmodo/Flat-UI/archive/2.2.1.zip).
19+
- [Download the latest release](https://github.com/designmodo/Flat-UI/archive/2.2.2.zip).
2020
- Clone the repo: `git clone https://github.com/designmodo/Flat-UI.git`.
2121
- Install with [Bower](http://bower.io): `bower install flat-ui`.
2222

bower.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flat-ui",
3-
"version": "2.2.1",
3+
"version": "2.2.2",
44
"main": [
55
"less/flat-ui.less",
66
"dist/css/flat-ui.css",
@@ -11,8 +11,7 @@
1111
"dist/fonts/flat-ui-icons-regular.woff"
1212
],
1313
"ignore": [
14-
".*",
15-
"docs"
14+
".*"
1615
],
1716
"devDependencies": {
1817
"jquery": "~1.11.1",
@@ -26,9 +25,11 @@
2625
"typeahead.js": "~0.10.5",
2726
"google-code-prettify": "~1.0.3",
2827
"bootstrap-tagsinput": "~0.4.2",
29-
"videojs": "~4.7.2",
3028
"select2": "~3.5.1"
3129
},
30+
"dependencies": {
31+
"videojs": "~4.7.2"
32+
},
3233
"resolutions": {
3334
"jquery": "~1.11.1"
3435
}

dist/css/flat-ui.css

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/flat-ui.css.map

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

dist/css/flat-ui.min.css

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

dist/fonts/glyphicons/flat-ui-icons-regular.svg

Lines changed: 5 additions & 5 deletions
Loading

dist/fonts/glyphicons/selection.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2063,7 +2063,7 @@
20632063
],
20642064
"height": 1024,
20652065
"metadata": {
2066-
"name": "flat-ui-pro-icons",
2066+
"name": "Flat-UI-Icons",
20672067
"url": "http://designmodo.com/flat",
20682068
"designer": "Sergey Shmidt",
20692069
"designerURL": "http://designmodo.com",
@@ -2076,7 +2076,7 @@
20762076
"fontPref": {
20772077
"prefix": "fui-",
20782078
"metadata": {
2079-
"fontFamily": "flat-ui-pro-icons",
2079+
"fontFamily": "Flat-UI-Icons",
20802080
"majorVersion": 1,
20812081
"minorVersion": 1,
20822082
"fontURL": "http://designmodo.com/flat",

dist/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ <h1>Hello, world!</h1>
2929
<!-- jQuery (necessary for Flat UI's JavaScript plugins) -->
3030
<script src="../dist/js/vendor/jquery.min.js"></script>
3131
<!-- Include all compiled plugins (below), or include individual files as needed -->
32+
<script src="../dist/js/vendor/video.js"></script>
3233
<script src="../dist/js/flat-ui.min.js"></script>
3334

3435
</body>

0 commit comments

Comments
 (0)