forgetest1
/
tinper-bee-core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/tinper-bee/tinper-bee-core

This commit is contained in:
Boyuzhou 2016-11-25 09:19:16 +08:00
parent 813e57dc48 c0648b7e76
commit b20199d533
6 changed files with 75 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
scss/minxin-mixins.scss
View File

@ -349,7 +349,6 @@
&:hover,
&:focus {
color: $color;
// background-color: darken($bg, 10%);
}
}
}
@ -419,20 +418,15 @@
}
//progress
@mixin progress-styles-variant($color,$color-opacity) {
.auxbar{
background:none;
background-color: $color-opacity;
}
.bufferbar{
background:none;
background-color: $color-opacity;
}
.progressbar{
background-color: $color;
}
@mixin progress-styles-variant($bg-color) {
background-color: $bg-color;
}
//alert
@mixin alert-styles-variant($bg-color,$text-color) {
background-color: $bg-color;
border-color: $bg-color;
color: $text-color;
}
//checkbox
@ -450,29 +444,8 @@
}
//switch colors
@mixin switch-styles-variant($color){
&.is-checked{
.u-switch-track{
background: $color;
border: 1px solid $color;
}
}
}
//switch size
@mixin switch-size($width, $height, $border-radius, $border-left) {
.u-switch-track{
width:$width;
height:$height;
border-radius:$border-radius;
}
.u-switch-thumb{
width:$height;
height:$height;
}
&.is-checked{
.u-switch-thumb{
left:$border-left;
}
}
background: $color;
border: 1px solid $color;
}
//tooltips

68
scss/minxin-variables.scss
View File

@ -26,7 +26,7 @@ $color-text: $palette-grey-900 !default;
//不明所以 $primary-color: unquote("rgba(#{$palette-grey-500}, 0.20)") !default;
// -- Fonts
// -- Fonts 字体大小权重预定义
$preferred-font: 'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei',sans-serif !default;
$font-size: 1.6 * $unit !default;
$font-size-tiny: 1.2 * $unit !default;
@ -37,7 +37,7 @@ $font-weight-thin: 300 !default;
$font-weight-normal: 400 !default;
$font-weight-semi-bold: 500 !default;
$font-weight-bold: 700 !default;
$font-color:unquote("rgb(#{$palette-u-gray-A100})") !default;
$font-color:unquote("rgb(#{$palette-u-gray-A100})") f!default;
$font-weight-override: false;
@ -163,6 +163,11 @@ $brand-warning: unquote("rgb(#{$palette-orange-500})") !default;
$brand-warning-hover: unquote("rgb(#{$palette-orange-400})") !default;
$brand-warning-active: unquote("rgb(#{$palette-orange-600})") !default;
$brand-news: unquote("rgb(#{$palette-indigo-700})") !default;
$brand-news-hover: unquote("rgb(#{$palette-indigo-600})") !default;
$brand-news-active: unquote("rgb(#{$palette-indigo-800})") !default;
$brand-danger: unquote("rgb(#{$palette-red-500})") !default;
$brand-danger-hover: unquote("rgb(#{$palette-red-400})") !default;
$brand-danger-active: unquote("rgb(#{$palette-red-600})") !default;
@ -171,6 +176,20 @@ $brand-dark: $gray-darker;
$brand-dark-hover: $gray-dark;
$brand-dark-active:$gray-darkest;
$brand-light-primary : unquote("rgb(#{$palette-indigo-100})") !default;
$brand-light-success: unquote("rgb(#{$palette-green-100})") !default;
$brand-light-info: unquote("rgb(#{$palette-cyan-100})") !default;
$brand-light-warning: unquote("rgb(#{$palette-orange-100})") !default;
$brand-light-news: unquote("rgb(#{$palette-indigo-100})") !default;
$brand-light-danger: unquote("rgb(#{$palette-red-100})") !default;
/* 不同背景下对应的文字颜色 */
$color-news: unquote("rgb(#{$palette-indigo-500})") !default;
$color-success: unquote("rgb(#{$palette-green-500})") !default;
$color-info: unquote("rgb(#{$palette-cyan-500})") !default;
$color-warning: unquote("rgb(#{$palette-orange-500})") !default;
$color-danger: unquote("rgb(#{$palette-red-500})") !default;
/* UButton */
@ -415,30 +434,6 @@ $container-large-desktop: (1140px + $grid-gutter-width);
$container-lg: $container-large-desktop;
//$grid-desktop-columns: 12 !default;
//$grid-desktop-gutter: 16px !default;
//$grid-desktop-margin: 16px !default;
//
//$grid-desktop-breakpoint: 840px !default;
//
//$grid-large-desktop-breakpoint: 1200px !default;
//
//$grid-large-desktop-columns: $grid-desktop-columns !default;
//$grid-large-desktop-gutter: $grid-desktop-gutter !default;
//$grid-large-desktop-margin: $grid-desktop-margin !default;
//
//$grid-tablet-columns: 8 !default;
//$grid-tablet-gutter: $grid-desktop-gutter !default;
//$grid-tablet-margin: $grid-desktop-margin !default;
//
//$grid-tablet-breakpoint: 480px !default;
//
//$grid-phone-columns: 4 !default;
//$grid-phone-gutter: $grid-desktop-gutter !default;
//$grid-phone-margin: $grid-desktop-margin !default;
//
//$grid-cell-default-columns: $grid-phone-columns !default;
//$grid-max-columns: $grid-desktop-columns !default;
/* menu */
@ -458,8 +453,27 @@ $default-item-divider-color: unquote("rgba(#{$color-black}, 0.12)") !default;
// Disabled Button Colors
$disabled-item-text-color: unquote("rgb(#{$palette-grey-400})") !default;
/* Alert */
$alert-news-bg: $brand-light-news;
$alert-success-bg: $brand-light-success;
$alert-info-bg: $brand-light-info;
$alert-warning-bg: $brand-light-warning;
$alert-danger-bg: $brand-light-danger;
/* CHECKBOX */
$alert-dark-news-bg: $brand-news;
$alert-dark-success-bg: $brand-success;
$alert-dark-info-bg: $brand-info;
$alert-dark-warning-bg: $brand-warning;
$alert-dark-danger-bg: $brand-danger;
$alert-news-color: $color-news;
$alert-success-color: $color-success;
$alert-info-color: $color-info;
$alert-warning-color: $color-warning;
$alert-danger-color: $color-danger;
/* Checkbox */
$checkbox-color: unquote("rgb(#{$color-primary})") !default;
$checkbox-off-color: unquote("rgb(#{$palette-u-gray-600})") !default;

