Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

Commit

Permalink
updated less and js to the latest release
Browse files Browse the repository at this point in the history
- updated package structure to include new glyphicon font
fixes #42
  • Loading branch information
sirkirby committed Jan 28, 2015
1 parent dc7a5c4 commit 3d1905a
Show file tree
Hide file tree
Showing 27 changed files with 499 additions and 331 deletions.
5 changes: 3 additions & 2 deletions src/twitter.bootstrap.less/Twitter.Bootstrap.Less.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Twitter.Bootstrap.Less</id>
<version>3.3.1</version>
<version>3.3.2</version>
<title>Bootstrap Less Source</title>
<authors>Jacob Thornton,Mark Otto</authors>
<owners>sirkirby</owners>
Expand All @@ -14,7 +14,7 @@
<summary>Code and documentation copyright 2011-2014 Twitter, Inc. Code released under the MIT license. Docs released under Creative Commons.</summary>
<releaseNotes>- Latest source release.

http://blog.getbootstrap.com/2014/11/12/bootstrap-3-3-1-released/</releaseNotes>
http://blog.getbootstrap.com/2015/01/19/bootstrap-3-3-2-released/</releaseNotes>
<language>en-US</language>
<tags>twitter less css css3 html5 bootstrap responsive</tags>
<dependencies>
Expand Down Expand Up @@ -96,6 +96,7 @@ http://blog.getbootstrap.com/2014/11/12/bootstrap-3-3-1-released/</releaseNotes>
<file src="glyphicons-halflings-regular.svg" target="content\Content\fonts\glyphicons-halflings-regular.svg" />
<file src="glyphicons-halflings-regular.ttf" target="content\Content\fonts\glyphicons-halflings-regular.ttf" />
<file src="glyphicons-halflings-regular.woff" target="content\Content\fonts\glyphicons-halflings-regular.woff" />
<file src="glyphicons-halflings-regular.woff2" target="content\Content\fonts\glyphicons-halflings-regular.woff2" />
<file src="bootstrap.js" target="content\Scripts\bootstrap.js" />
<file src="bootstrap.min.js" target="content\Scripts\bootstrap.min.js" />
</files>
Expand Down
5 changes: 5 additions & 0 deletions src/twitter.bootstrap.less/alerts.less
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
// 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;
Expand All @@ -28,6 +29,7 @@
> ul {
margin-bottom: 0;
}

> p + p {
margin-top: 5px;
}
Expand Down Expand Up @@ -57,12 +59,15 @@
.alert-success {
.alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);
}

.alert-info {
.alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);
}

.alert-warning {
.alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);
}

.alert-danger {
.alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
}
4 changes: 4 additions & 0 deletions src/twitter.bootstrap.less/badges.less
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
position: relative;
top: -1px;
}

.btn-xs & {
top: 0;
padding: 1px 5px;
Expand All @@ -49,12 +50,15 @@
color: @badge-active-color;
background-color: @badge-active-bg;
}

.list-group-item > & {
float: right;
}

.list-group-item > & + & {
margin-right: 5px;
}

.nav-pills > li > a > & {
margin-left: 3px;
}
Expand Down
Loading

0 comments on commit 3d1905a

Please sign in to comment.