Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated formatting of front page slideshow banner #145

Merged
merged 2 commits into from
Apr 15, 2014
Merged

Updated formatting of front page slideshow banner #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb4592a
updated promo banner formatting and added items to developer resource…
Apr 15, 2014
73e3836
updated slideshow button styles and placement
Apr 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions commotionwireless.net/_includes/developers_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
<h3><a href="/developer/resources">For Developers</a></h3>
<ul>
<li {% if page.url contains '/developer/resources' %} class="active" {% endif %}><a href="/developer/resources/">Developer Resources</a>
{% if page.sub_section contains 'devresources' %}
{% include developers_resources_menu.html %}
{% endif %}
</li>
<li><a href="/jobs">Requests for Proposals</a></li>
<li><a href="https://wiki.commotionwireless.net/">Wiki</a></li>
Expand Down
8 changes: 6 additions & 2 deletions commotionwireless.net/_includes/developers_resources_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<ul class="submenu">
<li {% if page.url contains '/developer/resources/commotion-router' %} class="active" {% endif %}><a href="/developer/resources/commotion-router">Commotion Router</a></li>
<li {% if page.url contains '/developer/resources/commotion-android' %} class="active" {% endif %}><a href="/developer/resources/commotion-android">Commotion Android</a></li>
<li {% if page.url contains '/developer/resources/commotion-router' %} class="active" {% endif %}><a href="/developer/resources/commotion-router">Router</a></li>
<li {% if page.url contains '/developer/resources/commotion-android' %} class="active" {% endif %}><a href="/developer/resources/commotion-android">Android</a></li>
<li><a href="https://wiki.commotionwireless.net/doku.php?id=commotion_architecture:commotion_client_architecture" target="_blank">Linux</a></li>
<li><a href="https://wiki.commotionwireless.net/doku.php?id=commotion_architecture:commotion_client_architecture" target="_blank">Windows</a></li>
<li {% if page.url contains '/developer/resources/commotion-mac' %} class="active" {% endif %}><a href="/developer/resources/commotion-mac/">MacOS/iOS</a></li>
<li><a href="https://wiki.commotionwireless.net/doku.php?id=general_openbts_notes" target="_blank">OpenGSM</a></li>
</ul>
5 changes: 4 additions & 1 deletion commotionwireless.net/css/commotion-responsive-780.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,17 @@ div#slideshow ul.bjqs {
overflow: visible;
}
div#slideshow ul.bjqs-controls {
margin: -15px 1em 0 0;
padding: 0;
text-align: right;
position: relative;
bottom: 4em;
}
div#slideshow ul.bjqs-controls li {
display: inline;
margin: 0;
padding: 0;
}
/*
div#slideshow li.bjqs-prev a, div#slideshow li.bjqs-next a {
background: none repeat scroll 0 0 #00FFCF;
border-radius: 10px 10px 10px 10px;
Expand All @@ -222,6 +224,7 @@ div#slideshow li.bjqs-prev a, div#slideshow li.bjqs-next a {
div#slideshow .bjqs-prev a:hover, div#slideshow .bjqs-next a:hover {
color: #FE739B;
}
*/
div.pageheadings {
float: right;
min-height: 100px;
Expand Down
41 changes: 35 additions & 6 deletions commotionwireless.net/css/commotion.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ div#slideshow ul.bjqs {
overflow: visible;
}
div#slideshow ul.bjqs-controls {
margin: -15px -100px 0 0;
/* margin: -15px -100px 0 0; */
padding: 0;
text-align: right;
}
Expand All @@ -184,19 +184,48 @@ div#slideshow ul.bjqs-controls li {
margin: 0;
padding: 0;
}
div#slideshow li.bjqs-prev a, div#slideshow li.bjqs-next a {
background: none repeat scroll 0 0 #00FFCF;
border-radius: 10px 10px 10px 10px;
div#slideshow li.bjqs-prev {
float: left;
position: relative;
text-align: left;
bottom: 1em;
}
div#slideshow li.bjqs-next {
position: relative;
text-align: right;
bottom: 1em;
left: 1em;
}
div#slideshow li.bjqs-prev a {
background: none repeat scroll 0 0 #FE739B;
border-radius: 20px 20px 20px 20px;
margin: auto 1em auto 0;
padding: 6px 10px;
border-color: #000;
font-size: 0.9em;
font-weight: bold;
color: #428BCA;
color: #000000;
text-decoration: none;
opacity: 0.5;
filter:alpha(opacity=50);
}
div#slideshow li.bjqs-next a {
background: none repeat scroll 0 0 #FE739B;
border-color: #000000;
border-radius: 20px 20px 20px 20px;
color: #000000;
font-size: 0.9em;
font-weight: bold;
margin: auto 1em auto 0;
padding: 6px 10px;
text-decoration: none;
opacity: 0.5;
filter:alpha(opacity=50);
}
.control-button {
}
div#slideshow .bjqs-prev a:hover, div#slideshow .bjqs-next a:hover {
color: #FE739B;
color: #E8FF00;
}
div.pageheadings {
min-height: 100px;
Expand Down
8 changes: 4 additions & 4 deletions commotionwireless.net/js/commotion-front.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ $( document ).ready(function() {

// front page banner definition
$('#banner-slide').bjqs({
animtype : 'slide',
animtype : 'fade',
animduration : 450, // how fast the animation are
animspeed : 4000, // the delay between each slide
animspeed : 6000, // the delay between each slide
height : 150,
width : 800,
responsive : true,
randomstart : false,
centercontrols: false,
showmarkers : false,
hoverpause : true,
nexttext : '>', // Text for 'next' button (can use HTML)
prevtext : '<', // Text for 'previous' button (can use HTML)
nexttext : '<span class="control-button" title="Next slide">></span>', // Text for 'next' button (can use HTML)
prevtext : '<span class="control-button" title="Previous slide"><</span>', // Text for 'previous' button (can use HTML)
});
});

Expand Down