Skip to content

Commit

Permalink
Committing SCSS files from external dependencies; bumped version to 0…
Browse files Browse the repository at this point in the history
….1.2.
  • Loading branch information
justin-lau committed Apr 7, 2014
1 parent 81010d9 commit fc3399a
Show file tree
Hide file tree
Showing 63 changed files with 8,519 additions and 8 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/node_modules
/src/scripts/**/*.js
/src/scripts/**/*.js.map
/src/components
/temp
.DS_Store
sftp-config.json
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ui-iconpicker",
"description": "A Bootstrap 3 Icon Picker implemented in AngularJS",
"version": "0.1.1",
"version": "0.1.2",
"keywords": [
"Bootstrap",
"Font Awesome",
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/ui-iconpicker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* ui-iconpicker
*
* @version v0.1.1
* @version v0.1.2
* @author Justin Lau <justin@tclau.com>
* @copyright Copyright (c) 2014 Justin Lau <justin@tclau.com>
* @license The MIT License (MIT)
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/ui-iconpicker.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/styles/ui-iconpicker.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* ui-iconpicker
*
* @version v0.1.1
* @version v0.1.2
* @author Justin Lau <justin@tclau.com>
* @copyright Copyright (c) 2014 Justin Lau <justin@tclau.com>
* @license The MIT License (MIT)
Expand Down
2 changes: 1 addition & 1 deletion dist/styles/ui-iconpicker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ui-iconpicker",
"description": "A Bootstrap 3 Icon Picker implemented in AngularJS",
"version": "0.1.1",
"version": "0.1.2",
"keywords": [
"Bootstrap",
"Font Awesome",
Expand Down Expand Up @@ -36,4 +36,4 @@
"grunt-contrib-watch": "~0.6.1",
"grunt-replace": "~0.7.6"
}
}
}
15 changes: 15 additions & 0 deletions src/components/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*/*

!/.gitignore

!bootstrap-sass/
!bootstrap-sass/vendor
bootstrap-sass/vendor/*
!bootstrap-sass/vendor/assets
bootstrap-sass/vendor/assets/*
!bootstrap-sass/vendor/assets/stylesheets
!bootstrap-sass/vendor/assets/stylesheets/**/*.scss

!font-awesome
!font-awesome/scss
!font-awesome/scss/*.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Core variables and mixins
@import "bootstrap/variables";
@import "bootstrap/mixins";

// Reset
@import "bootstrap/normalize";
@import "bootstrap/print";

// Core CSS
@import "bootstrap/scaffolding";
@import "bootstrap/type";
@import "bootstrap/code";
@import "bootstrap/grid";
@import "bootstrap/tables";
@import "bootstrap/forms";
@import "bootstrap/buttons";

// Components
@import "bootstrap/component-animations";
@import "bootstrap/glyphicons";
@import "bootstrap/dropdowns";
@import "bootstrap/button-groups";
@import "bootstrap/input-groups";
@import "bootstrap/navs";
@import "bootstrap/navbar";
@import "bootstrap/breadcrumbs";
@import "bootstrap/pagination";
@import "bootstrap/pager";
@import "bootstrap/labels";
@import "bootstrap/badges";
@import "bootstrap/jumbotron";
@import "bootstrap/thumbnails";
@import "bootstrap/alerts";
@import "bootstrap/progress-bars";
@import "bootstrap/media";
@import "bootstrap/list-group";
@import "bootstrap/panels";
@import "bootstrap/wells";
@import "bootstrap/close";

// Components w/ JavaScript
@import "bootstrap/modals";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
@import "bootstrap/carousel";

// Utility classes
@import "bootstrap/utilities";
@import "bootstrap/responsive-utilities";
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
//
// Alerts
// --------------------------------------------------


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

.alert {
padding: $alert-padding;
margin-bottom: $line-height-computed;
border: 1px solid transparent;
border-radius: $alert-border-radius;

// Headings for larger alerts
h4 {
margin-top: 0;
// Specified for the h4 to prevent conflicts of changing $headings-color
color: inherit;
}
// Provide class for links that match alerts
.alert-link {
font-weight: $alert-link-font-weight;
}

// Improve alignment and spacing of inner content
> p,
> ul {
margin-bottom: 0;
}
> p + p {
margin-top: 5px;
}
}

// Dismissable alerts
//
// Expand the right padding and account for the close button's positioning.

.alert-dismissable {
padding-right: ($alert-padding + 20);

// Adjust close link position
.close {
position: relative;
top: -2px;
right: -21px;
color: inherit;
}
}

// Alternate styles
//
// Generate contextual modifier classes for colorizing the alert.

.alert-success {
@include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text);
}
.alert-info {
@include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text);
}
.alert-warning {
@include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text);
}
.alert-danger {
@include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
//
// Badges
// --------------------------------------------------


// Base classes
.badge {
display: inline-block;
min-width: 10px;
padding: 3px 7px;
font-size: $font-size-small;
font-weight: $badge-font-weight;
color: $badge-color;
line-height: $badge-line-height;
vertical-align: baseline;
white-space: nowrap;
text-align: center;
background-color: $badge-bg;
border-radius: $badge-border-radius;

// Empty badges collapse automatically (not available in IE8)
&:empty {
display: none;
}

// Quick fix for badges in buttons
.btn & {
position: relative;
top: -1px;
}
.btn-xs & {
top: 0;
padding: 1px 5px;
}
}

// Hover state, but only for links
a.badge {
&:hover,
&:focus {
color: $badge-link-hover-color;
text-decoration: none;
cursor: pointer;
}
}

// Account for counters in navs
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: $badge-active-color;
background-color: $badge-active-bg;
}
.nav-pills > li > a > .badge {
margin-left: 3px;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// Breadcrumbs
// --------------------------------------------------


.breadcrumb {
padding: $breadcrumb-padding-vertical $breadcrumb-padding-horizontal;
margin-bottom: $line-height-computed;
list-style: none;
background-color: $breadcrumb-bg;
border-radius: $border-radius-base;

> li {
display: inline-block;

+ li:before {
content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px;
color: $breadcrumb-color;
}
}

> .active {
color: $breadcrumb-active-color;
}
}

0 comments on commit fc3399a

Please sign in to comment.