Hopiu/vue-material
1
0
Fork 0
mirror of https://github.com/Hopiu/vue-material.git synced 2026-05-01 12:04:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into components/mdMenu

Browse source 
* origin/develop:
  Generate v0.2.0 documentation
  Fix docs
  Improve detection of card lightness
  Fix height of buttons inside card actions
This commit is contained in:
Marcos Moura 2016-10-24 19:44:20 -02:00
commit 76196256bf
13 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -31,8 +31,8 @@ import 'vue-material/dist/vue-material.css'
// OR
var Vue = require(vue')
var VueMaterial = require(vue-material')
var Vue = require('vue')
var VueMaterial = require('vue-material')
require('vue-material/dist/vue-material.css')
```

2
dist/components/mdCard/index.css vendored
View file

File diff suppressed because one or more lines are too long

2
dist/components/mdCard/index.js vendored
View file

File diff suppressed because one or more lines are too long

1
dist/docs/docs.0bf64502.css vendored
View file

File diff suppressed because one or more lines are too long

6
dist/docs/docs.d14813cb.js → dist/docs/docs.16e61835.js vendored
View file

File diff suppressed because one or more lines are too long

1
dist/docs/docs.5b3faad6.css vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
dist/docs/index.html vendored
View file

@ -1 +1 @@
<!DOCTYPE html><html lang=en-us><meta charset=utf-8><meta http-equiv=cleartype content=on><meta name=viewport content="width=device-width,initial-scale=1,minimal-ui"><meta name=mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><meta name=apple-mobile-web-app-title content="Vue Material"><meta name=application-name content="Vue Material"><meta name=description content="Material Design for Vue"><meta name=msapplication-config content=assets/favicon/browserconfig.xml><meta name=theme-color content=#2196f3><link rel=apple-touch-icon sizes=180x180 href=assets/favicon/apple-touch-icon.png><link rel=icon type=image/png href=assets/favicon/favicon-32x32.png sizes=32x32><link rel=icon type=image/png href=assets/favicon/favicon-194x194.png sizes=194x194><link rel=icon type=image/png href=assets/favicon/android-chrome-192x192.png sizes=192x192><link rel=icon type=image/png href=assets/favicon/favicon-16x16.png sizes=16x16><link rel=manifest href=assets/favicon/manifest.json><link rel=mask-icon href=assets/favicon/safari-pinned-tab.svg color=#2196f3><link rel="shortcut icon" href=assets/favicon/favicon.ico><title>Vue Material</title><link rel=stylesheet href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic"><link rel=stylesheet href="//fonts.googleapis.com/icon?family=Material+Icons"><link href=docs.0bf64502.css rel=stylesheet><div id=app v-cloak><docs></docs></div><script>!function(e,t,a,n,c,o,s){e.GoogleAnalyticsObject=c,e[c]=e[c]||function(){(e[c].q=e[c].q||[]).push(arguments)},e[c].l=1*new Date,o=t.createElement(a),s=t.getElementsByTagName(a)[0],o.async=1,o.src=n,s.parentNode.insertBefore(o,s)}(window,document,"script","https://www.google-analytics.com/analytics.js","ga"),ga("create","UA-85823257-1","auto"),ga("send","pageview")</script><script src=manifest.e4aa159f.js></script><script src=vendor.e97d79b1.js></script><script src=docs.d14813cb.js></script>
<!DOCTYPE html><html lang=en-us><meta charset=utf-8><meta http-equiv=cleartype content=on><meta name=viewport content="width=device-width,initial-scale=1,minimal-ui"><meta name=mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><meta name=apple-mobile-web-app-title content="Vue Material"><meta name=application-name content="Vue Material"><meta name=description content="Material Design for Vue"><meta name=msapplication-config content=assets/favicon/browserconfig.xml><meta name=theme-color content=#2196f3><link rel=apple-touch-icon sizes=180x180 href=assets/favicon/apple-touch-icon.png><link rel=icon type=image/png href=assets/favicon/favicon-32x32.png sizes=32x32><link rel=icon type=image/png href=assets/favicon/favicon-194x194.png sizes=194x194><link rel=icon type=image/png href=assets/favicon/android-chrome-192x192.png sizes=192x192><link rel=icon type=image/png href=assets/favicon/favicon-16x16.png sizes=16x16><link rel=manifest href=assets/favicon/manifest.json><link rel=mask-icon href=assets/favicon/safari-pinned-tab.svg color=#2196f3><link rel="shortcut icon" href=assets/favicon/favicon.ico><title>Vue Material</title><link rel=stylesheet href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic"><link rel=stylesheet href="//fonts.googleapis.com/icon?family=Material+Icons"><link href=docs.5b3faad6.css rel=stylesheet><div id=app v-cloak><docs></docs></div><script>!function(e,t,a,n,c,o,s){e.GoogleAnalyticsObject=c,e[c]=e[c]||function(){(e[c].q=e[c].q||[]).push(arguments)},e[c].l=1*new Date,o=t.createElement(a),s=t.getElementsByTagName(a)[0],o.async=1,o.src=n,s.parentNode.insertBefore(o,s)}(window,document,"script","https://www.google-analytics.com/analytics.js","ga"),ga("create","UA-85823257-1","auto"),ga("send","pageview")</script><script src=manifest.37ca7607.js></script><script src=vendor.e97d79b1.js></script><script src=docs.16e61835.js></script>

2
dist/docs/manifest.e4aa159f.js → dist/docs/manifest.37ca7607.js vendored
View file

@ -1 +1 @@
!function(e){function t(n){if(r[n])return r[n].exports;var a=r[n]={exports:{},id:n,loaded:!1};return e[n].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n=window.webpackJsonp;window.webpackJsonp=function(o,p){for(var c,l,s=0,i=[];s<o.length;s++)l=o[s],a[l]&&i.push.apply(i,a[l]),a[l]=0;for(c in p)e[c]=p[c];for(n&&n(o,p);i.length;)i.shift().call(null,t);if(p[0])return r[0]=0,t(0)};var r={},a={0:0};t.e=function(e,n){if(0===a[e])return n.call(null,t);if(void 0!==a[e])a[e].push(n);else{a[e]=[n];var r=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.src=t.p+""+e+"."+{1:"d14813cb",2:"e97d79b1"}[e]+".js",r.appendChild(o)}},t.m=e,t.c=r,t.p=""}([]);
!function(e){function t(n){if(r[n])return r[n].exports;var a=r[n]={exports:{},id:n,loaded:!1};return e[n].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n=window.webpackJsonp;window.webpackJsonp=function(o,p){for(var l,c,s=0,i=[];s<o.length;s++)c=o[s],a[c]&&i.push.apply(i,a[c]),a[c]=0;for(l in p)e[l]=p[l];for(n&&n(o,p);i.length;)i.shift().call(null,t);if(p[0])return r[0]=0,t(0)};var r={},a={0:0};t.e=function(e,n){if(0===a[e])return n.call(null,t);if(void 0!==a[e])a[e].push(n);else{a[e]=[n];var r=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.src=t.p+""+e+"."+{1:"16e61835",2:"e97d79b1"}[e]+".js",r.appendChild(o)}},t.m=e,t.c=r,t.p=""}([]);

2
dist/vue-material.css vendored
View file

File diff suppressed because one or more lines are too long

2
dist/vue-material.js vendored
View file

File diff suppressed because one or more lines are too long

4
docs/src/pages/GettingStarted.vue
View file

@ -27,8 +27,8 @@ import 'vue-material/dist/vue-material.css'
<md-tab md-label="AMD">
<code-block lang="javascript">
var Vue = require(vue')
var VueMaterial = require(vue-material')
var Vue = require('vue')
var VueMaterial = require('vue-material')
require('vue-material/dist/vue-material.css')
</code-block>
</md-tab>

1
src/components/mdCard/mdCard.scss
View file

@ -186,6 +186,7 @@ $card-radius: 2px;
padding: 8px;
display: flex;
justify-content: flex-end;
align-items: center;
.md-button {
margin: 0;

10
src/components/mdCard/mdCardMediaCover.vue
View file

@ -84,16 +84,16 @@
if (image && (this.mdTextScrim || this.mdSolid)) {
getImageAlpha(image, (lightness) => {
let limit = 256;
let darkness = Math.abs(limit - lightness) * 100 / limit;
let darkness = (Math.abs(limit - lightness) * 100 / limit + 15) / 100;
if (darkness > 30) {
darkness = 30;
if (darkness >= 0.7) {
darkness = 0.7;
}
if (this.mdTextScrim) {
this.applyScrimColor((darkness + 35) / 100);
this.applyScrimColor(darkness);
} else if (this.mdSolid) {
this.applySolidColor((darkness + 30) / 100);
this.applySolidColor(darkness);
}
});
}