Skip to content

Commit

Permalink
Merge pull request #97 from luqin/css
Browse files Browse the repository at this point in the history
change css, add react-bootstrap-table-all.css
  • Loading branch information
AllenFang committed Oct 24, 2015
2 parents a3a7b0c + de3292c commit 06defe2
Show file tree
Hide file tree
Showing 19 changed files with 234 additions and 85 deletions.
153 changes: 153 additions & 0 deletions css/react-bootstrap-table-all.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
/*editor error animate*/
/*@import "~toastr/build/toastr.min.css";*/
@import "https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css";

.react-bs-table{
margin-bottom: 37px;
}
.react-bs-table .table-header{
height: 42px;
border-top-width: 1px;
border-top-style: solid;
border-top-color: rgb(221, 221, 221);
border-bottom-width: 0px;
border-bottom-style: solid;
border-bottom-color: rgb(221, 221, 221);
border-right-width: 1px;
border-right-style: inset;
border-right-color: rgb(221, 221, 221);
}

.react-bs-table .table-header > table{
table-layout: fixed;
border-top-style: hidden;
border-right-style: hidden;
}

.react-bs-table .table-header > table > thead > tr{
border-bottom-style: hidden;
}

.react-bs-table .table-header > table > thead > tr > th .table-header-column{
line-height: 25px
}

.react-bs-table .table-header > table > thead > tr > .sort-column{
cursor: pointer;
}

.react-bs-table .table-container{
overflow-x: auto;
overflow-y: auto;
height: 100%;
}

.react-bs-table .table-container > table{
margin-top: -18px;
table-layout: fixed;
margin-bottom: 0px;
}

.react-bs-container .tool-bar{
margin-bottom: 5px
}
/*inline editor default style*/
.react-bs-table .form-control.editor{
width:100%;
top:0;
left:0;
height: 100%;
position: absolute;
}

.react-bs-table .textarea-save-btn{
position: absolute;
z-index: 100;
right: 0;
top: -21px;
}
/*error tip style*/
.animated {
animation-fill-mode: both;
}

.animated.bounceIn,
.animated.bounceOut{
animation-duration: .75s;
}
.animated.shake{
animation-duration:.3s;
}
@keyframes shake {
from, to {
transform: translate3d(0, 0, 0);
}

10%, 50%, 90% {
transform: translate3d(-10px, 0, 0);
}

30%, 70%{
transform: translate3d(10px, 0, 0);
}
}

.shake {
animation-name: shake;
}
@keyframes bounceIn {
from, 20%, 40%, 60%, 80%, to {
animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
}

0% {
opacity: 0;
transform: scale3d(.3, .3, .3);
}

20% {
transform: scale3d(1.1, 1.1, 1.1);
}

40% {
transform: scale3d(.9, .9, .9);
}

60% {
opacity: 1;
transform: scale3d(1.03, 1.03, 1.03);
}

80% {
transform: scale3d(.97, .97, .97);
}

to {
opacity: 1;
transform: scale3d(1, 1, 1);
}
}

.bounceIn {
animation-name: bounceIn;
}

@keyframes bounceOut {
20% {
transform: scale3d(.9, .9, .9);
}

50%, 55% {
opacity: 1;
transform: scale3d(1.1, 1.1, 1.1);
}

to {
opacity: 0;
transform: scale3d(.3, .3, .3);
}
}

.bounceOut {
animation-name: bounceOut;
}
1 change: 1 addition & 0 deletions css/react-bootstrap-table-all.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions css/react-bootstrap-table.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*editor error animate*/
/*@import "../node_modules/toastr/build/toastr.min.css";*/
@import "https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css";
/*@import "~toastr/build/toastr.min.css";*/

.react-bs-table{
margin-bottom: 37px;
Expand Down
2 changes: 1 addition & 1 deletion css/react-bootstrap-table.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion examples/js/advance/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import EditTypeTable from './edit-type-table';
import DataInsertTypeTable from './insert-type-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/basic/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import BasicTable from './basic-table';
import HoverStripedTable from './hover-striped-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/cell-edit/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import ClickToEditTable from './click-to-edit-table';
import DbClickToEditTable from './dbclick-to-edit-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/column-format/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import HtmlColumnFormatTable from './html-column-format-table';
import ReactColumnFormatTable from './react-column-format-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/column/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import ColumnAlignTable from './column-align-table';
import ColumnWidthTable from './column-width-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/complex/demo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require('./demo.css');
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import App from './app';

Expand Down
2 changes: 2 additions & 0 deletions examples/js/components/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import React from 'react';
import {LinkContainer} from 'react-router-bootstrap';

// import 'bootstrap/dist/css/bootstrap.css';
import 'toastr/build/toastr.min.css';
import '../../../css/react-bootstrap-table.css';
// import 'jquery';
// import 'bootstrap';
import {
Expand Down
1 change: 0 additions & 1 deletion examples/js/manipulation/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import InsertRowTable from './insert-row-table';
import DeleteRowTable from './delete-row-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/pagination/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import DefaultPaginationTable from './default-pagination-table';
import CustomPaginationTable from './custom-pagination-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/selection/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import SingleSelectTable from './single-select-table';
import MultiSelectTable from './multi-select-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/sort/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import SortTable from './sort-table';
import DefaultSortTable from './default-sort-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/style/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
require('./style.css');
import React from 'react';
import TrClassStringTable from './tr-class-string-table';
Expand Down
1 change: 0 additions & 1 deletion examples/js/tableDataSet/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('../../../css/react-bootstrap-table.min.css');
import React from 'react';
import TableDataSetTable from './table-data-set';

Expand Down
Loading

0 comments on commit 06defe2

Please sign in to comment.