Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
1e9b4506
Commit
1e9b4506
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
add image styles, for now to scaffolding (soon to own file)
parent
64741907
6 merge requests
!4427
Use variable for desktop media query
,
!4258
Aria
,
!4248
Amended mentions of 'javascript' to the correct 'JavaScript'
,
!4235
Patch 1
,
!4232
Fixing the modal z-index issue + make modal stacking possible
,
!4213
2.1.0 wip
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/assets/css/bootstrap.css
+22
-0
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
+6
-0
docs/assets/css/docs.css
docs/base-css.html
+25
-0
docs/base-css.html
docs/templates/pages/base-css.mustache
+25
-0
docs/templates/pages/base-css.mustache
less/scaffolding.less
+22
-0
less/scaffolding.less
with
100 additions
and
0 deletions
+100
-0
docs/assets/css/bootstrap.css
+
22
-
0
View file @
1e9b4506
...
@@ -175,6 +175,28 @@ a:hover {
...
@@ -175,6 +175,28 @@ a:hover {
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
.img-rounded
{
-webkit-border-radius
:
6px
;
-moz-border-radius
:
6px
;
border-radius
:
6px
;
}
.img-polaroid
{
padding
:
4px
;
background-color
:
#fff
;
border
:
1px
solid
#ccc
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.2
);
-webkit-box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0.1
);
-moz-box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0.1
);
box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0.1
);
}
.img-circle
{
-webkit-border-radius
:
500px
;
-moz-border-radius
:
500px
;
border-radius
:
500px
;
}
.row
{
.row
{
margin-left
:
-20px
;
margin-left
:
-20px
;
*
zoom
:
1
;
*
zoom
:
1
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.css
+
6
-
0
View file @
1e9b4506
...
@@ -632,6 +632,12 @@ form.bs-docs-example {
...
@@ -632,6 +632,12 @@ form.bs-docs-example {
line-height
:
24px
;
line-height
:
24px
;
}
}
/* Images */
.bs-docs-example-images
img
{
margin
:
10px
;
display
:
inline-block
;
}
/* Tooltips */
/* Tooltips */
.bs-docs-tooltip-examples
{
.bs-docs-tooltip-examples
{
text-align
:
center
;
text-align
:
center
;
...
...
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
25
-
0
View file @
1e9b4506
...
@@ -92,6 +92,7 @@
...
@@ -92,6 +92,7 @@
<li><a
href=
"#tables"
>
Tables
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#tables"
>
Tables
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#forms"
>
Forms
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#forms"
>
Forms
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#buttons"
>
Buttons
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#buttons"
>
Buttons
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#images"
>
Images
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#icons"
>
Icons by Glyphicons
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#icons"
>
Icons by Glyphicons
<i
class=
"icon-chevron-right"
></i></a></li>
</ul>
</ul>
</div>
</div>
...
@@ -1517,6 +1518,30 @@ For example, <code>section</code> should be wrapped as inline.
...
@@ -1517,6 +1518,30 @@ For example, <code>section</code> should be wrapped as inline.
<!-- Images
================================================== -->
<section
id=
"images"
>
<div
class=
"page-header"
>
<h1>
Images
</h1>
</div>
<p>
Simple classes to easily style images in any project.
</p>
<div
class=
"bs-docs-example bs-docs-example-images"
>
<img
src=
"http://placehold.it/140x140"
class=
"img-rounded"
>
<img
src=
"http://placehold.it/140x140"
class=
"img-circle"
>
<img
src=
"http://placehold.it/140x140"
class=
"img-polaroid"
>
</div>
<pre
class=
"prettyprint linenums"
>
<
img src="..." class="img-rounded"
>
<
img src="..." class="img-circle"
>
<
img src="..." class="img-polaroid"
>
</pre>
</section>
<!-- Icons
<!-- Icons
================================================== -->
================================================== -->
<section
id=
"icons"
>
<section
id=
"icons"
>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
25
-
0
View file @
1e9b4506
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
<li><a
href=
"#tables"
>
{{
_i
}}
Tables
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#tables"
>
{{
_i
}}
Tables
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#forms"
>
{{
_i
}}
Forms
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#forms"
>
{{
_i
}}
Forms
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#buttons"
>
{{
_i
}}
Buttons
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#buttons"
>
{{
_i
}}
Buttons
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#images"
>
{{
_i
}}
Images
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#icons"
>
{{
_i
}}
Icons by Glyphicons
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
<li><a
href=
"#icons"
>
{{
_i
}}
Icons by Glyphicons
{{/
i
}}
<i
class=
"icon-chevron-right"
></i></a></li>
</ul>
</ul>
</div>
</div>
...
@@ -1454,6 +1455,30 @@
...
@@ -1454,6 +1455,30 @@
<!-- Images
================================================== -->
<section
id=
"images"
>
<div
class=
"page-header"
>
<h1>
{{
_i
}}
Images
{{/
i
}}
</h1>
</div>
<p>
Simple classes to easily style images in any project.
</p>
<div
class=
"bs-docs-example bs-docs-example-images"
>
<img
src=
"http://placehold.it/140x140"
class=
"img-rounded"
>
<img
src=
"http://placehold.it/140x140"
class=
"img-circle"
>
<img
src=
"http://placehold.it/140x140"
class=
"img-polaroid"
>
</div>
<pre
class=
"prettyprint linenums"
>
<
img src="..." class="img-rounded"
>
<
img src="..." class="img-circle"
>
<
img src="..." class="img-polaroid"
>
</pre>
</section>
<!-- Icons
<!-- Icons
================================================== -->
================================================== -->
<section
id=
"icons"
>
<section
id=
"icons"
>
...
...
This diff is collapsed.
Click to expand it.
less/scaffolding.less
+
22
-
0
View file @
1e9b4506
...
@@ -27,3 +27,25 @@ a:hover {
...
@@ -27,3 +27,25 @@ a:hover {
color: @linkColorHover;
color: @linkColorHover;
text-decoration: underline;
text-decoration: underline;
}
}
// Images
// -------------------------
.img-rounded {
.border-radius(6px);
}
.img-polaroid {
padding: 4px;
background-color: #fff;
border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.2);
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,.1);
-moz-box-shadow: 0 1px 3px rgba(0,0,0,.1);
box-shadow: 0 1px 3px rgba(0,0,0,.1);
}
.img-circle {
.border-radius(500px);
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets