docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for list in compose-file, CSS fixes for blockquotes

This commit is contained in:
John Mulhausen 2016-10-07 13:48:23 -07:00
parent dc8ac3cc4e
commit 8ea375e1d7
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compose/compose-file.md
View File

@ -70,8 +70,8 @@ This will result in an image named `webapp` and tagged `tag`, built from `./dir`
> **Note**: In the [version 1 file format](compose-file.md#version-1), `build` is different in > **Note**: In the [version 1 file format](compose-file.md#version-1), `build` is different in
> two ways: > two ways:
> >
> - Only the string form (`build: .`) is allowed - not the object form. > 1. Only the string form (`build: .`) is allowed - not the object form.
> - Using `build` together with `image` is not allowed. Attempting to do so > 2. Using `build` together with `image` is not allowed. Attempting to do so
> results in an error. > results in an error.
#### context #### context
@ -103,13 +103,15 @@ specified.
> **Note**: In the [version 1 file format](compose-file.md#version-1), `dockerfile` is > **Note**: In the [version 1 file format](compose-file.md#version-1), `dockerfile` is
> different in two ways: > different in two ways:
>
* It appears alongside `build`, not as a sub-option: > 1. It appears alongside `build`, not as a sub-option:
>
build: . > ```
dockerfile: Dockerfile-alternate > build: .
> dockerfile: Dockerfile-alternate
* Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error. > ```
>
> 2. Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
#### args #### args

12
css/documentation.css
View File

@ -16,10 +16,15 @@
font-size: 16px; font-size: 16px;
border-left: 4px solid #6db9d1; border-left: 4px solid #6db9d1;
padding: 6px; padding: 6px;
background-color: #f5f5f5; background-color: #fafafa;
color: black !important;
}
#DocumentationText blockquote li div.highlighter-rouge {
padding-left: 20px;
padding-right: 20px;
} }
#DocumentationText blockquote p { #DocumentationText blockquote p {
color: black; color: black !important;
margin: 0; margin: 0;
padding: 10px 20px; padding: 10px 20px;
} }
@ -27,6 +32,9 @@
color: #6db9d1; color: #6db9d1;
/* most Note's have a non-strong ':' display: block;*/ /* most Note's have a non-strong ':' display: block;*/
} }
#DocumentationText blockquote ol, #DocumentationText blockquote ul {
padding-left: 20px !important;
}
#DocumentationText code { #DocumentationText code {
border-width: 0px !important; border-width: 0px !important;
background-color: #f5f5f5 !important; background-color: #f5f5f5 !important;