Skip to content

Commit 06defe2

Browse files
AllenFangAllenFang
committed
Merge pull request #97 from luqin/css
change css, add react-bootstrap-table-all.css
2 parents a3a7b0c + de3292c commit 06defe2

File tree

19 files changed

+234
-85
lines changed

19 files changed

+234
-85
lines changed

‎css/react-bootstrap-table-all.css

+153
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
/*editor error animate*/
2+
/*@import "~toastr/build/toastr.min.css";*/
3+
@import "https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css";
4+
5+
.react-bs-table{
6+
margin-bottom: 37px;
7+
}
8+
.react-bs-table .table-header{
9+
height: 42px;
10+
border-top-width: 1px;
11+
border-top-style: solid;
12+
border-top-color: rgb(221, 221, 221);
13+
border-bottom-width: 0px;
14+
border-bottom-style: solid;
15+
border-bottom-color: rgb(221, 221, 221);
16+
border-right-width: 1px;
17+
border-right-style: inset;
18+
border-right-color: rgb(221, 221, 221);
19+
}
20+
21+
.react-bs-table .table-header > table{
22+
table-layout: fixed;
23+
border-top-style: hidden;
24+
border-right-style: hidden;
25+
}
26+
27+
.react-bs-table .table-header > table > thead > tr{
28+
border-bottom-style: hidden;
29+
}
30+
31+
.react-bs-table .table-header > table > thead > tr > th .table-header-column{
32+
line-height: 25px
33+
}
34+
35+
.react-bs-table .table-header > table > thead > tr > .sort-column{
36+
cursor: pointer;
37+
}
38+
39+
.react-bs-table .table-container{
40+
overflow-x: auto;
41+
overflow-y: auto;
42+
height: 100%;
43+
}
44+
45+
.react-bs-table .table-container > table{
46+
margin-top: -18px;
47+
table-layout: fixed;
48+
margin-bottom: 0px;
49+
}
50+
51+
.react-bs-container .tool-bar{
52+
margin-bottom: 5px
53+
}
54+
/*inline editor default style*/
55+
.react-bs-table .form-control.editor{
56+
width:100%;
57+
top:0;
58+
left:0;
59+
height: 100%;
60+
position: absolute;
61+
}
62+
63+
.react-bs-table .textarea-save-btn{
64+
position: absolute;
65+
z-index: 100;
66+
right: 0;
67+
top: -21px;
68+
}
69+
/*error tip style*/
70+
.animated {
71+
animation-fill-mode: both;
72+
}
73+
74+
.animated.bounceIn,
75+
.animated.bounceOut{
76+
animation-duration: .75s;
77+
}
78+
.animated.shake{
79+
animation-duration:.3s;
80+
}
81+
@keyframes shake {
82+
from, to {
83+
transform: translate3d(0, 0, 0);
84+
}
85+
86+
10%, 50%, 90% {
87+
transform: translate3d(-10px, 0, 0);
88+
}
89+
90+
30%, 70%{
91+
transform: translate3d(10px, 0, 0);
92+
}
93+
}
94+
95+
.shake {
96+
animation-name: shake;
97+
}
98+
@keyframes bounceIn {
99+
from, 20%, 40%, 60%, 80%, to {
100+
animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
101+
}
102+
103+
0% {
104+
opacity: 0;
105+
transform: scale3d(.3, .3, .3);
106+
}
107+
108+
20% {
109+
transform: scale3d(1.1, 1.1, 1.1);
110+
}
111+
112+
40% {
113+
transform: scale3d(.9, .9, .9);
114+
}
115+
116+
60% {
117+
opacity: 1;
118+
transform: scale3d(1.03, 1.03, 1.03);
119+
}
120+
121+
80% {
122+
transform: scale3d(.97, .97, .97);
123+
}
124+
125+
to {
126+
opacity: 1;
127+
transform: scale3d(1, 1, 1);
128+
}
129+
}
130+
131+
.bounceIn {
132+
animation-name: bounceIn;
133+
}
134+
135+
@keyframes bounceOut {
136+
20% {
137+
transform: scale3d(.9, .9, .9);
138+
}
139+
140+
50%, 55% {
141+
opacity: 1;
142+
transform: scale3d(1.1, 1.1, 1.1);
143+
}
144+
145+
to {
146+
opacity: 0;
147+
transform: scale3d(.3, .3, .3);
148+
}
149+
}
150+
151+
.bounceOut {
152+
animation-name: bounceOut;
153+
}

‎css/react-bootstrap-table-all.min.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/react-bootstrap-table.css

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*editor error animate*/
2-
/*@import "../node_modules/toastr/build/toastr.min.css";*/
3-
@import "https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css";
2+
/*@import "~toastr/build/toastr.min.css";*/
43

54
.react-bs-table{
65
margin-bottom: 37px;

‎css/react-bootstrap-table.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/js/advance/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import EditTypeTable from './edit-type-table';
43
import DataInsertTypeTable from './insert-type-table';

‎examples/js/basic/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import BasicTable from './basic-table';
43
import HoverStripedTable from './hover-striped-table';

‎examples/js/cell-edit/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import ClickToEditTable from './click-to-edit-table';
43
import DbClickToEditTable from './dbclick-to-edit-table';

‎examples/js/column-format/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import HtmlColumnFormatTable from './html-column-format-table';
43
import ReactColumnFormatTable from './react-column-format-table';

‎examples/js/column/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import ColumnAlignTable from './column-align-table';
43
import ColumnWidthTable from './column-width-table';

‎examples/js/complex/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require('./demo.css');
2-
require('../../../css/react-bootstrap-table.min.css');
32
import React from 'react';
43
import App from './app';
54

‎examples/js/components/App.js

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import React from 'react';
22
import {LinkContainer} from 'react-router-bootstrap';
33

44
// import 'bootstrap/dist/css/bootstrap.css';
5+
import 'toastr/build/toastr.min.css';
6+
import '../../../css/react-bootstrap-table.css';
57
// import 'jquery';
68
// import 'bootstrap';
79
import {

‎examples/js/manipulation/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import InsertRowTable from './insert-row-table';
43
import DeleteRowTable from './delete-row-table';

‎examples/js/pagination/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import DefaultPaginationTable from './default-pagination-table';
43
import CustomPaginationTable from './custom-pagination-table';

‎examples/js/selection/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import SingleSelectTable from './single-select-table';
43
import MultiSelectTable from './multi-select-table';

‎examples/js/sort/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import SortTable from './sort-table';
43
import DefaultSortTable from './default-sort-table';

‎examples/js/style/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
require('./style.css');
32
import React from 'react';
43
import TrClassStringTable from './tr-class-string-table';

‎examples/js/tableDataSet/demo.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('../../../css/react-bootstrap-table.min.css');
21
import React from 'react';
32
import TableDataSetTable from './table-data-set';
43

0 commit comments

Comments
 (0)