From 2e27f9f50b408b3cdbeba071fce95e5f18c27dad Mon Sep 17 00:00:00 2001 From: jlukic Date: Fri, 9 May 2014 14:26:16 -0400 Subject: [PATCH] Adds tiny size, updates loaders --- src/definitions/elements/button.less | 4 +--- src/definitions/elements/label.less | 8 +++++++- src/definitions/elements/loader.less | 10 +++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index 3c40194d0..2aa97ec5d 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -50,7 +50,6 @@ background-image: @backgroundImage; border-radius: @borderRadius; box-shadow: @boxShadow; - border: @border; user-select: none; box-sizing: border-box; @@ -481,7 +480,7 @@ /* VK */ .ui.vk.button { - background-color: @vkColor; + background-color: #4D7198; color: @white; background-image: @coloredBackgroundImage; box-shadow: @coloredBoxShadow; @@ -758,7 +757,6 @@ padding-top: (@verticalPadding + @basicIconOffset); background-color: @labeledIconBackgroundColor; text-align: center; - color: @labeledIconColor; border-radius: @borderRadius 0px 0px @borderRadius; line-height: 1; diff --git a/src/definitions/elements/label.less b/src/definitions/elements/label.less index 23cd5498a..28f1bd98f 100755 --- a/src/definitions/elements/label.less +++ b/src/definitions/elements/label.less @@ -25,7 +25,7 @@ .ui.label { display: inline-block; - vertical-align: middle; + vertical-align: @verticalAlign; line-height: 1; margin: @verticalMargin @horizontalMargin; @@ -893,10 +893,16 @@ a.ui.yellow.label:hover:before { Sizes --------------------*/ + +.ui.tiny.labels .label, +.ui.tiny.label { +font-size: @tiny; +} .ui.small.labels .label, .ui.small.label { font-size: @small; } +.ui.labels .label, .ui.label { font-size: @medium; } diff --git a/src/definitions/elements/loader.less b/src/definitions/elements/loader.less index c4962bda7..f7361ecdf 100755 --- a/src/definitions/elements/loader.less +++ b/src/definitions/elements/loader.less @@ -64,7 +64,7 @@ margin: 0em auto 1em; color: transparent; box-shadow: 0px 0px 0px 1px; - animation: loaderFlipping 1s infinite ease-in-out; + animation: loaderFlipping 1s infinite ease; margin-bottom: 1em; transform-style: preserve-3d; } @@ -78,12 +78,12 @@ backface-visibility: hidden; } .ui.flipping.loader .shape:before { - background-color: @blue; + background-color: @primaryColor; transform: rotateY(0deg); z-index: 2; } .ui.flipping.loader .shape:after { - background-color: @red; + background-color: @secondaryColor; transform: rotateY(180deg); } @@ -114,10 +114,10 @@ transform: perspective(6em) rotateX(0deg) rotateY(0deg); } 50% { - transform: perspective(6em) rotateX(-180deg) rotateY(0deg); + transform: perspective(6em) rotateX(0deg) rotateY(-180deg); } 100% { - transform: perspective(6em) rotateX(-180deg) rotateY(-180deg); + transform: perspective(6em) rotateX(0deg) rotateY(-360deg); } }