Skip to content

Commit e004d9e

Browse files
committed
Update styles
1 parent 38f0965 commit e004d9e

File tree

4 files changed

+31
-21
lines changed

4 files changed

+31
-21
lines changed

app/templates/app/app/bundles/app/components/Dummy/Dummy.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ export default class Dummy extends React.Component {
5555
const { dummy: { data, isLoading }, auth: { isLoggedIn } } = this.props;
5656

5757
const dummyContent = (
58-
<div>
58+
<div id="dummy__content">
5959
{data} {isLoggedIn ? `You're logged in!` : `You're logged out :(`}
60-
<div id="auth">
60+
<div id="dummy__content__auth">
6161
{isLoggedIn ? (
62-
<span onClick={::this._handleLogout} className="auth-link">logout</span>
62+
<span onClick={::this._handleLogout} className="dummy__content__auth__link">logout</span>
6363
) : (
64-
<Link to="/login" className="auth-link">login</Link>
64+
<Link to="/login" className="dummy__content__auth__link">login</Link>
6565
)}
6666
</div>
6767
</div>

app/templates/app/app/bundles/app/components/Dummy/Dummy.styl

+22-14
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,25 @@
66
transform: translate(-50%, -50%)
77
text-align: center
88

9-
#auth
10-
display: block
11-
margin-top: 1rem
12-
.auth-link
13-
display: inline-block
14-
padding: .3rem 1rem
15-
border: 1px solid $blue
16-
border-radius: 4px
17-
background-color: #fff
18-
color: $blue
19-
text-decoration: none
20-
cursor: pointer
21-
&:active
22-
transform: translate(1px, 1px)
9+
$bg-color = #fff
10+
#dummy__content
11+
display: inline-block
12+
padding: 2rem 3rem
13+
background-color: $bg-color
14+
box-shadow: 0 0 1px rgba(0, 0, 0, .1)
15+
16+
#dummy__content__auth
17+
display: block
18+
margin-top: 1rem
19+
20+
.dummy__content__auth__link
21+
display: inline-block
22+
padding: .3rem 1rem
23+
border: 1px solid $blue
24+
border-radius: 4px
25+
background-color: $bg-color
26+
color: $blue
27+
text-decoration: none
28+
cursor: pointer
29+
&:active
30+
transform: translate(1px, 1px)

app/templates/app/app/bundles/app/components/Login/Login.styl

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
margin-right: 1%
1616
padding: 1rem 1.5rem
1717
border: 0
18-
border-radius: 8px
19-
background-color: #f1f1f1
18+
border-radius: 0
19+
background-color: #fff
20+
box-shadow: 0 0 1px rgba(0, 0, 0, .1)
2021
&:focus
2122
box-shadow: 0px 0px 5px 0px rgba(#1ea9ff, 0.95)
2223

@@ -42,4 +43,5 @@
4243
width: 100%
4344
margin: 0
4445
padding: 1rem 1.5rem
46+
border-radius: 0
4547
color: #fff

app/templates/app/app/bundles/app/layouts/makeup/shape.styl

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $base-line-height = 1.4
55

66
/* Colors */
77
$base-text-color = rgba(0, 0, 0, 0.8)
8-
$body-bg-color = #fff
8+
$body-bg-color = #eaeaea
99
$footer-bg-color = #fff
1010
$main-color = #29d
1111
$blue = #29d

0 commit comments

Comments
 (0)