17
scss/set-global.scss
View File

@ -21,23 +21,6 @@ i.uf{
}
// 边框
.u-border-top{
border-top:1px solid unquote("rgb(#{$palette-u-gray-100})");
}
.u-border-left{
border-left:1px solid unquote("rgb(#{$palette-u-gray-100})");
}
.u-border-right{
border-right:1px solid unquote("rgb(#{$palette-u-gray-100})");
}
.u-border-bottom{
border-bottom:1px solid unquote("rgb(#{$palette-u-gray-100})");
}
/*
* 选择时删除文本阴影，及设置默认选中颜色
*/

7
scss/set-normalize.scss
View File

@ -1,3 +1,10 @@
/*
* 保护有用的浏览器默认样式而不是完全去掉它们
* 一般化的样式：为大部分HTML元素提供
* 修复浏览器自身的bug并保证各浏览器的一致性
* 优化CSS可用性：用一些小技巧
* 解释代码：用注释和详细的文档来
*/
//使html占用整个屏幕然后设置触摸操作，以避免触摸延迟在移动IE

44
scss/util-ripple.scss
View File

@ -1,44 +0,0 @@
@import "minxin-variables";
.u-ripple {
background : $ripple-bg-color;
border-radius : 50%;
height : 50px;
left : 0;
filter: alpha(opacity=0);
opacity : 0;
filter: alpha(opacity=0) \9;
display:none \9;
pointer-events : none;
position : absolute;
top : 0;
transform : translate(-50%, -50%);
width : 50px;
overflow : hidden;
&.is-animating {
transition: transform 0.8s $animation-curve-linear-out-slow-in,
width 0.8s $animation-curve-linear-out-slow-in,
height 0.8s $animation-curve-linear-out-slow-in,
opacity 0.8s $animation-curve-linear-out-slow-in;
}
&.is-visible {
opacity: 0.3;
}
&.oldIE{
background:none;
}
}
.u-ripple-container {
display: block;
height: 100%;
left: 0rem;
position: absolute;
top: 0rem;
width: 100%;
z-index: 0;
overflow: hidden;
}

17
scss/util-utilities.scss
View File

@ -1662,3 +1662,20 @@
.u-link:focus, .u-link:hover {
text-decoration: underline;
}
// 边框
.u-border-top{
border-top:1px solid unquote("rgb(#{$palette-u-gray-100})");
}
.u-border-left{
border-left:1px solid unquote("rgb(#{$palette-u-gray-100})");
}
.u-border-right{
border-right:1px solid unquote("rgb(#{$palette-u-gray-100})");
}
.u-border-bottom{
border-bottom:1px solid unquote("rgb(#{$palette-u-gray-100})");
}