Skip to content

Commit

Permalink
fix license file
Browse files Browse the repository at this point in the history
  • Loading branch information
olton committed Jun 20, 2016
2 parents 8a9fabd + 3cfd51c commit 2e19fde
Show file tree
Hide file tree
Showing 98 changed files with 7,267 additions and 12,233 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## 3.0.15
* remove re-init for old browsers
* METRO_AUTO_REINIT now deprecated
* add global methods for show/hide charms (showMetroCharm, hideMetroCharm, toggleMetroCharm)
* fix dropdown closed by document click
* add Number.prototype.format
* fix Metro Icon Font for using with winphone apps
* upd dialog: add runtime setContent* methods
* upd charms: resize closer, add close charm by document click
* upd charms: add position parameter to show charm functions
* upd charms: add function to check charm is open
* additional colors moved to metro-colors.css
* add validator multiple funcs, see validator multi func demo

## 3.0.14
* fix tabcontrol frames overflow
* upd dialog, add utility function showMetroDialog, hideMetroDialog
Expand Down
18 changes: 13 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function(grunt) {
" } else {\n" +
" factory( jQuery );\n"+
" }\n"+
"}(function( jQuery ) { \n'use strict';\n\nvar $ = jQuery;\n\n",
"}(function( jQuery ) { \n'use strict';\n\nvar $ = jQuery;\n\nwindow.METRO_VERSION = '<%= pkg.version %>';\n\n",

clean: {
build: ['build/js', 'build/css', 'build/fonts'],
Expand Down Expand Up @@ -84,6 +84,10 @@ module.exports = function(grunt) {
src: 'less/<%= pkg.name %>-schemes.less',
dest: 'build/css/<%= pkg.name %>-schemes.css'
},
compileColors: {
src: 'less/<%= pkg.name %>-colors.less',
dest: 'build/css/<%= pkg.name %>-colors.css'
},
compileFont: {
src: 'less/<%= pkg.name %>-icons.less',
dest: 'build/css/<%= pkg.name %>-icons.css'
Expand Down Expand Up @@ -116,6 +120,10 @@ module.exports = function(grunt) {
src: 'build/css/<%= pkg.name %>-schemes.css',
dest: 'build/css/<%= pkg.name %>-schemes.min.css'
},
minColors: {
src: 'build/css/<%= pkg.name %>-colors.css',
dest: 'build/css/<%= pkg.name %>-colors.min.css'
},
minFont: {
src: 'build/css/<%= pkg.name %>-icons.css',
dest: 'build/css/<%= pkg.name %>-icons.min.css'
Expand Down Expand Up @@ -144,6 +152,10 @@ module.exports = function(grunt) {
src: 'build/css/<%= pkg.name %>-schemes.css',
dest: 'docs/css/<%= pkg.name %>-schemes.css'
},
docs_css_colors: {
src: 'build/css/<%= pkg.name %>-colors.css',
dest: 'docs/css/<%= pkg.name %>-colors.css'
},
docs_css_font: {
src: 'build/css/<%= pkg.name %>-icons.css',
dest: 'docs/css/<%= pkg.name %>-icons.css'
Expand All @@ -161,10 +173,6 @@ module.exports = function(grunt) {
{
match: 'adsense',
replacement: '<%= grunt.file.read(".replace/google-adsense-block.txt") %>'
},
{
match: 'hit',
replacement: '<%= grunt.file.read(".replace/hit-ua-counter.txt") %>'
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2012-2015 Sergey Pimenov
Copyright (c) 2012-2016 Sergey Pimenov

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
38 changes: 17 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
# Welcome
The front-end framework for developing projects on the web in Windows Metro Style, created and supported by Sergey Pimenov (aka olton) with the massive support and involvement of community.

Metro UI CSS developed with the advice of Microsoft to build the user interface and include: general styles, grid, layouts, typography, 20+ components, 300+ built-in icons. Metro UI CSS build with {LESS}. Metro UI CSS is open source and has MIT licensing model.
The front-end framework for developing projects on the web in Windows Metro Style, created and supported by Sergey Pimenov (aka olton) with the massive support and involvement of community. Metro UI CSS developed with the advice of Microsoft to build the user interface and include: general styles, grid, layouts, typography, 20+ components, 300+ built-in icons. Metro UI CSS build with {LESS}. Metro UI CSS is open source and has MIT licensing model.

## Current Version

### 3.0.14
## Current Version 3.0.15

### Install with bower
bower install metro

##### you can also use short repository of the latest version of metro UI CSS (from Master branch)
bower install metro-dist

This repository contains only main framework files: css, js and font


### Install with npm
npm install metro-dist

metro-dist repository contains only main framework files: css, js and font

### Install with nuget
Install-Package Metro.UI.CSS
Expand All @@ -24,11 +20,11 @@ Install-Package Metro.UI.CSS
#### Master branch
##### CSS

https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro-responsive.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro-schemes.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro-rtl.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro-icons.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro.min.css
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro-responsive.min.css
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro-schemes.min.css
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro-rtl.min.css
https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/css/metro-icons.min.css

##### JS

Expand All @@ -37,11 +33,11 @@ https://cdn.rawgit.com/olton/Metro-UI-CSS/master/build/js/metro.min.js
#### Develop branch
##### CSS

https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro-responsive.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro-schemes.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro-rtl.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro-icons.min.css<br />
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro.min.css
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro-responsive.min.css
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro-schemes.min.css
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro-rtl.min.css
https://cdn.rawgit.com/olton/Metro-UI-CSS/develop/build/css/metro-icons.min.css

##### JS

Expand Down
Loading

0 comments on commit 2e19fde

Please sign in to comment.