diff --git a/test.commotion/_config.yml b/test.commotion/_config.yml index 1f5b5912..cd838a93 100644 --- a/test.commotion/_config.yml +++ b/test.commotion/_config.yml @@ -1,11 +1,10 @@ name: "Commotion Wireless" -description: "description goes here" +description: "Commotion is an open-source communication tool that uses mobile phones, computers, and other wireless devices to create decentralized mesh networks." encoding: utf-8 url: "test.commotionwireless.net" port: 80 -paginate: 10 permalink: pretty diff --git a/test.commotion/_includes/footer.html b/test.commotion/_includes/footer.html index 50589bf2..2596621f 100644 --- a/test.commotion/_includes/footer.html +++ b/test.commotion/_includes/footer.html @@ -1,5 +1,5 @@ - + + + diff --git a/test.commotion/_includes/footer.html~ b/test.commotion/_includes/footer.html~ deleted file mode 100644 index 924311ed..00000000 --- a/test.commotion/_includes/footer.html~ +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/test.commotion/_includes/header.html b/test.commotion/_includes/header.html index 437edd2c..043bfe04 100644 --- a/test.commotion/_includes/header.html +++ b/test.commotion/_includes/header.html @@ -31,21 +31,76 @@ -
+
+ Commotion Wireless logo +
+
+ +
+
+ +
+

{{ page.title }}

