Skip to content

Commit 7bb1506

Browse files
Merge pull request #442 from carolineyanko/source
Fix layout of lists, events table on mobile devices
2 parents 8387aa6 + 3053f60 commit 7bb1506

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

events.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
padding: 5px;
88
position: relative;
99
}
10+
.month-table-wrapper{
11+
overflow: auto;
12+
}
1013

1114
/*.month-table:before, .month-table:after {
1215
content: "";

js/table.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,15 @@ function generateMonthTable( date ) {
9595
var eventMonthName = monthNames[date.getMonth()]
9696
var monthTable = $('<table cellspacing=0 class="month-table" data-month="' + date.getFullYear() + "-" + eventMonthName + '" id="month-' + date.getMonth() + '"></table>')
9797
var monthTableBody = monthTable.append('<tbody>')
98+
var monthTableWrapper = $('<div class="month-table-wrapper">').append(monthTable)
9899
// var today = new Date()
99100
var endOfToday = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 00, 00, 00)
100101
var firstDay = new Date(date.getFullYear(), date.getMonth(), 1)
101102
var numberOfDays = new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate()
102103
var weekDayNumber = firstDay.getDay()
103104

104-
$('#calendar-goes-here').append(monthTable)
105-
monthTable.before('<h3 data-month="' + date.getFullYear() + '-' + eventMonthName + '">' + eventMonthName + ' ' + date.getFullYear() + '</h3>')
105+
$('#calendar-goes-here').append(monthTableWrapper)
106+
monthTableWrapper.before('<h3 data-month="' + date.getFullYear() + '-' + eventMonthName + '">' + eventMonthName + ' ' + date.getFullYear() + '</h3>')
106107

107108
// Add month calendar header
108109
monthTableBody.append('<tr class="header"></tr>')

style.css

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,21 @@ ul.inner-nav li {padding-right: 30px; display: inline;}
6969
.inner-nav a {border-color: #F7DA03; color: #333; border-color: #F7DA03; padding: 0 10px 3px 10px; border-bottom-width: 2px;}
7070
.inner-nav a:hover {color: #F7DA03; border-color: #F7DA03;}*/
7171

72-
ul.inner-nav {list-style: none;}
73-
ul.inner-nav li {margin-right: 12px; display: inline-block; line-height: 3em;}
74-
ul.inner-nav li:last-of-type {margin-right: 0;}
72+
ul.inner-nav {list-style: none; margin: 0; padding: 0;}
73+
ul.inner-nav li {margin-right: 6px; margin-left: 6px; display: inline-block; line-height: 3em;}
7574
.inner-nav a {background-color: #F7DA03; color: #333; border: none; padding: 8px 12px; border-radius: 3px;}
7675
.inner-nav a:hover {color: #fff; background-color: #333;}
7776
span.no-break {display:inline-block;}
7877

79-
ul.nav {display: inline; list-style: none; color: #333; /*text-transform: uppercase;*/ font-weight: 700; letter-spacing: .1em; padding-left: 0;}
80-
ul.nav li {display: inline; font-size: 16px; margin-right: 10px;}
81-
ul.nav li:last-of-type {margin-right: 0;}
82-
ul.nav li a {display: inline-block; padding: 6px 8px; border: 2px solid #333; border-radius: 3px; margin-bottom: 10px;}
78+
ul.nav {display: inline-block; margin: 0; list-style: none; color: #333; /*text-transform: uppercase;*/ font-weight: 700; letter-spacing: .1em; padding-left: 0;}
79+
ul.nav li {display: inline-block; font-size: 16px;margin: 0 5px 5px; padding: 0; border: 2px solid #333; border-radius: 3px;}
80+
ul.nav li a {display: inline-block; padding: 6px 8px;}
8381
ul.nav li:hover a {color: #F7DA03; background: #333; cursor: pointer;}
8482
ul.nav li.current-page a {background: #333; color: #FFE51F;}
8583
header .full:after {content: ''; display: block; clear: both;}
8684

87-
ul.nav-lang {list-style: none; margin: 0; padding: 5px 20px; text-align: right}
88-
ul.nav-lang li {border: none; margin-right: none; display: inline;}
85+
ul.nav-lang {list-style: none; margin: 0; padding: 5px 20px; text-align: right;}
86+
ul.nav-lang li {border: none; margin-right: 0; display: inline-block;}
8987
ul.nav-lang li a {color: #333; text-decoration: none; border-color: #333;}
9088
ul.nav-lang li a:hover {color: #666; border-color: #666;}
9189
ul.nav-lang li:after {content: "|"; margin-right: 5px; margin-left: 5px;}
@@ -195,13 +193,13 @@ footer .container {padding: 0 40px;}
195193
header .container { padding: 20px; }
196194
.full { width: 95%; }
197195
.core-workshoppers h4 a, .elective-workshoppers h4 a { font-size: 16px; }
198-
ul.inner-nav li {display: inline-block; line-height: 3em;}
196+
/*ul.inner-nav li {display: inline-block; line-height: 3em;}*/
199197
.window-pane { display: none; }
200198
}
201199

202200
@media (max-width: 768px) {
203201
h1 { font-size: 2.0em; }
204-
.container {padding: 20px;}
202+
.container {padding: 5px;}
205203
.first-photo {background-image: none;}
206204
p {font-size: 1em;}
207205
.third, .two-thirds, .full, .half {width: 100%; }

0 commit comments

Comments
 (0)