Skip to content

Commit

Permalink
update version 2.0.1 support bootstrap 3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bootflat committed Apr 3, 2014
1 parent 6c0a796 commit f1a067d
Show file tree
Hide file tree
Showing 15 changed files with 145 additions and 60 deletions.
49 changes: 46 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,21 @@ module.exports = function(grunt) {
grunt.initConfig({
uglify: {
options: {
banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
banner: '/*\n * <%= pkg.name %> <%= pkg.version %>\n' +
' *\n' +
' * Description: <%= pkg.description %>\n' +
' *\n' +
' * Homepage: <%= pkg.homepage %>\n' +
' *\n' +
' * By @<%= pkg.author %>\n' +
' *\n' +
' * Last modify time: <%= grunt.template.today("yyyy-mm-dd") %>\n' +
' *\n' +
' * Licensed under the MIT license. Please see LICENSE for more information.\n' +
' *\n' +
' * Copyright 2013 FLATHEMES.\n' +
' *\n' +
' */\n',
sourceMap: true,
sourceMapIncludeSources: true
},
Expand All @@ -21,7 +35,21 @@ module.exports = function(grunt) {
cssmin: {
options: {
keepSpecialComments: 0,
banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
banner: '/*\n * <%= pkg.name %> <%= pkg.version %>\n' +
' *\n' +
' * Description: <%= pkg.description %>\n' +
' *\n' +
' * Homepage: <%= pkg.homepage %>\n' +
' *\n' +
' * By @<%= pkg.author %>\n' +
' *\n' +
' * Last modify time: <%= grunt.template.today("yyyy-mm-dd") %>\n' +
' *\n' +
' * Licensed under the MIT license. Please see LICENSE for more information.\n' +
' *\n' +
' * Copyright 2013 FLATHEMES.\n' +
' *\n' +
' */\n',
},
dist: {
files: {
Expand All @@ -40,6 +68,21 @@ module.exports = function(grunt) {
'bootflat/css/bootflat.css': 'bootflat/scss/bootflat.scss'
},
options: {
banner: '/*\n * <%= pkg.name %> <%= pkg.version %>\n' +
' *\n' +
' * Description: <%= pkg.description %>\n' +
' *\n' +
' * Homepage: <%= pkg.homepage %>\n' +
' *\n' +
' * By @<%= pkg.author %>\n' +
' *\n' +
' * Last modify time: <%= grunt.template.today("yyyy-mm-dd") %>\n' +
' *\n' +
' * Licensed under the MIT license. Please see LICENSE for more information.\n' +
' *\n' +
' * Copyright 2013 FLATHEMES.\n' +
' *\n' +
' */\n',
style: 'expanded',
sourcemap: 'true'
}
Expand All @@ -55,4 +98,4 @@ module.exports = function(grunt) {
'cssmin',
'uglify'
]);
};
};
13 changes: 7 additions & 6 deletions README.markdown
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
__________ __ _____.__ __
\______ \ ____ _____/ |__/ ____\ | _____ _/ |_
__________ __ _____.__ __
\______ \ ____ _____/ |__/ ____\ | _____ _/ |_
| | _// _ \ / _ \ __\ __\| | \__ \\ __\
| | ( <_> | <_> ) | | | | |__/ __ \| |
|______ /\____/ \____/|__| |__| |____(____ /__|
\/ \/
| | ( <_> | <_> ) | | | | |__/ __ \| |
|______ /\____/ \____/|__| |__| |____(____ /__|
\/ \/

***

Expand Down Expand Up @@ -43,12 +43,13 @@ Install with [bower](http://bower.io/)?

`bower install Bootflat#<version>`

The current version is: `2.0.0`
The current version is: `2.0.1`

The source files are in the `bootflat/` folder. You can just grab the `bootflat/css/`, `bootflat/scss/`,`bootflat/js/` and `bootflat/img/` folders and you'll be good to go.

## Changelog:

2014/4/3 version 2.0.1
2014/3/6 version 2.0.0

## Links:
Expand Down
15 changes: 10 additions & 5 deletions bootflat/css/bootflat.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bootflat/css/bootflat.css.map

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions bootflat/css/bootflat.min.css

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions bootflat/scss/bootflat.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
@charset "UTF-8";

/*
* Copyright 2013 FLATHEMES.
*
* Bootflat, v2.0.0
* A open source Flat UI KIT based on Twitter Bootstrap 3.1.0 css framework.
* http://http://bootflat.github.io/
*
* By @flathemes
*
* Licensed under the MIT license. Please see LICENSE for more information.
*
*/

@import

// Variables, Extends, Mixins
Expand Down
2 changes: 1 addition & 1 deletion css/bootstrap.min.css

Large diffs are not rendered by default.

23 changes: 18 additions & 5 deletions css/site.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions free-psd.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<title>Bootflat UI Kit Free PSD Download - Bootflat</title>
<!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<!-- SmartAddon.com Verification -->
<!-- SmartAddon.com Verification -->
<meta name="smartaddon-verification" content="936e8d43184bc47ef34e25e426c508fe" />
<link rel="shortcut icon" href="favicon_16.ico"/>
<link rel="bookmark" href="favicon_16.ico"/>
<link rel="bookmark" href="favicon_16.ico"/>
<!-- site css -->
<link rel="stylesheet" href="css/site.min.css">
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
Expand Down Expand Up @@ -45,7 +45,7 @@
<!--header-->
<div class="topic">
<div class="container">
<h3>Bootflat UI Kit (Version 2.0.0)</h3>
<h3>Bootflat UI Kit (Version 2.0.1)</h3>
<h4>Bootflat UI Kit is PSD User Interface Pack including a set of beautiful and pure components, which you can use to create startup projects, websites or iOS/Android Apps.</h4>
<a class="btn btn-primary" href="https://github.com/Bootflat/Bootflat.UI.Kit.PSD/archive/master.zip">Download Bootflat UI KIT PSD</a>&nbsp;&nbsp;&nbsp;&nbsp;
<span class="github github-watch">
Expand Down
14 changes: 7 additions & 7 deletions getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<title>Getting Started - Bootflat</title>
<!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<!-- SmartAddon.com Verification -->
<!-- SmartAddon.com Verification -->
<meta name="smartaddon-verification" content="936e8d43184bc47ef34e25e426c508fe" />
<link rel="shortcut icon" href="favicon_16.ico"/>
<link rel="bookmark" href="favicon_16.ico"/>
<link rel="bookmark" href="favicon_16.ico"/>
<!-- site css -->
<link rel="stylesheet" href="css/site.min.css">
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
Expand Down Expand Up @@ -73,8 +73,8 @@ <h3>Overview</h3>
<dl>
<dt>OOCSS Approach</dt>
<dd>Object-based coding method encourages code reuse and creates faster and more efficient style sheets, which are easier to add to and maintain.</dd>
<dt>Bootstrap 3.1.0 Support</dt>
<dd>Now Bootflat is supporting Bootstrap 3.1.0 as well.</dd>
<dt>Bootstrap 3.1.1 Support</dt>
<dd>Now Bootflat is supporting Bootstrap 3.1.1 as well.</dd>
<dt>Configurable Color Scheme</dt>
<dd>You can change any or all of the colors if you wish. Bootflat is easy to configure and match to your brand's color scheme.</dd>
<dt>Easy Installation</dt>
Expand All @@ -89,10 +89,10 @@ <h3>Overview</h3>
<h3>Download</h3>
<p>Download the latest official release of Bootflat and get started!</p>
<ul class="item__infos">
<li>Version 2.0.0</li>
<li>Version 2.0.1</li>
<li>Released December 18th, 2013</li>
</ul>
<p><a class="btn btn-primary" href="https://github.com/bootflat/bootflat.github.io/archive/master.zip">Download Bootflat Framework (v2.0.0)</a></p>
<p><a class="btn btn-primary" href="https://github.com/bootflat/bootflat.github.io/archive/master.zip">Download Bootflat Framework (v2.0.1)</a></p>
<p>You can also <a href="https://github.com/bootflat/bootflat.github.io">clone it on GitHub</a> to get the bleeding edge release. </p>
</div>
<!-- What's included
Expand Down Expand Up @@ -157,7 +157,7 @@ <h3>CSS/SASS</h3>
================================================== -->
<div class="docs-article docs--start" id="browser-support">
<h3>Browser Support</h3>
<p>As such, our browser support tends to be whatever Web View API is available to native on a given platform. For Bootflat v2.0.0, that means UIWebView for E8, IE9, IE10, IE11, Firefox, Safari, Opera, Chrome.</p>
<p>As such, our browser support tends to be whatever Web View API is available to native on a given platform. For Bootflat v2.0.1, that means UIWebView for E8, IE9, IE10, IE11, Firefox, Safari, Opera, Chrome.</p>
</div>
<!-- Free PSD
================================================== -->
Expand Down
22 changes: 11 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<meta charset="utf-8">
<title>Bootflat</title>
<!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<!-- SmartAddon.com Verification -->
<meta name="smartaddon-verification" content="936e8d43184bc47ef34e25e426c508fe" />
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<!-- SmartAddon.com Verification -->
<meta name="smartaddon-verification" content="936e8d43184bc47ef34e25e426c508fe" />
<link rel="shortcut icon" href="favicon_16.ico"/>
<link rel="bookmark" href="favicon_16.ico"/>
<link rel="bookmark" href="favicon_16.ico"/>
<!-- site css -->
<link rel="stylesheet" href="css/site.min.css">
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
Expand Down Expand Up @@ -47,12 +47,12 @@
<h1>
<img src="img/logo-index.png" alt="Bootflat: Advanced HTML5 Hybrid Mobile App Framework">
</h1>
<h2>BOOTFLAT is an open source Flat UI KIT based on Bootstrap 3.1.0 CSS framework. <br/>And, for the designers, we offer a <a href="free-psd.html">free PSD Download</a>. <br />It provides a faster, easier and less repetitive way for web developers or designers to create elegant web apps. </h2>
<h2>BOOTFLAT is an open source Flat UI KIT based on Bootstrap 3.1.1 CSS framework. <br/>And, for the designers, we offer a <a href="free-psd.html">free PSD Download</a>. <br />It provides a faster, easier and less repetitive way for web developers or designers to create elegant web apps. </h2>
<h3>Compatible Browsers: IE8, IE9, IE10, IE11, Firefox, Safari, Opera, Chrome.</h3>
<p class="download-link">
<a class="btn btn-primary" href="https://github.com/Bootflat/Bootflat.github.io/archive/master.zip">Download (Version 2.0.0)</a>
<a class="btn btn-primary" href="https://github.com/Bootflat/Bootflat.github.io/archive/master.zip">Download (Version 2.0.1)</a>
</p>
<p class="version-text">MIT Licensed - Version 2.0.0</p>
<p class="version-text">MIT Licensed - Version 2.0.1</p>
<p class="learn-more Bootflat">
<a href="#learn-more">Learn more <i class="icon" data-icon="&#xe035"></i></a>
</p>
Expand Down Expand Up @@ -82,14 +82,14 @@ <h3>Designed for everyone, everywhere.</h3>
<div class="row">
<div class="col-md-6">
<div class="features__photo"><img src="img/feature-bootstrap.png" /></div>
<h4>Bootstrap 3.1.0</h4>
<p>Bootflat is built on Bootstrap 3.1.0: the sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
<h4>Bootstrap 3.1.1</h4>
<p>Bootflat is built on Bootstrap 3.1.1: the sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
</div>
<div class="col-md-6">
<div class="features__photo"><img src="img/feature-css.png" /></div>
<h4>HTML5 &amp; CSS3</h4>
<p>Bootflat's components are built with HTML5 and CSS3. The pages use `header`, `nav` and `section` to build the layout. Bootflat also comes with several splendid color schemes built-in, and allows for easy customization.</p>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
Expand Down Expand Up @@ -178,7 +178,7 @@ <h3 style="margin-bottom: 15px;">Newsletter</h3>
</div>
</div>
</div>

</div>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap.min.js

Large diffs are not rendered by default.

20 changes: 19 additions & 1 deletion js/site.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions js/site.min.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "Bootflat",
"private": false,
"version": "2.0.0",
"version": "2.0.1",
"description": "BOOTFLAT is an open source Flat UI KIT based on Bootstrap 3.1.0 CSS framework. It provides a faster, easier and less repetitive way for web developers to create elegant web apps.",
"author":"Flathemes",
"author":"Flathemes <info@flathemes.com>",
"homepage": "http://bootflat.github.com/",
"keywords": [
"bootstrap",
Expand All @@ -27,4 +27,4 @@
"grunt-contrib-sass": "~0.7.3",
"load-grunt-tasks": "~0.2.0"
}
}
}

0 comments on commit f1a067d

Please sign in to comment.