Skip to content

Commit

Permalink
Merge pull request #2 from logical42/svgicons
Browse files Browse the repository at this point in the history
Svgicons
  • Loading branch information
goparse committed Mar 7, 2012
2 parents 78193df + 3117666 commit beaa5e3
Show file tree
Hide file tree
Showing 28 changed files with 1,036 additions and 172 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified lib/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/bootstrapped-rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Bootstrapped
module Rails
VERSION = "2.0.0"
VERSION = "2.0.3"
end
end
Binary file modified vendor/.DS_Store
Binary file not shown.
Binary file modified vendor/assets/.DS_Store
Binary file not shown.
Binary file added vendor/assets/fonts/.DS_Store
Binary file not shown.
Binary file added vendor/assets/fonts/iconic_stroke.eot
Binary file not shown.
87 changes: 87 additions & 0 deletions vendor/assets/fonts/iconic_stroke.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vendor/assets/fonts/iconic_stroke.ttf
Binary file not shown.
Binary file added vendor/assets/fonts/iconic_stroke.woff
Binary file not shown.
Binary file modified vendor/assets/javascripts/.DS_Store
Binary file not shown.
16 changes: 14 additions & 2 deletions vendor/assets/javascripts/bootstrapped.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
//= require_self
//= require_directory ./bootstrapped
//= require bootstrapped/bootstrap-transition
//= require bootstrapped/bootstrap-button
//= require bootstrapped/bootstrap-modal
//= require bootstrapped/bootstrap-scrollspy
//= require bootstrapped/bootstrap-dropdown
//= require bootstrapped/bootstrap-alert
//= require bootstrapped/bootstrap-collapse
//= require bootstrapped/bootstrap-tab
//= require bootstrapped/bootstrap-tooltip
//= require bootstrapped/bootstrap-popover
//= require bootstrapped/bootstrap-typeahead



41 changes: 41 additions & 0 deletions vendor/assets/javascripts/jquery-cookie.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/**
* jQuery Cookie plugin
*
* Copyright (c) 2010 Klaus Hartl (stilbuero.de)
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
*/
jQuery.cookie = function (key, value, options) {

// key and at least value given, set cookie...
if (arguments.length > 1 && String(value) !== "[object Object]") {
options = jQuery.extend({}, options);

if (value === null || value === undefined) {
options.expires = -1;
}

if (typeof options.expires === 'number') {
var days = options.expires, t = options.expires = new Date();
t.setDate(t.getDate() + days);
}

value = String(value);

return (document.cookie = [
encodeURIComponent(key), '=',
options.raw ? value : encodeURIComponent(value),
options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
options.path ? '; path=' + options.path : '',
options.domain ? '; domain=' + options.domain : '',
options.secure ? '; secure' : ''
].join(''));
}

// key and possibly options given, get cookie...
options = value || {};
var result, decode = options.raw ? function (s) { return s; } : decodeURIComponent;
return (result = new RegExp('(?:^|; )' + encodeURIComponent(key) + '=([^;]*)').exec(document.cookie)) ? decode(result[1]) : null;
};
Binary file modified vendor/assets/stylesheets/.DS_Store
Binary file not shown.
19 changes: 19 additions & 0 deletions vendor/assets/stylesheets/bootstrap-xtra/mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* MixinsXtra.less
* Snippets of reusable CSS to develop faster and keep code readable
* ----------------------------------------------------------------- */


// Font face generator

