0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

fix license indent and make comments consistent

This commit is contained in:
Jacob Thornton 2011-06-28 14:24:02 -07:00
parent 2da82cd7ca
commit e91a74e8e8
10 changed files with 215 additions and 213 deletions

36
LICENSE
View File

@ -1,24 +1,24 @@
Copyright 2011 Twitter, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
You may obtain a copy of the License below, or at:
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
You may obtain a copy of the License below, or 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.
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.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
@ -77,14 +77,14 @@ Copyright 2011 Twitter, Inc.
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
@ -100,7 +100,7 @@ Copyright 2011 Twitter, Inc.
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
@ -141,7 +141,7 @@ Copyright 2011 Twitter, Inc.
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
@ -149,12 +149,12 @@ Copyright 2011 Twitter, Inc.
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
@ -164,7 +164,7 @@ Copyright 2011 Twitter, Inc.
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
@ -176,7 +176,7 @@ Copyright 2011 Twitter, Inc.
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this

47
bootstrap-1.0.0.css vendored
View File

@ -1,11 +1,11 @@
/*
Master Stylesheet
This file is only for importing all required stylesheets for LESS to include and then compile.
*/
* Master Stylesheet
* This file is only for importing all required stylesheets for LESS to include and then compile.
*/
/*
Global Reset
Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
*/
* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
*/
html, body {
margin: 0;
padding: 0;
@ -88,9 +88,9 @@ aside {
display: block;
}
/*
Preboot
Variables and mixins to pre-ignite any new web development project
*/
* Preboot.less
* Variables and mixins to pre-ignite any new web development project
*/
/* Variables
-------------------------------------------------- */
/* Color Scheme
@ -124,9 +124,9 @@ aside {
content: ".";
}
/*
Scaffolding
Basic and global styles for generating a grid system, structural layout, and page templates
*/
* Scaffolding
* Basic and global styles for generating a grid system, structural layout, and page templates
*/
/* Baseline Grid System
-------------------------------------------------- */
div.row {
@ -411,9 +411,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
border: 0;
}
/*
Typography
Headings, body text, lists, code, and more for a versatile and durable typography system
*/
* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system
*/
/* Body text
-------------------------------------------------- */
p {
@ -668,9 +668,9 @@ span.html__attr_value {
color: #de4a3f;
}
/*
Forms
Base line styles for various input types, form layouts, and states
*/
* Forms.less
* Base line styles for various input types, form layouts, and states
*/
/* Global form styles
-------------------------------------------------- */
form {
@ -1006,8 +1006,9 @@ form.form-stacked ul.inputs-list li label {
padding-top: 0;
}
/*
Tables
*/
* Tables.less
* Tables for, you guessed it, tabular data
*/
/* Baseline styles
-------------------------------------------------- */
table {
@ -1107,9 +1108,9 @@ table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDow
background-color: #e2d5f0;
}
/*
Patterns.less
Repeatable UI elements outside the base styles provided from the scaffolding
*/
* Patterns.less
* Repeatable UI elements outside the base styles provided from the scaffolding
*/
/* Top bar
-------------------------------------------------- */
div.topbar {

6
lib/bootstrap.less vendored
View File

@ -1,7 +1,7 @@
/*
Master Stylesheet
This file is only for importing all required stylesheets for LESS to include and then compile.
*/
* Master Stylesheet
* This file is only for importing all required stylesheets for LESS to include and then compile.
*/
// CSS Reset
@import "reset.less";

View File

@ -1,7 +1,7 @@
/*
Forms
Base line styles for various input types, form layouts, and states
*/
* Forms.less
* Base line styles for various input types, form layouts, and states
*/
/* Global form styles

View File

@ -1,7 +1,7 @@
/*
Patterns.less
Repeatable UI elements outside the base styles provided from the scaffolding
*/
* Patterns.less
* Repeatable UI elements outside the base styles provided from the scaffolding
*/
/* Top bar

View File

@ -1,7 +1,7 @@
/*
Preboot
Variables and mixins to pre-ignite any new web development project
*/
* Preboot.less
* Variables and mixins to pre-ignite any new web development project
*/
/* Variables

View File

@ -1,7 +1,7 @@
/*
Global Reset
Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
*/
* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
*/
// Eric Meyer reset
html, body { margin: 0; padding: 0; }

View File

@ -1,7 +1,7 @@
/*
Scaffolding
Basic and global styles for generating a grid system, structural layout, and page templates
*/
* Scaffolding
* Basic and global styles for generating a grid system, structural layout, and page templates
*/
/* Baseline Grid System
-------------------------------------------------- */

View File

@ -1,6 +1,7 @@
/*
Tables
*/
* Tables.less
* Tables for, you guessed it, tabular data
*/
/* Baseline styles

View File

@ -1,7 +1,7 @@
/*
Typography
Headings, body text, lists, code, and more for a versatile and durable typography system
*/
* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system
*/
/* Body text