Skip to content

Commit d2d7625

Browse files
committed
style paddings
1 parent f46f100 commit d2d7625

10 files changed

+46
-37
lines changed

src/app/reader.cirru

+16-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ var
5757
AppWireframe
5858
div ({} (:style $ @styleRoot))
5959
div ({} (:style $ @styleMain))
60-
div ({} (:style $ @styleList))
60+
div ({} :style @styleAroundSpace)
61+
div ({} :style @styleList)
6162
cond (? user)
6263
div ({} (:style $ @styleToolbar))
6364
Button $ {} (:text :refresh) (:onClick @onRefresh)
@@ -84,31 +85,34 @@ var
8485
:user $ UserDetail $ {}
8586
:user $ store.getIn $ [] :users loginname
8687
:post $ TopicPost
88+
div ({} :style @styleAroundSpace)
8789

8890
:styleRoot $ \ ()
8991
{}
9092
:position :absolute
9193
:width :100%
9294
:height :100%
9395
:overflowX :auto
96+
:backgroundColor (hsl 180 26 28)
9497

9598
:styleMain $ \ ()
9699
{}
97-
:width :2200px
100+
:width :3200px
98101
:display :flex
99102
:height :100%
100103

101-
:styleList $ \ ()
102-
{}
103-
:height :100%
104-
:display :flex
105-
:flexDirection :column
104+
:styleList $ {}
105+
:height :100%
106+
:display :flex
107+
:flexDirection :column
108+
:borderRight $ + ":1px solid " (hsl 0 0 90)
109+
:backgroundColor :white
106110

107111
:styleToolbar $ \ ()
108112
{}
109113
:display :flex
110114
:alignItems :center
111-
:padding ":10px 10px"
115+
:padding ":10px 40px"
112116
:justifyContent :flex-end
113117

114118
:styleToken $ \ ()
@@ -124,3 +128,7 @@ var
124128
{}
125129
:display :flex
126130
:justifyContent :flex-end
131+
132+
:styleAroundSpace $ {}
133+
:width 400
134+
:flexShrink 0

src/app/reply-detail.cirru

+3-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ var
3434
:styleRoot $ \ ()
3535
{}
3636
:marginTop :10px
37-
:padding ":0 10px"
38-
:margin ":20px 0"
39-
:borderBottom $ + ":1px solid " (hsl 0 0 95)
37+
:padding ":0 0px"
38+
:margin ":40px 0"
4039

4140
:styleInfo $ \ ()
4241
{}
@@ -45,4 +44,4 @@ var
4544

4645
:styleContent $ \ ()
4746
{}
48-
:paddingLeft :24px
47+
:paddingLeft :0px

src/app/time.cirru

+1
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ var
5858
:height :18px
5959
:fontSize :12px
6060
:borderRadius 2
61+
:whiteSpace :nowrap

src/app/topic-detail.cirru

+12-11
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ var
5353
:renderEditor $ \ ()
5454
div ({} (:style $ @styleEditor))
5555
Space $ {} (:height 20)
56-
div ({} (:style $ @styleSection)) ":reply:"
5756
textarea $ {} (:style $ @styleText)
5857
:value @state.text
5958
:onChange @onTextChange
6059
:onKeyDown @onTextKeyDown
6160
:placeholder :reply...
61+
Space $ {} (:height 10)
6262
div ({} (:style $ @styleWrapper))
6363
Content $ {} (:text @state.text)
6464
Space $ {} (:height 10)
@@ -72,7 +72,7 @@ var
7272
replies $ topic.get :replies
7373

7474
div ({} (:style $ @styleRoot))
75-
div ({} (:style $ @styleContent))
75+
div ({} :style @styleContent)
7676
div ({} (:style $ @styleTitle))
7777
topic.get :title
7878
Space $ {} :height 20
@@ -103,23 +103,24 @@ var
103103
:width :1600px
104104
:overflowY :auto
105105
:height :100%
106+
:backgroundColor :white
106107

107-
:styleContent $ \ ()
108-
{}
109-
:width :800px
110-
:paddingBottom :300px
111-
:paddingLeft :20px
112-
:paddingRight :20px
113-
:height :100%
114-
:overflowY :auto
108+
:styleContent $ {}
109+
:width :800px
110+
:paddingBottom :300px
111+
:paddingLeft :40px
112+
:paddingRight :40px
113+
:height :100%
114+
:overflowY :auto
115+
:borderRight $ + ":1px solid " (hsl 0 0 90)
115116

116117
:styleReplies $ \ ()
117118
{}
118119
:width :800px
119120
:height :100%
120121
:display :inline-block
121122
:overflowY :auto
122-
:padding ":10px 10px"
123+
:padding ":20px 40px"
123124

124125
:styleTitle $ \ ()
125126
{}

src/app/topic-entry.cirru

+2-3
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,11 @@ var
5656
:display :flex
5757
:flexDirection :row
5858
:alignItems :center
59-
:padding ":8px 10px"
59+
:padding ":10px 40px"
6060
:cursor :pointer
61-
:borderBottom $ + ":1px solid " $ hsl 0 0 94
6261
:backgroundColor $ cond @props.isSelected
6362
hsl 0 0 95
64-
hsl 0 0 100
63+
hsl 0 0 100 0
6564

6665
:styleTitle $ {}
6766
:textDecoration :none

src/app/topic-list.cirru

+7-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var
3131
:isSelected (is (topic.get :id) @props.selectedTopic)
3232

3333
:render $ \ ()
34-
div ({} (:style $ @styleRoot))
34+
div ({} :style @styleRoot)
3535
Space $ {} (:height 40)
3636
MessageList $ {} (:messages @props.messages)
3737
@props.topics.map @renderTopic
@@ -40,16 +40,15 @@ var
4040
Button $ {} (:text :more) (:onClick @onMore)
4141
Space $ {} (:height 400)
4242

43-
:styleRoot $ \ ()
44-
{}
45-
:width :600px
46-
:flex 1
47-
:overflowY :auto
48-
:display :inline-block
43+
:styleRoot $ {}
44+
:width :800px
45+
:flex 1
46+
:overflowY :auto
47+
:display :inline-block
4948

5049
:styleFooter $ \ ()
5150
{}
5251
:display :flex
5352
:justifyContent :flex-start
5453
:marginTop :10px
55-
:paddingLeft :10px
54+
:paddingLeft :40px

src/app/topic-wireframe.cirru

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var
1313
({}~ div span) React.DOM
1414

1515
= module.exports $ React.createClass $ {}
16-
:displayName :app-wireframe
16+
:displayName :topic-wireframe
1717

1818
:render $ \ ()
1919
div ({} (:style $ @styleRoot))
@@ -27,6 +27,7 @@ var
2727
:display :flex
2828
:justifyContent :center
2929
:alignItems :center
30+
:backgroundColor :white
3031

3132
:styleBox $ \ ()
3233

style/main.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ body {
1313
}
1414

1515
.topic-title:visited {
16-
color: hsl(0,0%,70%);
16+
color: hsl(0,0%,60%);
1717
}

style/markdown.css

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.markdown-content p {
33
margin: 5px 0;
44
margin-bottom: 20px;
5+
line-height: 1.8em;
56
}
67

78
.markdown-content img {

tasks/assets.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"main":["main.2525e543.js","style.2525e543.css"],"vendor":"vendor.770f7a2e.js"}
1+
{"main":["main.f73b3938.js","style.f73b3938.css"],"vendor":"vendor.1a02a50d.js"}

0 commit comments

Comments
 (0)