+
+
+
diff --git a/test.commotion/config.json b/test.commotion/config.json new file mode 100644 index 00000000..bd599a5a --- /dev/null +++ b/test.commotion/config.json @@ -0,0 +1,53 @@ +{ + "vars": {}, + "css": [ + "print.less", + "type.less", + "code.less", + "grid.less", + "tables.less", + "forms.less", + "buttons.less", + "glyphicons.less", + "button-groups.less", + "input-groups.less", + "navs.less", + "navbar.less", + "breadcrumbs.less", + "pagination.less", + "pager.less", + "labels.less", + "badges.less", + "jumbotron.less", + "thumbnails.less", + "alerts.less", + "progress-bars.less", + "media.less", + "list-group.less", + "panels.less", + "wells.less", + "close.less", + "dropdowns.less", + "tooltip.less", + "popovers.less", + "modals.less", + "carousel.less", + "utilities.less", + "responsive-utilities.less", + "component-animations.less" + ], + "js": [ + "alert.js", + "button.js", + "carousel.js", + "dropdown.js", + "modal.js", + "tooltip.js", + "popover.js", + "tab.js", + "affix.js", + "collapse.js", + "scrollspy.js", + "transition.js" + ] +} \ No newline at end of file diff --git a/test.commotion/css/bootstrap.css b/test.commotion/css/bootstrap.css index b6858faa..3a853ce0 100644 --- a/test.commotion/css/bootstrap.css +++ b/test.commotion/css/bootstrap.css @@ -3486,7 +3486,7 @@ input[type="button"].btn-block { margin: 2px 0 0; font-size: 14px; list-style: none; - background-color: #ffffff; + background-color: #00FFCF; border: 1px solid #cccccc; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 4px; @@ -3521,7 +3521,7 @@ input[type="button"].btn-block { .dropdown-menu > li > a:focus { color: #262626; text-decoration: none; - background-color: #f5f5f5; + background-color: #E8FF00; } .dropdown-menu > .active > a, @@ -4079,8 +4079,10 @@ textarea.input-group-sm > .input-group-btn > .btn { .nav > li > a:hover, .nav > li > a:focus { - text-decoration: none; - background-color: #eeeeee; + color: #000000; + background-color: #FFFFFF; + border-bottom: 3px solid #E8FF00; + margin-bottom: 0; } .nav > li.disabled > a { @@ -4098,8 +4100,7 @@ textarea.input-group-sm > .input-group-btn > .btn { .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { - background-color: #eeeeee; - border-color: #428bca; + border-color: #FF739C; } .nav .open > a .caret, @@ -7130,3 +7131,51 @@ td.visible-print { width: 5%; float: left; } +ul.main-menu { + display: block; + float: right; + width: 80%; + margin-right: 2em; + list-style: none; + list-style-type: none; +} +ul.main-menu li { + width: 20%; + display: block; + float: left; +} +ul.main-menu li a { + display: block; +} +ul.main-menu ul li { + list-style: none; + list-style-type: none; + display: block; +} +ul.main-menu li ul { + display: none; +} +li.dropdown a, +li.dropdown a:visited, +li.static-nodrop a, +li.static-nodrop a:visited { + color: #000000; + text-decoration: none; + text-transform: uppercase; +} +.promo { + width: 100%; + min-height: 10em; + position: relative; + z-index: 10; + margin-top: -5.5em; +} +.contentcontainer { + background: url('/images/black_tri.png') center top no-repeat; + margin-right: auto; + margin-left: auto; +} +.footer-wrapper { + background: url('/images/white_tri.png') no-repeat center top #00FFCF; + color: #000000; +} diff --git a/test.commotion/js/bootstrap.js b/test.commotion/js/bootstrap.js index 1c638ab4..ef04057f 100644 --- a/test.commotion/js/bootstrap.js +++ b/test.commotion/js/bootstrap.js @@ -1,72 +1,5 @@ -/*! - * Bootstrap v3.0.2 by @fat and @mdo - * Copyright 2013 Twitter, Inc. - * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. - */ - -if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } - -/* ======================================================================== - * Bootstrap: transition.js v3.0.2 - * http://getbootstrap.com/javascript/#transitions - * ======================================================================== - * Copyright 2013 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================================== */ - - -+function ($) { "use strict"; - - // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) - // ============================================================ - - function transitionEnd() { - var el = document.createElement('bootstrap') - - var transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - - for (var name in transEndEventNames) { - if (el.style[name] !== undefined) { - return { end: transEndEventNames[name] } - } - } - } - - // http://blog.alexmaccaw.com/css-transitions - $.fn.emulateTransitionEnd = function (duration) { - var called = false, $el = this - $(this).one($.support.transition.end, function () { called = true }) - var callback = function () { if (!called) $($el).trigger($.support.transition.end) } - setTimeout(callback, duration) - return this - } - - $(function () { - $.support.transition = transitionEnd() - }) - -}(jQuery); - /* ======================================================================== - * Bootstrap: alert.js v3.0.2 + * Bootstrap: alert.js v3.0.3 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -165,7 +98,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: button.js v3.0.2 + * Bootstrap: button.js v3.0.3 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -220,15 +153,21 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" Button.prototype.toggle = function () { var $parent = this.$element.closest('[data-toggle="buttons"]') + var changed = true if ($parent.length) { var $input = this.$element.find('input') - .prop('checked', !this.$element.hasClass('active')) - .trigger('change') - if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + if ($input.prop('type') === 'radio') { + // see if clicking on current one + if ($input.prop('checked') && this.$element.hasClass('active')) + changed = false + else + $parent.find('.active').removeClass('active') + } + if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') } - this.$element.toggleClass('active') + if (changed) this.$element.toggleClass('active') } @@ -275,7 +214,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: carousel.js v3.0.2 + * Bootstrap: carousel.js v3.0.3 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -345,7 +284,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (pos > (this.$items.length - 1) || pos < 0) return - if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) if (activeIndex == pos) return this.pause().cycle() return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) @@ -397,7 +336,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (this.$indicators.length) { this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { + this.$element.one('slid.bs.carousel', function () { var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) $nextIndicator && $nextIndicator.addClass('active') }) @@ -415,7 +354,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) + setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) }) .emulateTransitionEnd(600) } else { @@ -424,7 +363,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $active.removeClass('active') $next.addClass('active') this.sliding = false - this.$element.trigger('slid') + this.$element.trigger('slid.bs.carousel') } isCycling && this.cycle() @@ -493,187 +432,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: collapse.js v3.0.2 - * http://getbootstrap.com/javascript/#collapse - * ======================================================================== - * Copyright 2013 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================================== */ - - -+function ($) { "use strict"; - - // COLLAPSE PUBLIC CLASS DEFINITION - // ================================ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, Collapse.DEFAULTS, options) - this.transitioning = null - - if (this.options.parent) this.$parent = $(this.options.parent) - if (this.options.toggle) this.toggle() - } - - Collapse.DEFAULTS = { - toggle: true - } - - Collapse.prototype.dimension = function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - Collapse.prototype.show = function () { - if (this.transitioning || this.$element.hasClass('in')) return - - var startEvent = $.Event('show.bs.collapse') - this.$element.trigger(startEvent) - if (startEvent.isDefaultPrevented()) return - - var actives = this.$parent && this.$parent.find('> .panel > .in') - - if (actives && actives.length) { - var hasData = actives.data('bs.collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('bs.collapse', null) - } - - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - .addClass('collapsing') - [dimension](0) - - this.transitioning = 1 - - var complete = function () { - this.$element - .removeClass('collapsing') - .addClass('in') - [dimension]('auto') - this.transitioning = 0 - this.$element.trigger('shown.bs.collapse') - } - - if (!$.support.transition) return complete.call(this) - - var scrollSize = $.camelCase(['scroll', dimension].join('-')) - - this.$element - .one($.support.transition.end, $.proxy(complete, this)) - .emulateTransitionEnd(350) - [dimension](this.$element[0][scrollSize]) - } - - Collapse.prototype.hide = function () { - if (this.transitioning || !this.$element.hasClass('in')) return - - var startEvent = $.Event('hide.bs.collapse') - this.$element.trigger(startEvent) - if (startEvent.isDefaultPrevented()) return - - var dimension = this.dimension() - - this.$element - [dimension](this.$element[dimension]()) - [0].offsetHeight - - this.$element - .addClass('collapsing') - .removeClass('collapse') - .removeClass('in') - - this.transitioning = 1 - - var complete = function () { - this.transitioning = 0 - this.$element - .trigger('hidden.bs.collapse') - .removeClass('collapsing') - .addClass('collapse') - } - - if (!$.support.transition) return complete.call(this) - - this.$element - [dimension](0) - .one($.support.transition.end, $.proxy(complete, this)) - .emulateTransitionEnd(350) - } - - Collapse.prototype.toggle = function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - - // COLLAPSE PLUGIN DEFINITION - // ========================== - - var old = $.fn.collapse - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.collapse') - var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - - if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.Constructor = Collapse - - - // COLLAPSE NO CONFLICT - // ==================== - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - // COLLAPSE DATA-API - // ================= - - $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - var target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - var $target = $(target) - var data = $target.data('bs.collapse') - var option = data ? 'toggle' : $this.data() - var parent = $this.attr('data-parent') - var $parent = parent && $(parent) - - if (!data || !data.transitioning) { - if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') - $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - } - - $target.collapse(option) - }) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: dropdown.js v3.0.2 + * Bootstrap: dropdown.js v3.0.3 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -700,7 +459,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" var backdrop = '.dropdown-backdrop' var toggle = '[data-toggle=dropdown]' var Dropdown = function (element) { - var $el = $(element).on('click.bs.dropdown', this.toggle) + $(element).on('click.bs.dropdown', this.toggle) } Dropdown.prototype.toggle = function (e) { @@ -715,7 +474,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (!isActive) { if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { - // if mobile we we use a backdrop because click events don't delegate + // if mobile we use a backdrop because click events don't delegate $('