Skip to content

Commit 3bb1966

Browse files
darcyclarkedarcyclarke
committed
Finalized API Sidebar + Responsiveness w Media Queries
1 parent 78353f0 commit 3bb1966

File tree

3 files changed

+83
-34
lines changed

3 files changed

+83
-34
lines changed

‎jquery-ui-api.html

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,36 @@ <h1><a href="#" title="jQuery">jQuery</a></h1>
158158
<!-- body -->
159159
<div id="body" class="clearfix sidebar-right">
160160

161-
<!-- sidebar -->
162-
<aside id="sidebar">
161+
<!-- inner -->
162+
<div class="inner">
163+
164+
<h2 class="underline">Lorem ipsum dolor</h2>
165+
166+
<p>
167+
<strong>Lorem ipsum dolor</strong> sit amet, consectetur adipiscing elit. Praesent non rutrum dolor. Aenean pretium accumsan fermentum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus tempor, dolor non <a href="#" class="external">tincidunt condimentum</a>, dolor leo interdum leo, et venenatis augue mi et dolor. Suspendisse blandit nibh non nunc dictum vitae posuere turpis aliquam. Nullam libero libero, venenatis quis accumsan sed, tincidunt ac lorem. Nunc commodo fringilla tortor, at pharetra magna sagittis non. Nullam volutpat, urna posuere tristique sodales, felis dolor bibendum neque, dictum gravida ante eros venenatis lacus. Duis ut massa mi. In vel blandit eros. Vestibulum adipiscing euismod viverra. Duis at odio lectus, id <a href="#">tincidunt ipsum</a>.
168+
</p>
169+
170+
<p>
171+
<em>Nunc nisl justo</em>, cursus in volutpat non, sollicitudin nec tellus. Phasellus feugiat molestie pellentesque. Mauris mollis dapibus ultricies. Duis odio nulla, sodales auctor imperdiet eget, blandit vel enim. Fusce commodo, leo sit amet pharetra dapibus, ante urna sodales tortor, ut varius orci metus non massa. Vestibulum sem eros, tincidunt et congue ac, placerat eu nisi. Suspendisse tempus iaculis vulputate. Suspendisse vehicula gravida urna quis feugiat. Vestibulum sit amet mi est. Mauris eleifend vulputate urna, at commodo nibh luctus facilisis. Vestibulum ultricies gravida ultricies. Morbi orci erat, cursus in pulvinar in, dictum vitae erat. Donec at sapien et ipsum porttitor auctor. Praesent feugiat nulla tempor sapien malesuada eget congue nibh elementum. Sed hendrerit aliquam egestas. In pharetra interdum blandit. Suspendisse accumsan dui sit amet nulla ultricies eget fermentum tellus tincidunt. Morbi ornare lobortis interdum. Integer cursus, nibh eget commodo lobortis, tortor leo mollis velit, sit amet facilisis libero nibh eget velit. Donec consectetur hendrerit nisl, a aliquam justo aliquet facilisis.
172+
</p>
173+
174+
<div class="col2-1">
175+
<p>
176+
<strike>Duis volutpat</strike>, dui non pharetra bibendum, tortor mauris auctor quam, vitae mollis enim nisi nec enim. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Ut viverra velit imperdiet orci adipiscing lobortis. Pellentesque lobortis lacus at arcu aliquet eu faucibus enim pharetra. Duis pellentesque, mi ac molestie bibendum, nisi elit viverra odio, vel congue mi nisi sit amet nisi. Fusce vel urna risus, non sagittis nibh.
177+
</p>
178+
</div>
179+
180+
<div class="col2-1">
181+
<p>
182+
Praesent vel ipsum nisl. Aenean enim sem, tincidunt ut vulputate a, ultricies id orci. Aenean semper magna at lorem mattis eleifend. In hac habitasse platea dictumst. Mauris commodo nisl non tortor sollicitudin pulvinar. Duis ac nisl urna. Proin mattis elit eget dui ultricies dapibus. In in nulla felis, sed gravida lacus. Donec sit amet aliquet magna. Sed ut ipsum in mauris consectetur congue ac rutrum enim.
183+
</p>
184+
</div>
185+
186+
</div>
187+
<!-- /inner -->
188+
189+
<!-- sidebar -->
190+
<aside id="sidebar" class="clearfix autoHeight">
163191

164192
<h2>jQuery API</h2>
165193

@@ -207,34 +235,6 @@ <h3>Related Links</h3>
207235
</aside>
208236
<!-- /sidebar -->
209237