@mixin font-face($name, $font-files, $style, $weight, $eot: false) {
$iefont: unquote("#{$eot}?iefix");
@font-face {
font-family: quote($name);
font-style: $style;
font-weight: $weight;
@if $eot {
src: font-url($eot);
$font-files: font-url($iefont) unquote("format('eot')"), $font-files; }
src: $font-files; }

}
178 changes: 178 additions & 0 deletions vendor/assets/stylesheets/bootstrap-xtra/patterns_xtra.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
.btn {
// Button Icons
&.icon {
&:before {
font-family: $iconFontFamily;
font-size: $basefont + 1px;
line-height: $basefont;
color: $iconColor;
content: "";
position:relative;
float:left;
top:1px;
margin: 0 0.55em 0 -0.25em;
}
&.alternative:before {
color: $alternativeIconColor;
}
&.right:before {
float:right;
margin: 0 -0.25em 0 0.5em;
}
&.large:before {
font-size: $basefont + 3px;
}
&.small:before {
font-size: $basefont;
}

// Icons
&.arrowup:before {
content: "0";
}
&.arrowdown:before {
content: "1";
}
&.arrowleft:before {
content: "2";
}
&.arrowright:before {
content: "3";
}
&.approve:before {
content: "4";
}
&.remove:before {
content: "5";
}
&.log:before {
content: "6";
}
&.calendar:before {
content: "7";
}
&.chat:before {
content: "8";
}
&.clock:before {
content: "9";
}
&.settings:before {
content: "a";
}
&.comment:before {
content: "b";
}
&.fork:before {
content: "c";
}
&.like:before {
content: "d";
}
&.home:before {
content: "e";
}
&.key:before {
content: "f";
}
&.lock:before {
content: "g";
}
&.unlock:before {
content: "h";
}
&.loop:before {
content: "i";
}
&.search:before {
content: "j";
}
&.mail:before {
content: "k";
}
&.move:before {
content: "l";
}
&.edit:before {
content: "m";
}
&.pin:before {
content: "n";
}
&.add:before {
content: "o";
}
&.reload:before {
content: "p";
}
&.rss:before {
content: "q";
}
&.tag:before {
content: "r";
}
&.trash:before {
content: "s";
}
&.favorite:before {
content: "t";
}
&.user:before {
content: "u";
}
&.minus:before {
content: "v";
}
&.upload:before {
content: "w";
}
&.transfer:before {
content: "x";
}
&.stop:before {
content: "y";
}
&.movie:before {
content: "z";
}
&.pause:before {
content: "A";
}
&.play:before {
content: "B";
}
&.new-window:before {
content: "C";
}
&.link:before {
content: "D";
}
&.iinfo:before {
content: "E";
}
&.image:before {
content: "F";
}
&.folder:before {
content: "G";
}
&.fullscreen:before {
content: "H";
}
&.fullexit:before {
content: "I";
}
&.share:before {
content: "J";
}
&.undo:before {
content: "K";
}
&.quote:before {
content: "L";
}
&.printer:before {
content: "M";
}
}
}
12 changes: 12 additions & 0 deletions vendor/assets/stylesheets/bootstrap-xtra/type_xtra.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* TypographyXtra.less
* Headings, body text, lists, code, and more for a versatile and durable typography system
* ---------------------------------------------------------------------------------------- */

// ICON FONTS
// ---------
@font-face {
font-family: "IconicStrokeRegular";
src: url("/assets/fonts/iconic_stroke.woff") format("woff");
src: url("/assets/fonts/iconic_stroke.svg#iconic_stroke") format('svg');
src: url("/assets/fonts/iconic_stroke.ttf") format('ttf');
}
13 changes: 13 additions & 0 deletions vendor/assets/stylesheets/bootstrap-xtra/variables_xtra.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* VariablesXtra.less
* Variables to customize the look and feel of Bootstrap
* ----------------------------------------------------- */

//Icons

$iconFontFamily: "IconicStrokeRegular";
$iconFileName: "/assets/fonts/iconic_stroke";
$iconColor: #000;
$basefont: 13px;
$alternativeIconColor: #fff;
$iconBasefont: 13px;
$iconBaseline: 14px;
24 changes: 24 additions & 0 deletions vendor/assets/stylesheets/bootstrap-xtra/xtra.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*!
* Bootstrap Xtra @VERSION
*
* Copyright 2011 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

// Core variables and mixins
@import "variables_xtra.scss";
@import "type_xtra.css.scss";
@import "mixins.scss";

// Grid system and page structure
@import "patterns_xtra.scss";

// Styled patterns and elements


Binary file modified vendor/assets/stylesheets/bootstrapped/.DS_Store
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit beaa5e3

Please sign in to comment.