Skip to content

Commit f835308

Browse files
committed
fixed tree component changing outer div size
1 parent 3096091 commit f835308

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

src/app/containers/TravelContainer.jsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
<<<<<<< HEAD
2-
import React, { Component } from 'react';
3-
4-
import Slider from '../components/Slider';
5-
=======
61
import React from 'react';
7-
import MainSlider from '../components/MainSlider'
8-
>>>>>>> dev
2+
import MainSlider from '../components/MainSlider';
93

104
const TravelContainer = ({
115
playForward,

src/app/styles/components/_buttons.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,17 @@
99
visibility: hidden;
1010
}
1111

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+
1221
.jump-button:hover {
22+
// remove the blue border when button is clicked
1323
background-color: $highlight-color;
1424
}
1525

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
.json-tree {
2-
margin: 0;
3-
padding: 10px;
2+
position: absolute;
3+
margin: 10px;
4+
padding: 0;
45
background-color: $brand-color;
56
list-style: none;
6-
min-width: 300px;
7+
// overflow: hidden;
78
}

0 commit comments

Comments
 (0)