Skip to content

Commit b318dc5

Browse files
amirciamirci
committed
Merge branch 'f44_fix_next_event_format' into staging
2 parents 684634b + e537d8d commit b318dc5

26 files changed

Lines changed: 451 additions & 301 deletions

‎src/DotNetUserGroup.Website/Content/home/future_topics.less‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#future-topics {
22
.event-box(#ffd7bb, #ffcaa1, #bc8354, #cd8d68);
3+
border-right:none;
4+
width: 49.5%;
5+
float: right;
6+
37
#topic-list {
48
margin-left: -20px;
59
font-size: 1em;
@@ -16,7 +20,7 @@
1620
.topic {
1721
color: #9e5114;
1822
font-weight: 600;
19-
width: 200px;
23+
width: auto;
2024
display: inline-block;
2125
}
2226

@@ -35,7 +39,7 @@
3539
margin-top: 5px;
3640
font-size: 0.8em;
3741
line-height: 20px;
38-
padding: 0px 5px;
42+
padding: 0 5px;
3943
text-align:center;
4044
width: 40px;
4145

@@ -48,5 +52,14 @@
4852
}
4953
}
5054

55+
@media (max-width: 767px) {
56+
width: 100%;
57+
float: none;
58+
}
59+
@media (max-width: 800px) {
60+
float: none;
61+
width: 100%;
62+
}
63+
5164
}
5265

‎src/DotNetUserGroup.Website/Content/home/home.less‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
.event-box(@start-color; @end-color; @title; @footer) {
2-
display: table-cell;
2+
display: inline-block;
33
border-right: 3px solid @blue-background;
44
padding-left: 20px;
55
padding-top: 10px;
66
opacity: 0.95;
7+
height: 315px;
78
#gradient.vertical(@start-color, @end-color);
89

910
> header {
@@ -14,7 +15,7 @@
1415

1516
.content, ul {
1617
list-style: none;
17-
height: 230px;
18+
height: 186px;
1819
margin-bottom: 10px;
1920
}
2021

@@ -60,34 +61,44 @@
6061
}
6162
}
6263
@media (max-width: 767px) {
63-
pading:0;
64+
padding:0;
6465
border:none;
6566
margin-bottom:20px;
6667
display:block;
6768
}
6869
@media (max-width: 800px) {
69-
pading:0;
70+
padding:0;
7071
border:none;
7172
margin-bottom:20px;
7273
display:block;
7374
}
7475
}
7576

77+
.main-container {
78+
background-image: url('/images/wpg_bridge.jpg');
79+
background-position: 0 -400px;
80+
/*background-repeat: repeat-x;*/
81+
}
82+
7683
#events {
7784
display: table;
7885
width: 100%;
7986
height: 350px;
8087
margin-bottom: 20px;
81-
background-image: url('/images/wpg_bridge.jpg');
82-
background-position: 0px -400px;
83-
background-repeat: repeat-x;
88+
background-color:rgba(200, 200, 200, 0.7) ;
8489

8590
@import 'next_event';
8691
@import 'past_events';
8792
@import 'future_topics';
8893

94+
&.pending {
95+
#next-event {
96+
height: 120px;
97+
}
98+
}
99+
89100
@media (max-width: 767px) {
90-
display: auto;
101+
display:auto;
91102
height: auto;
92103
background-image: none;
93104
}
@@ -96,5 +107,6 @@
96107
height: auto;
97108
background-image: none;
98109
}
110+
99111
}
100112

‎src/DotNetUserGroup.Website/Content/home/next_event.less‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#next-event {
22
.event-box(lighten(#7dd8ff, 10%), #35c7ff, #4fa6ce, #1aa1d7);
3-
width: 50%;
3+
width: 100%;
4+
border-right:none;
5+
margin-bottom:5px;
6+
height: auto;
47

58
.event {
9+
height:auto;
610
.title {
711
color: #115979;
812
font-size: 2em;
@@ -20,11 +24,12 @@
2024
.location {
2125
color: #206484;
2226
font-size: 1em;
27+
margin-top:30px;
2328

2429
.image {
2530
font-size: 2em;
2631
display: table-cell;
27-
margin: 10px 10px 5px 0px;
32+
margin: 10px 10px 5px 0;
2833
text-align: center;
2934
width: 40px;
3035

@@ -57,3 +62,7 @@
5762
width: 100%;
5863
}
5964
}
65+
66+
67+
68+

‎src/DotNetUserGroup.Website/Content/home/past_events.less‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11

22
#past-events {
3-
43
.event-box(#cfecbc, #aee288, #60803d, #60803d);
5-
width: 25%;
4+
border-right:none;
5+
width: 49.8%;
6+
float: left;
67
#event-list {
7-
margin-left: 0px;
8+
margin-left: 0;
89
margin-right: 15px;
910
padding: 0;
1011
li {
@@ -24,8 +25,10 @@
2425

2526
@media (max-width: 767px) {
2627
width: 100%;
28+
float: none;
2729
}
2830
@media (max-width: 800px) {
31+
float: none;
2932
width: 100%;
3033
}
3134
@media (max-width: 1024px) {

0 commit comments

Comments
 (0)