Skip to content

Commit 3147665

Browse files
committed
Merge pull request #50 from benjaminpaap/master
Fixed the main.less
2 parents 9e9dfde + 8b87761 commit 3147665

File tree

2 files changed

+115
-97
lines changed

2 files changed

+115
-97
lines changed

_includes/themes/phpughh/less/main.less

Lines changed: 105 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
* {
66
margin:0;padding:0;
7-
}
7+
}
88

99
html, body {
1010
height: 100%;
@@ -17,51 +17,51 @@ html, body {
1717
.content {
1818
overflow:auto;
1919
padding-bottom: @footer_height;
20-
}
20+
}
2121

2222
.footer {
2323
position: relative;
2424
margin-top: -@footer_height;
2525
height: @footer_height;
2626
background: white;
2727
clear:both;
28-
28+
2929
img.bg {
3030
position: absolute;
3131
z-index: -1;
3232
left: 30%;
3333
top: -298px;
3434
}
35-
35+
3636
h5 {
3737
font-size: 1.4em;
3838
}
39-
39+
4040
.span4 {
4141
position: relative;
4242
padding-top: 30px;
43-
43+
4444
> .sprite {
4545
position: absolute;
4646
top: -40px;
4747
left: 10px;
4848
}
4949
}
50-
50+
5151
.row-fluid {
5252
width: 985px;
5353
margin: 0 auto;
5454
}
55-
55+
5656
.sponsors {
5757
list-style-type: none;
5858
margin: 0;
59-
59+
6060
li {
6161
margin-bottom: 6px;
6262
}
6363
}
64-
64+
6565
ul {
6666
a {
6767
text-decoration: none;
@@ -70,17 +70,17 @@ html, body {
7070
}
7171
}
7272
}
73-
73+
7474
.social {
7575
list-style-type: none;
7676
margin: 0;
77-
77+
7878
li {
7979
display: inline;
8080
}
8181
}
82-
}
83-
82+
}
83+
8484
body:before {
8585
content:"";
8686
height:100%;
@@ -97,28 +97,28 @@ body {
9797
text-align: center;
9898
padding-bottom: 50px;
9999
background: transparent url(../img/wrapper.png) repeat-x;
100-
100+
101101
> .wrapper {
102102
margin: 0 auto;
103103
width: 985px;
104104
position: relative;
105105
overflow: visible;
106-
107-
> .content {
106+
107+
> .content {
108108
min-height: 300px;
109109
text-align: left;
110110
padding-top: 80px;
111111
padding-bottom: 280px;
112112
overflow: visible;
113113
}
114-
114+
115115
}
116116
}
117117

118118
nav.main {
119119
background: white;
120-
height: 95px;
121-
120+
height: 95px;
121+
122122
.logo {
123123
position: absolute;
124124
top: 49px;
@@ -128,18 +128,18 @@ nav.main {
128128
display: inline-block;
129129
z-index: 1000;
130130
}
131-
131+
132132
ul {
133133
list-style-type: none;
134134
position: absolute;
135135
width: 985px;
136136
top: 65px;
137137
margin-left: 0;
138138
text-align: right;
139-
139+
140140
li {
141141
display: inline-block;
142-
142+
143143
a {
144144
background: #6683b6;
145145
color: white;
@@ -157,101 +157,120 @@ nav.main {
157157
background: white;
158158
padding: 10px 40px;
159159
margin-bottom: 20px;
160-
160+
161161
.drop-shadow(2px, 2px, 2px, 0.2);
162-
}
163162

164-
.box.next {
165-
width: 905px;
166-
margin-bottom: 20px;
167-
float: left;
168-
position: relative;
169-
170-
img {
171-
position: absolute;
172-
top: -46px;
173-
left: 320px;
174-
}
175-
176-
.sprite {
177-
display: inline-block;
178-
margin-right: 50px;
163+
&.next {
164+
width: 865px;
165+
margin-bottom: 20px;
179166
float: left;
180-
}
181-
182-
div {
183-
height: 70px;
184-
float: right;
185-
width: 740px;
186-
margin-top: 14px;
187-
}
188-
189-
h1, h2, h3 {
190-
margin: 0;
191-
line-height: normal;
192-
}
193-
h1 {
194-
font-size: 1.8em;
195-
color: #f94d31;
196-
}
197-
h2, h3 {
198-
font-size: 1.2em;
199-
font-weight: normal;
167+
position: relative;
168+
169+
a,
170+
a:active ,
171+
a:visited {
172+
color: #333333
173+
}
174+
a:hover h1,
175+
a:hover h2 {
176+
color: #5F5F5F;
177+
}
178+
179+
img.box-top {
180+
position: absolute;
181+
top: -46px;
182+
left: 320px;
183+
}
184+
185+
img.ajax-loader {
186+
margin-right: 8px;
187+
}
188+
189+
.sprite {
190+
display: inline-block;
191+
margin-right: 50px;
192+
float: left;
193+
}
194+
195+
div {
196+
height: 70px;
197+
float: right;
198+
width: 726px;
199+
margin-top: 14px;
200+
}
201+
202+
h1, h2, h3 {
203+
margin: 0;
204+
line-height: normal;
205+
}
206+
h1 {
207+
font-size: 1.8em;
208+
color: #f94d31;
209+
}
210+
h2, h3 {
211+
font-size: 1.2em;
212+
font-weight: normal;
213+
}
200214
}
201215
}
202216

217+
[data-meetup-ajax="error"],
218+
[data-meetup] {
219+
display: none;
220+
}
221+
203222
/**
204223
* Sprites
205224
*/
206225
.sprite {
207-
background: url(../img/sprites.png) no-repeat;
208-
display: inline-block;
226+
background: url(../img/sprites.png) no-repeat;
227+
display: inline-block;
209228
}
210229

211230
.sprite-calendar {
212-
width: 88px;
213-
height: 100px;
214-
background-position: -0px -0px;
231+
width: 88px;
232+
height: 100px;
233+
background-position: -0px -0px;
215234
}
216235

217236
.sprite-heart {
218-
width: 70px;
219-
height: 63px;
220-
background-position: -111px -77px;
237+
width: 70px;
238+
height: 63px;
239+
background-position: -111px -77px;
221240
}
222241

223242
.sprite-icon-facebook {
224-
width: 32px;
225-
height: 32px;
226-
background-position: -192px -86px;
243+
width: 32px;
244+
height: 32px;
245+
background-position: -192px -86px;
227246
}
228247

229248
.sprite-icon-meetup {
230-
width: 32px;
231-
height: 32px;
232-
background-position: -193px -119px;
249+
width: 32px;
250+
height: 32px;
251+
background-position: -193px -119px;
233252
}
234253

235254
.sprite-icon-google {
236-
width: 32px;
237-
height: 32px;
238-
background-position: -192px -43px;
255+
width: 32px;
256+
height: 32px;
257+
background-position: -192px -43px;
239258
}
240259

241260
.sprite-icon-twitter {
242-
width: 32px;
243-
height: 32px;
244-
background-position: -187px -0px;
261+
width: 32px;
262+
height: 32px;
263+
background-position: -187px -0px;
245264
}
246265

247266
.sprite-social {
248-
width: 100px;
249-
height: 64px;
250-
background-position: -0px -111px;
267+
width: 100px;
268+
height: 64px;
269+
background-position: -0px -111px;
251270
}
252271

253272
.sprite-team {
254-
width: 77px;
255-
height: 66px;
256-
background-position: -99px -0px;
273+
width: 77px;
274+
height: 66px;
275+
background-position: -99px -0px;
257276
}

assets/themes/phpughh/css/main.css

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,29 +144,28 @@ nav.main ul li a {
144144
-moz-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
145145
box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
146146
}
147-
147+
.box.next {
148+
width: 865px;
149+
margin-bottom: 20px;
150+
float: left;
151+
position: relative;
152+
}
148153
.box.next a,
149-
.box.next a:active ,
154+
.box.next a:active,
150155
.box.next a:visited {
151-
color: #333333
156+
color: #333333;
152157
}
153158
.box.next a:hover h1,
154159
.box.next a:hover h2 {
155160
color: #5F5F5F;
156161
}
157-
.box.next {
158-
width: 865px;
159-
margin-bottom: 20px;
160-
float: left;
161-
position: relative;
162-
}
163162
.box.next img.box-top {
164163
position: absolute;
165164
top: -46px;
166165
left: 320px;
167166
}
168167
.box.next img.ajax-loader {
169-
margin-right: 8px;
168+
margin-right: 8px;
170169
}
171170
.box.next .sprite {
172171
display: inline-block;
@@ -196,7 +195,7 @@ nav.main ul li a {
196195
}
197196
[data-meetup-ajax="error"],
198197
[data-meetup] {
199-
display: none;
198+
display: none;
200199
}
201200
/**
202201
* Sprites

0 commit comments

Comments
 (0)