File tree Expand file tree Collapse file tree 3 files changed +15
-10
lines changed Expand file tree Collapse file tree 3 files changed +15
-10
lines changed Original file line number Diff line number Diff line change 1
- < << << << HEAD
2
- import React , { Component } from 'react ';
3
-
4
- import Slider from '. . / components / Slider ';
5
- === === =
6
1
import React from 'react' ;
7
- import MainSlider from '. . / components / MainSlider '
8
- >>> >>> > dev
2
+ import MainSlider from '../components/MainSlider' ;
9
3
10
4
const TravelContainer = ( {
11
5
playForward,
Original file line number Diff line number Diff line change 9
9
visibility : hidden ;
10
10
}
11
11
12
+ .jump-button :focus {
13
+ outline : 0 ;
14
+ // make the text in the button not highlightable
15
+ -webkit-user-select : none ; /* Safari */
16
+ -moz-user-select : none ; /* Firefox */
17
+ -ms-user-select : none ; /* IE10+/Edge */
18
+ user-select : none ; /* Standard */
19
+ }
20
+
12
21
.jump-button :hover {
22
+ // remove the blue border when button is clicked
13
23
background-color : $highlight-color ;
14
24
}
15
25
Original file line number Diff line number Diff line change 1
1
.json-tree {
2
- margin : 0 ;
3
- padding : 10px ;
2
+ position : absolute ;
3
+ margin : 10px ;
4
+ padding : 0 ;
4
5
background-color : $brand-color ;
5
6
list-style : none ;
6
- min-width : 300 px ;
7
+ // overflow: hidden ;
7
8
}
You can’t perform that action at this time.
0 commit comments