Skip to content
This repository has been archived by the owner on Mar 27, 2023. It is now read-only.

Commit

Permalink
RELEASE: 0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
shenlq committed Aug 30, 2016
1 parent 44357a6 commit 1cb9783
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 33 deletions.
12 changes: 6 additions & 6 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.Upload = exports.Container = exports.Split = exports.Alert = exports.InlineSelect = exports.Calendar = exports.Loading = exports.Timeline = exports.DatePicker = exports.Notification = exports.Message = exports.Dropdown = exports.Popover = exports.Tooltip = exports.Confirm = exports.Modal = exports.Progress = exports.Breadcrumb = exports.ListGroup = exports.Sidebar = exports.Navbar = exports.Nav = exports.Form = exports.InputGroup = exports.Input = exports.Select = exports.Switch = exports.RadioGroup = exports.Radio = exports.CheckboxGroup = exports.Checkbox = exports.Pagination = exports.Badge = exports.Tag = exports.Attention = exports.Image = exports.ButtonToolbar = exports.ButtonGroup = exports.Button = exports.Icon = exports.Content = exports.Square = exports.Card = exports.Col = exports.Row = exports.Flex = undefined;
exports.Upload = exports.Container = exports.Split = exports.Alert = exports.InlineSelect = exports.Calendar = exports.Loading = exports.Timeline = exports.DatePicker = exports.Collapse = exports.Notification = exports.Message = exports.Dropdown = exports.Popover = exports.Tooltip = exports.Confirm = exports.Modal = exports.Progress = exports.Breadcrumb = exports.ListGroup = exports.Sidebar = exports.Navbar = exports.Nav = exports.Form = exports.InputGroup = exports.Input = exports.Select = exports.Switch = exports.RadioGroup = exports.Radio = exports.CheckboxGroup = exports.Checkbox = exports.Pagination = exports.Badge = exports.Tag = exports.Attention = exports.Image = exports.ButtonToolbar = exports.ButtonGroup = exports.Button = exports.Icon = exports.Content = exports.Card = exports.Col = exports.Row = exports.Flex = undefined;

var _Flex2 = require('./components/Flex');

Expand All @@ -21,10 +21,6 @@ var _Card2 = require('./components/Card');

var _Card3 = _interopRequireDefault(_Card2);

var _Square2 = require('./components/Square');

var _Square3 = _interopRequireDefault(_Square2);

var _Content2 = require('./components/Content');

var _Content3 = _interopRequireDefault(_Content2);
Expand Down Expand Up @@ -153,6 +149,10 @@ var _Notification2 = require('./components/Notification');

var _Notification3 = _interopRequireDefault(_Notification2);

var _Collapse2 = require('./components/Collapse');

var _Collapse3 = _interopRequireDefault(_Collapse2);

var _DatePicker2 = require('./components/DatePicker');

var _DatePicker3 = _interopRequireDefault(_DatePicker2);
Expand Down Expand Up @@ -195,7 +195,6 @@ exports.Flex = _Flex3.default;
exports.Row = _Row3.default;
exports.Col = _Col3.default;
exports.Card = _Card3.default;
exports.Square = _Square3.default;
exports.Content = _Content3.default;
exports.Icon = _Icon3.default;
exports.Button = _Button3.default;
Expand Down Expand Up @@ -228,6 +227,7 @@ exports.Popover = _Popover3.default;
exports.Dropdown = _Dropdown3.default;
exports.Message = _Message3.default;
exports.Notification = _Notification3.default;
exports.Collapse = _Collapse3.default;
exports.DatePicker = _DatePicker3.default;
exports.Timeline = _Timeline3.default;
exports.Loading = _Loading3.default;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "impression-react",
"version": "0.3.0",
"version": "0.4.0",
"author": "peter.shenlq",
"description": "An enterprise-class UI design language and React-based implementation.",
"main": "./lib/index.js",
Expand Down
1 change: 1 addition & 0 deletions site/src/styles/impression/mixins/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
border-color: $input-border-focus;
outline: none;
box-shadow: $input-box-focus-shadow;

