Skip to content

Commit 6d3cbf4

Browse files
committed
Merge branch 'master' of git@github.com:relevance/clojurescript
2 parents 7e99dca + 097b01c commit 6d3cbf4

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ closure
77
/core.js
88
/coreadvanced.js
99
/coresimple.js
10+
/out

readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* the terms of this license.
88
* You must not remove this notice, or any other, from this software.
99

10-
Docs: http://clojurescript.org
10+
Docs: https://github.com/clojure/clojurescript/wiki
1111
Feedback: http://groups.google.com/group/clojure
1212

1313
If you are operating from a fresh source base, you must run the bootstrapping script:
@@ -22,4 +22,4 @@ Sample applications are found in the ./samples directory
2222

2323
A "Quick Start" guide is available at https://github.com/clojure/clojurescript/wiki/Quick-Start
2424

25-
More information can be found on the ClojureScript wiki located at https://github.com/clojure/clojurescript/wiki/
25+

samples/twitterbuzz/style.css

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ header {
7777

7878
#network {
7979
height: 100%;
80-
min-width: 540px;
80+
min-width: 640px;
8181
left: 20px;
82-
right: 400px;
82+
right: 300px;
8383
/*padding: 10px 10px 0 0;*/
8484
float: left;
8585
position: absolute;
8686
}
8787

8888
#leaderboard {
89-
width: 380px;
89+
width: 280px;
9090
height: 100px;
9191
border-left: 1px solid #ccc;
9292
/*padding: 10px;*/
@@ -95,7 +95,7 @@ header {
9595
}
9696

9797
#timeline {
98-
width: 380px;
98+
width: 280px;
9999
top: 100px;
100100
bottom: 0;
101101
border-left: 1px solid #ccc;
@@ -117,24 +117,24 @@ header {
117117
#leaderboard .tweet {
118118
float: left;
119119
z-index: 100;
120-
margin: 4px;
120+
margin: 0;
121121
}
122122

123123
#leaderboard .tweet-details {
124124
position: absolute;
125-
top: 66px;
125+
top: 56px;
126126
left: 0;
127127
background-color: #e6f3f8;
128128
z-index: 100;
129129
display: none;
130130
padding: 10px;
131-
width: 360px;
131+
width: 260px;
132132
border-bottom: 1px solid #9cbbc6;
133133
}
134134
#leaderboard .profile-pic {
135135
width: 48px;
136136
height: 48px;
137-
border: 10px solid #fff;
137+
border: 4px solid #fff;
138138
}
139139
#leaderboard .user-name {
140140
font-weight: bold;
@@ -151,7 +151,7 @@ header {
151151
position: absolute;
152152
top: 30px;
153153
bottom: 0;
154-
width: 380px;
154+
width: 280px;
155155
overflow: auto;
156156
}
157157

@@ -164,6 +164,7 @@ header {
164164
padding: 10px;
165165
border-bottom: 1px solid #b3b3b3;
166166
overflow: auto;
167+
font-size: 12px;
167168
}
168169

169170
#timeline .profile-pic {

0 commit comments

Comments
 (0)