Merge branch 'dev' into 'apply'
# Conflicts: # smart-hut/src/components/dashboard/devices/Curtain.js
This commit is contained in:
commit
b7e17fc770
2 changed files with 2 additions and 2 deletions
|
@ -89,7 +89,7 @@ class Curtain extends Component {
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="container">
|
<div className="container curtain-container">
|
||||||
<div
|
<div
|
||||||
className="open-container"
|
className="open-container"
|
||||||
style={{
|
style={{
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.container {
|
.container.curtain-container {
|
||||||
position: relative;
|
position: relative;
|
||||||
margin-top: 10%;
|
margin-top: 10%;
|
||||||
width: 18rem;
|
width: 18rem;
|
||||||
|
|
Loading…
Reference in a new issue