210-
<!-- inner -->
211-
<div class="inner">
212-
213-
<h2 class="underline">Lorem ipsum dolor</h2>
214-
215-
<p>
216-
<strong>Lorem ipsum dolor</strong> sit amet, consectetur adipiscing elit. Praesent non rutrum dolor. Aenean pretium accumsan fermentum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus tempor, dolor non <a href="#" class="external">tincidunt condimentum</a>, dolor leo interdum leo, et venenatis augue mi et dolor. Suspendisse blandit nibh non nunc dictum vitae posuere turpis aliquam. Nullam libero libero, venenatis quis accumsan sed, tincidunt ac lorem. Nunc commodo fringilla tortor, at pharetra magna sagittis non. Nullam volutpat, urna posuere tristique sodales, felis dolor bibendum neque, dictum gravida ante eros venenatis lacus. Duis ut massa mi. In vel blandit eros. Vestibulum adipiscing euismod viverra. Duis at odio lectus, id <a href="#">tincidunt ipsum</a>.
217-
</p>
218-
219-
<p>
220-
<em>Nunc nisl justo</em>, cursus in volutpat non, sollicitudin nec tellus. Phasellus feugiat molestie pellentesque. Mauris mollis dapibus ultricies. Duis odio nulla, sodales auctor imperdiet eget, blandit vel enim. Fusce commodo, leo sit amet pharetra dapibus, ante urna sodales tortor, ut varius orci metus non massa. Vestibulum sem eros, tincidunt et congue ac, placerat eu nisi. Suspendisse tempus iaculis vulputate. Suspendisse vehicula gravida urna quis feugiat. Vestibulum sit amet mi est. Mauris eleifend vulputate urna, at commodo nibh luctus facilisis. Vestibulum ultricies gravida ultricies. Morbi orci erat, cursus in pulvinar in, dictum vitae erat. Donec at sapien et ipsum porttitor auctor. Praesent feugiat nulla tempor sapien malesuada eget congue nibh elementum. Sed hendrerit aliquam egestas. In pharetra interdum blandit. Suspendisse accumsan dui sit amet nulla ultricies eget fermentum tellus tincidunt. Morbi ornare lobortis interdum. Integer cursus, nibh eget commodo lobortis, tortor leo mollis velit, sit amet facilisis libero nibh eget velit. Donec consectetur hendrerit nisl, a aliquam justo aliquet facilisis.
221-
</p>
222-
223-
<div class="col2-1">
224-
<p>
225-
<strike>Duis volutpat</strike>, dui non pharetra bibendum, tortor mauris auctor quam, vitae mollis enim nisi nec enim. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Ut viverra velit imperdiet orci adipiscing lobortis. Pellentesque lobortis lacus at arcu aliquet eu faucibus enim pharetra. Duis pellentesque, mi ac molestie bibendum, nisi elit viverra odio, vel congue mi nisi sit amet nisi. Fusce vel urna risus, non sagittis nibh.
226-
</p>
227-
</div>
228-
229-
<div class="col2-1">
230-
<p>
231-
Praesent vel ipsum nisl. Aenean enim sem, tincidunt ut vulputate a, ultricies id orci. Aenean semper magna at lorem mattis eleifend. In hac habitasse platea dictumst. Mauris commodo nisl non tortor sollicitudin pulvinar. Duis ac nisl urna. Proin mattis elit eget dui ultricies dapibus. In in nulla felis, sed gravida lacus. Donec sit amet aliquet magna. Sed ut ipsum in mauris consectetur congue ac rutrum enim.
232-
</p>
233-
</div>
234-
235-
</div>
236-
<!-- /inner -->
237-
238238
</div>
239239
<!-- /body -->
240240

‎resources/css/style.css

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ footer .presentations {
15751575
#container #body.sidebar-right #sidebar {
15761576
float: right;
15771577
border-left: 1px solid #cccccc;
1578-
}
1578+
}
15791579

15801580
#container #body.sidebar-right #sidebar {
15811581
-webkit-border-bottom-right-radius: 8px;
@@ -1603,10 +1603,10 @@ footer .presentations {
16031603

16041604
#container #body #sidebar {
16051605
width: 20.5%;
1606-
min-height: 100%;
1607-
display: block;
16081606
position: relative;
1607+
display: block;
16091608
background: #eeeeee;
1609+
float: left;
16101610
padding: 0 1.5%;
16111611
}
16121612

@@ -1826,7 +1826,7 @@ footer .presentations {
18261826
margin: 20px auto;
18271827
float: none;
18281828
}
1829-
1829+
18301830
header nav.constrain {
18311831
padding: 0
18321832
}
@@ -1881,6 +1881,34 @@ footer .presentations {
18811881
display: inline !important;
18821882
}
18831883

1884+
#container #body #sidebar {
1885+
-webkit-border-bottom-left-radius: 8px;
1886+
-webkit-border-bottom-right-radius: 8px;
1887+
-moz-border-radius: 0 0 8px 8px;
1888+
border-radius: 0 0 8px 8px;
1889+
height: auto !important;
1890+
border-top: 1px solid #e1e1e1;
1891+
}
1892+
1893+
#container #body.sidebar-left #sidebar,
1894+
#container #body.sidebar-right #sidebar {
1895+
clear: both;
1896+
float: left;
1897+
padding: 0 3% 3%;
1898+
width: 94%;
1899+
}
1900+
1901+
#container #body #sidebar hr {
1902+
margin: 0 0 15px 0;
1903+
width: 100%;
1904+
}
1905+
1906+
#container #body.sidebar-left .inner,
1907+
#container #body.sidebar-right .inner {
1908+
padding: 3%;
1909+
width: 94%;
1910+
}
1911+
18841912
footer ul.books {
18851913
overflow: hidden;
18861914
}

‎resources/js/scripts.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,29 @@ App.subscribe("init", function(){
123123
.delegate("li a", "mouseleave", function () {
124124
$(this).find("span").stop(true, false).fadeOut(250);
125125
});
126+
127+
autoHeight();
128+
129+
$(window).resize(function(){
130+
autoHeight();
131+
});
132+
133+
function autoHeight(){
134+
$(".autoHeight").each(function(){
135+
var el = $(this), parent = el.parent();
136+
console.log(el.height("auto").height());
137+
console.log(el.height("auto").height() + " : " + parent.height());
138+
if(parent.height() >= el.height("auto").height()){
139+
el.css({"height":parent.height()});
140+
} else {
141+
el.css({"height":el.height("auto").height()});
142+
}
143+
});
144+
}
145+
126146
});
127147

128148

129149

130150

151+

0 commit comments

Comments
 (0)