Skip to content
This repository has been archived by the owner on Mar 10, 2020. It is now read-only.

Commit

Permalink
Upgraded bootstrap & jquery.
Browse files Browse the repository at this point in the history
This is a basic step towards a new homepage (issue #5).

Closes #7.
  • Loading branch information
mcollina committed Sep 24, 2012
1 parent 5374414 commit 51aae28
Show file tree
Hide file tree
Showing 60 changed files with 16,702 additions and 1,007 deletions.
34 changes: 34 additions & 0 deletions app/assets/css/lib/accordion.less
@@ -0,0 +1,34 @@
//
// Accordion
// --------------------------------------------------


// Parent container
.accordion {
margin-bottom: @baseLineHeight;
}

// Group == heading + body
.accordion-group {
margin-bottom: 2px;
border: 1px solid #e5e5e5;
.border-radius(4px);
}
.accordion-heading {
border-bottom: 0;
}
.accordion-heading .accordion-toggle {
display: block;
padding: 8px 15px;
}

// General toggle styles
.accordion-toggle {
cursor: pointer;
}

// Inner needs the styles because you can't animate properly with any styles on the element
.accordion-inner {
padding: 9px 15px;
border-top: 1px solid #e5e5e5;
}
65 changes: 65 additions & 0 deletions app/assets/css/lib/alerts.less
@@ -0,0 +1,65 @@
//
// Alerts
// --------------------------------------------------


// Base styles
// -------------------------

.alert {
padding: 8px 35px 8px 14px;
margin-bottom: @baseLineHeight;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
background-color: @warningBackground;
border: 1px solid @warningBorder;
.border-radius(4px);
color: @warningText;
}
.alert h4 {
margin: 0;
}

// Adjust close link position
.alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: @baseLineHeight;
}


// Alternate styles
// -------------------------

.alert-success {
background-color: @successBackground;
border-color: @successBorder;
color: @successText;
}
.alert-danger,
.alert-error {
background-color: @errorBackground;
border-color: @errorBorder;
color: @errorText;
}
.alert-info {
background-color: @infoBackground;
border-color: @infoBorder;
color: @infoText;
}


// Block alerts
// -------------------------

.alert-block {
padding-top: 14px;
padding-bottom: 14px;
}
.alert-block > p,
.alert-block > ul {
margin-bottom: 0;
}
.alert-block p + p {
margin-top: 5px;
}
46 changes: 41 additions & 5 deletions app/assets/css/lib/bootstrap.less
@@ -1,12 +1,11 @@
/*!
* Bootstrap @VERSION
* Bootstrap v2.1.1
*
* Copyright 2011 Twitter, Inc
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: @DATE
*/

// CSS Reset
Expand All @@ -18,9 +17,46 @@

// Grid system and page structure
@import "scaffolding.less";
@import "grid.less";
@import "layouts.less";

// Styled patterns and elements
// Base CSS
@import "type.less";
@import "code.less";
@import "forms.less";
@import "tables.less";
@import "patterns.less";

// Components: common
@import "sprites.less";
@import "dropdowns.less";
@import "wells.less";
@import "component-animations.less";
@import "close.less";

// Components: Buttons & Alerts
@import "buttons.less";
@import "button-groups.less";
@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less

// Components: Nav
@import "navs.less";
@import "navbar.less";
@import "breadcrumbs.less";
@import "pagination.less";
@import "pager.less";

// Components: Popovers
@import "modals.less";
@import "tooltip.less";
@import "popovers.less";

// Components: Misc
@import "thumbnails.less";
@import "labels-badges.less";
@import "progress-bars.less";
@import "accordion.less";
@import "carousel.less";
@import "hero-unit.less";

// Utility classes
@import "utilities.less"; // Has to be last to override when necessary
24 changes: 24 additions & 0 deletions app/assets/css/lib/breadcrumbs.less
@@ -0,0 +1,24 @@
//
// Breadcrumbs
// --------------------------------------------------


.breadcrumb {
padding: 8px 15px;
margin: 0 0 @baseLineHeight;
list-style: none;
background-color: #f5f5f5;
.border-radius(4px);
li {
display: inline-block;
.ie7-inline-block();
text-shadow: 0 1px 0 @white;
}
.divider {
padding: 0 5px;
color: #ccc;
}
.active {
color: @grayLight;
}
}

0 comments on commit 51aae28

Please sign in to comment.