&::placeholder {
opacity: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion site/src/styles/impression/mixins/_tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

&[href] {
&:hover,
&:focus{
&:focus {
background-color: darken($color, 10%);
}
}
Expand Down
2 changes: 1 addition & 1 deletion site/src/styles/impression/modules/_animation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}

.zoom-slide-leave,
.zoom-slide-enter{
.zoom-slide-enter {
position: absolute;
left: 0;
top: 0;
Expand Down
1 change: 1 addition & 0 deletions src/styles/mixins/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
border-color: $input-border-focus;
outline: none;
box-shadow: $input-box-focus-shadow;

&::placeholder {
opacity: 0;
}
Expand Down
45 changes: 23 additions & 22 deletions src/styles/mixins/_perfect-scrollbar.scss
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
@mixin scrollbar-rail-default($theme) {
display: none;
position: absolute; /* please don't change 'position' */
opacity: map_get($theme, rail-default-opacity);
position: absolute;
opacity: map-get($theme, rail-default-opacity);
transition: background-color .2s linear, opacity .2s linear;
}

@mixin scrollbar-rail-hover($theme) {
background-color: map_get($theme, rail-hover-bg);
opacity: map_get($theme, rail-hover-opacity);
background-color: map-get($theme, rail-hover-bg);
opacity: map-get($theme, rail-hover-opacity);
}

@mixin scrollbar-default($theme) {
position: absolute; /* please don't change 'position' */
background-color: map_get($theme, bar-container-hover-bg);
border-radius: map_get($theme, border-radius);
position: absolute;
background-color: map-get($theme, bar-container-hover-bg);
border-radius: map-get($theme, border-radius);
transition: background-color .2s linear, height .2s linear, width .2s ease-in-out,
border-radius .2s ease-in-out;
}

@mixin scrollbar-hover($theme) {
background-color: map_get($theme, bar-hover-bg);
background-color: map-get($theme, bar-hover-bg);
}

@mixin in-scrolling($theme) {
&.ps-in-scrolling {
pointer-events: none;

&.ps-x > .ps-scrollbar-x-rail {
@include scrollbar-rail-hover($theme);
> .ps-scrollbar-x {
Expand All @@ -34,7 +35,8 @@

&.ps-y > .ps-scrollbar-y-rail {
@include scrollbar-rail-hover($theme);
> .ps-scrollbar-y {

> .ps-scrollbar-y {
@include scrollbar-hover($theme);
}
}
Expand All @@ -44,7 +46,6 @@
// Layout and theme mixin
@mixin ps-container($theme) {
position: relative;
-ms-touch-action: none;
touch-action: none;
overflow: hidden !important;
-ms-overflow-style: none;
Expand All @@ -61,45 +62,45 @@
&.ps-active-x > .ps-scrollbar-x-rail,
&.ps-active-y > .ps-scrollbar-y-rail {
display: block;
background-color: map_get($theme, bar-bg);
background-color: map-get($theme, bar-bg);
}

@include in-scrolling($theme);

> .ps-scrollbar-x-rail {
@include scrollbar-rail-default($theme);
bottom: map_get($theme, scrollbar-x-rail-bottom); /* there must be 'bottom' for ps-scrollbar-x-rail */
height: map_get($theme, scrollbar-x-rail-height);
bottom: map-get($theme, scrollbar-x-rail-bottom);
height: map-get($theme, scrollbar-x-rail-height);

> .ps-scrollbar-x {
@include scrollbar-default($theme);
bottom: map_get($theme, scrollbar-x-bottom); /* there must be 'bottom' for ps-scrollbar-x */
height: map_get($theme, scrollbar-x-height);
bottom: map-get($theme, scrollbar-x-bottom);
height: map-get($theme, scrollbar-x-height);
}

&:hover,
&:active {
> .ps-scrollbar-x {
height: map_get($theme, scrollbar-x-hover-height);
height: map-get($theme, scrollbar-x-hover-height);
}
}
}

> .ps-scrollbar-y-rail {
@include scrollbar-rail-default($theme);
right: map_get($theme, scrollbar-y-rail-right); /* there must be 'right' for ps-scrollbar-y-rail */
width: map_get($theme, scrollbar-y-rail-width);
right: map-get($theme, scrollbar-y-rail-right);
width: map-get($theme, scrollbar-y-rail-width);

> .ps-scrollbar-y {
@include scrollbar-default($theme);
right: map_get($theme, scrollbar-y-right); /* there must be 'right' for ps-scrollbar-y */
width: map_get($theme, scrollbar-y-width);
right: map-get($theme, scrollbar-y-right);
width: map-get($theme, scrollbar-y-width);
}

&:hover,
&:active {
> .ps-scrollbar-y {
width: map_get($theme, scrollbar-y-hover-width);
width: map-get($theme, scrollbar-y-hover-width);
}
}
}
Expand All @@ -109,7 +110,7 @@

> .ps-scrollbar-x-rail,
> .ps-scrollbar-y-rail {
opacity: map_get($theme, rail-container-hover-opacity);
opacity: map-get($theme, rail-container-hover-opacity);
}

> .ps-scrollbar-x-rail:hover {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/mixins/_tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

&[href] {
&:hover,
&:focus{
&:focus {
background-color: darken($color, 10%);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/styles/modules/_animation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}

.zoom-slide-leave,
.zoom-slide-enter{
.zoom-slide-enter {
position: absolute;
left: 0;
top: 0;
Expand Down

0 comments on commit 1cb9783

Please sign in to comment.