Skip to content

Commit d5e6a96

Browse files
author
christopheschwyzer
committed
add global divider styles
1 parent 56725af commit d5e6a96

File tree

3 files changed

+82
-43
lines changed

3 files changed

+82
-43
lines changed

css/main.css

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,27 @@ h2 {
8585
font-weight: normal;
8686
text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.5);
8787
}
88+
article {
89+
padding: 15px 0;
90+
margin-bottom: 25px;
91+
}
92+
article p {
93+
text-align: justify;
94+
}
8895
ul {
8996
margin-bottom: 15px;
9097
padding-left: 25px;
9198
}
9299
ul li {
93100
margin-bottom: 5px;
94101
}
102+
img {
103+
display: block;
104+
max-width: 100%;
105+
}
106+
strong {
107+
font-weight: bold;
108+
}
95109
.button {
96110
-webkit-appearance: none;
97111
display: inline-block;
@@ -123,15 +137,29 @@ ul li {
123137
box-shadow: inset 0 2px 0 2px #006c80;
124138
outline: none;
125139
}
126-
img {
140+
.centered {
141+
text-align: center;
142+
}
143+
.divider-vertical {
127144
display: block;
128-
max-width: 100%;
145+
font-weight: bold;
146+
margin: 12px 0;
129147
}
130-
strong {
148+
.divider-vertical:before {
149+
content: '-- ';
150+
}
151+
.divider-vertical:after {
152+
content: ' --';
153+
}
154+
.divider-horizontal {
131155
font-weight: bold;
156+
margin: 0 5px;
132157
}
133-
.centered {
134-
text-align: center;
158+
.divider-horizontal:before {
159+
content: '< ';
160+
}
161+
.divider-horizontal:after {
162+
content: ' >';
135163
}
136164
#header {
137165
height: 100%;
@@ -325,13 +353,6 @@ strong {
325353
#footer .social-link.github:hover {
326354
background-color: #404041;
327355
}
328-
article {
329-
padding: 15px 0;
330-
margin-bottom: 25px;
331-
}
332-
article p {
333-
text-align: justify;
334-
}
335356
.badge-link,
336357
.list-item-link {
337358
display: block;
@@ -391,7 +412,6 @@ article p {
391412
}
392413
@media (min-width: 700px) {
393414
.badge .badge-link {
394-
margin-bottom: 10px;
395415
padding: 4px;
396416
border: 3px dashed transparent;
397417
}
@@ -402,9 +422,6 @@ article p {
402422
.badge .badge-link:hover {
403423
border-color: rgba(26, 26, 26, 0.2);
404424
}
405-
.badge .divider {
406-
font-weight: bold;
407-
}
408425
.partner-list {
409426
list-style: none;
410427
padding: 0;
@@ -425,7 +442,7 @@ article p {
425442
padding: 0;
426443
}
427444
.meetup-list .list-item {
428-
margin-bottom: 5px;
445+
margin-bottom: 7px;
429446
padding: 12px;
430447
background-color: rgba(26, 26, 26, 0.08);
431448
background-color: white;

css/main.less

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,15 @@ h2 {
137137
text-shadow: 1px 1px 1px hsla(0, 0%, 100%, .5);
138138
}
139139

140+
article {
141+
padding: 15px 0;
142+
margin-bottom: 25px;
143+
144+
p {
145+
text-align: justify;
146+
}
147+
}
148+
140149
ul {
141150
margin-bottom: 15px;
142151
padding-left: 25px;
@@ -146,12 +155,6 @@ ul {
146155
}
147156
}
148157

149-
.button {
150-
-webkit-appearance: none;
151-
.button(@colorBgAlternative);
152-
cursor: pointer;
153-
}
154-
155158
img {
156159
display: block;
157160
max-width: 100%;
@@ -161,10 +164,43 @@ strong {
161164
font-weight: bold;
162165
}
163166

167+
.button {
168+
-webkit-appearance: none;
169+
.button(@colorBgAlternative);
170+
cursor: pointer;
171+
}
172+
164173
.centered {
165174
text-align: center;
166175
}
167176

177+
.divider-vertical {
178+
display: block;
179+
font-weight: bold;
180+
margin: 12px 0;
181+
182+
&:before {
183+
content: '-- ';
184+
}
185+
186+
&:after{
187+
content: ' --';
188+
}
189+
}
190+
191+
.divider-horizontal {
192+
font-weight: bold;
193+
margin: 0 5px;
194+
195+
&:before {
196+
content: '< ';
197+
}
198+
199+
&:after{
200+
content: ' >';
201+
}
202+
}
203+
168204
#header {
169205
height: 100%;
170206

@@ -361,15 +397,6 @@ strong {
361397
}
362398
}
363399

364-
article {
365-
padding: 15px 0;
366-
margin-bottom: 25px;
367-
368-
p {
369-
text-align: justify;
370-
}
371-
}
372-
373400
.badge-link, .list-item-link {
374401
display: block;
375402
width: 100%; // FF bug?
@@ -401,7 +428,6 @@ article {
401428

402429
.badge-link {
403430
@media (min-width: @breakpointMedium) {
404-
margin-bottom: 10px;
405431
padding: 4px;
406432
border: 3px dashed transparent;
407433

@@ -414,10 +440,6 @@ article {
414440
border-color: hsla(0, 0%, 10%, .2);
415441
}
416442
}
417-
418-
.divider {
419-
font-weight: bold;
420-
}
421443
}
422444

423445
.partner-list {
@@ -444,7 +466,7 @@ article {
444466
padding: 0;
445467

446468
.list-item {
447-
margin-bottom: 5px;
469+
margin-bottom: 7px;
448470
padding: 12px;
449471
background-color: hsla(0, 0%, 10%, .08);
450472
background-color: white;

index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2>Choose your badge</h2>
2525
</div>
2626
</div>
2727
<div class="centered">
28-
<p class="centered"><span class="divider">-- or --</span></p>
28+
<span class="divider-vertical">or</span>
2929
<a href="/img/logo/MadeInBasel-LogoPackage.zip" download="MadeInBasel-LogoPackage.zip" class="button button-download">Download Logo Package</a>
3030
<p class="centered"><small>(eps, svg, png)</small></p>
3131
</div>
@@ -43,10 +43,10 @@ <h2>Who is in</h2>
4343
{% endfor %}
4444
</ul>
4545
<div class="centered">
46-
<p>Have you placed your badge already? Great, send your logo and we'll place it here. If you feel bold, you can also add your logo via Github Pull-Request.
47-
<a href="https://github.com/MadeInBasel/madeinbasel.github.io">Here is the public repository.</a></p>
48-
<button class="button button-download">Represent me here</button>
49-
<p class="centered"><small>(min. 150x150, SVG preferred)</small></p>
46+
<p>Have you placed your badge already and want to get represented here? Great, send us your logo via email and we'll place it here. If you feel bold, you can also add your logo directly via Github Pull-Request.</p>
47+
<a class="button" href="https://github.com/MadeInBasel/madeinbasel.github.io">Use Github</a>
48+
<span class="divider-horizontal"></span>
49+
<a href="mailto:[email protected]" class="button">Use Email</a>
5050
</div>
5151
</article>
5252

0 commit comments

Comments
 (0)