Add CSS for option to create inline images (like whale menu) (#3877)

* add CSS tests for Josh

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* new class inline for images, updated docs to call class

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* removing last test paragraph

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-07-13 16:07:43 -07:00 committed by GitHub
parent 928e6a1d65
commit d2cf85be8a
8 changed files with 52 additions and 34 deletions

View File

@ -58,6 +58,9 @@ i.fa.fa-outdent {
padding: 0px 15px 10px 15px; padding: 0px 15px 10px 15px;
} }
img.inline {
display: inline;
}
/* /*
* Search ********************************************************************* * Search *********************************************************************
@ -259,4 +262,3 @@ div#autocompleteResults span {
input.gsc-search-button, input.gsc-search-button:hover, input.gsc-search-button:focus { input.gsc-search-button, input.gsc-search-button:hover, input.gsc-search-button:focus {
display: none!important; display: none!important;
} }

View File

@ -100,8 +100,8 @@ docker-machine version 0.10.0, build 76ed2a6
## Preferences ## Preferences
Choose ![whale-x](/docker-for-mac/images/whale-x.png) --> **Preferences** from Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} ->
the menu bar. **Preferences** from the menu bar.
![Docker context menu](images/menu-prefs-selected.png) ![Docker context menu](images/menu-prefs-selected.png)
@ -122,10 +122,10 @@ see [Docker Cloud](#docker-cloud).
open your session. open your session.
* Docker for Mac is set to **automatically check for updates** and notify * Docker for Mac is set to **automatically check for updates** and notify
you when an update is available. If an update is found, click **OK** to you when an update is available. If an update is found, click **OK** to accept
accept and install it (or cancel to keep the current version). If you and install it (or cancel to keep the current version). If you disable the check
disable the check for updates, you can still find out about updates manually for updates, you can still find out about updates manually by choosing ![whale
by choosing ![whale-x](/docker-for-mac/images/whale-x.png) -> **Check for Updates** menu](/docker-for-mac/images/whale-x.png){: .inline} -> **Check for Updates**
* Check **Include VM in Time Machine backups** to back up the Docker for Mac virtual machine. (By default, this is unchecked.) * Check **Include VM in Time Machine backups** to back up the Docker for Mac virtual machine. (By default, this is unchecked.)
@ -294,8 +294,9 @@ choose to discard or not apply changes when asked.
![Docker Daemon](/docker-for-mac/images/settings-daemon-beta.png) ![Docker Daemon](/docker-for-mac/images/settings-daemon-beta.png)
## Uninstall or reset ## Uninstall or reset
Choose ![whale-x](/docker-for-mac/images/whale-x.png) --> **Preferences** from Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} ->
the menu bar, then click **Uninstall / Reset** on the Preferences dialog. **Preferences** from the menu bar, then click **Uninstall / Reset** on the
Preferences dialog.
![Uninstall or reset Docker](images/settings-uninstall.png) ![Uninstall or reset Docker](images/settings-uninstall.png)

View File

@ -145,14 +145,14 @@ explanation and list of prerequisites.
![Whale in menu bar](/docker-for-mac/images/whale-in-menu-bar.png) ![Whale in menu bar](/docker-for-mac/images/whale-in-menu-bar.png)
If you just installed the app, you also get a success message with suggested If you just installed the app, you also get a success message with suggested
next steps and a link to this documentation. Click the whale (![whale](/docker-for-mac/images/whale-x.png)) next steps and a link to this documentation. Click the whale (![whale
in the status bar to dismiss this popup. menu](/docker-for-mac/images/whale-x.png){: .inline}) in the status bar to
dismiss this popup.
![Startup information](/docker-for-mac/images/mac-install-success-docker-cloud.png) ![Startup information](/docker-for-mac/images/mac-install-success-docker-cloud.png)
3. Click the whale (![whale-x](images/whale-x.png)) to get Preferences and 3. Click the whale (![whale menu](/docker-for-mac/images/whale-x.png){: .inline}) to get Preferences and other options.
other options.
![Docker context menu](images/menu.png) ![Docker context menu](images/menu.png)

View File

@ -5,10 +5,10 @@ title: Open source components and licensing
notoc: true notoc: true
--- ---
Docker Desktop Editions are built using open source software. For Docker Desktop Editions are built using open source software.
details on the licensing, choose <img src="../images/whale-x.png"> --> For details on the licensing, choose
**About Docker** from within the application, then click ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -->
**Acknowledgements**. **About Docker** from within the application, then click **Acknowledgements**.
Docker Desktop Editions distribute some components that are licensed under the Docker Desktop Editions distribute some components that are licensed under the
GNU General Public License. You can download the source for these components GNU General Public License. You can download the source for these components

View File

@ -55,10 +55,10 @@ Desktop boot etc lib lib64 media opt root sbin sys usr
bin dev home lib32 libx32 mnt proc run srv tmp var bin dev home lib32 libx32 mnt proc run srv tmp var
``` ```
By default, you can share files in `/Users/`, `/Volumes/`, `/private/`, and `/tmp` By default, you can share files in `/Users/`, `/Volumes/`, `/private/`, and
directly. `/tmp` directly. To add or remove directory trees that are exported to Docker,
To add or remove directory trees that are exported to Docker, use the use the **File sharing** tab in Docker preferences ![whale
**File sharing** tab in Docker preferences ![Docker Preferences](images/whale-x.png) -> **Preferences** -> menu](/docker-for-mac/images/whale-x.png){: .inline} -> **Preferences** ->
**File sharing**. (See [Preferences](index.md#preferences).) **File sharing**. (See [Preferences](index.md#preferences).)
All other paths All other paths

View File

@ -22,8 +22,8 @@ GitHub](https://github.com/docker/for-mac/issues) already filed by other users,
or on the [Docker for Mac forum](https://forums.docker.com/c/docker-for-mac), we or on the [Docker for Mac forum](https://forums.docker.com/c/docker-for-mac), we
can help you troubleshoot the log data. can help you troubleshoot the log data.
Choose <img src="../images/whale-x.png"> --> **Diagnose & Feedback** from the Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -->
menu bar. **Diagnose & Feedback** from the menu bar.
![Diagnose problems](images/settings-diagnose.png) ![Diagnose problems](images/settings-diagnose.png)
@ -156,8 +156,9 @@ start (e.g., with [Docker Compose](/compose/gettingstarted.md)), you might
need to enable [file sharing](index.md#file-sharing). need to enable [file sharing](index.md#file-sharing).
Volume mounting requires shared drives for projects that live outside of the Volume mounting requires shared drives for projects that live outside of the
`/Users` directory. Go to <img src="images/whale-x.png"> --> **Preferences** --> `/Users` directory. Go to ![whale menu](/docker-for-mac/images/whale-x.png){:
**File sharing** and share the drive that contains the Dockerfile and volume. .inline} --> **Preferences** --> **File sharing** and share the drive that
contains the Dockerfile and volume.
### Recreate or update your containers after Beta 18 upgrade ### Recreate or update your containers after Beta 18 upgrade
@ -278,7 +279,10 @@ know before you install](install.md#what-to-know-before-you-install).
* If Docker for Mac fails to install or start properly: * If Docker for Mac fails to install or start properly:
* Make sure you quit Docker for Mac before installing a new version of the application ( <img src="../images/whale-x.png"> --> **Quit Docker**). Otherwise, you will get an "application in use" error when you try to copy the new app from the `.dmg` to `/Applications`. * Make sure you quit Docker for Mac before installing a new version
of the application ( ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> **Quit Docker**). Otherwise, you will get an
"application in use" error when you try to copy the new app
from the `.dmg` to `/Applications`.
* Restart your Mac to stop / discard any vestige of the daemon running from the previously installed version. * Restart your Mac to stop / discard any vestige of the daemon running from the previously installed version.
@ -337,11 +341,20 @@ Docker for Mac does not yet support IPv6. See "IPv6 workaround to auto-filter DN
<p></p> <p></p>
* Docker does not auto-start on login even when it is enabled in <img src="../images/whale-x.png"> --> **Preferences**. This is related to a set of issues with Docker helper, registration, and versioning. * Docker does not auto-start on login even when it is enabled in
![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> **Preferences**. This is related to a set of issues with Docker
helper, registration, and versioning.
<p></p> <p></p>
* Docker for Mac uses the `HyperKit` hypervisor (https://github.com/docker/hyperkit) in macOS 10.10 Yosemite and higher. If you are developing with tools that have conflicts with `HyperKit`, such as [Intel Hardware Accelerated Execution Manager (HAXM)](https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager/), the current workaround is not to run them at the same time. You can pause `HyperKit` by quitting Docker for Mac temporarily while you work with HAXM. This will allow you to continue work with the other tools and prevent `HyperKit` from interfering. * Docker for Mac uses the `HyperKit` hypervisor (https://github.com/docker/hyperkit) in macOS 10.10 Yosemite and higher. If you
are developing with tools that have conflicts with `HyperKit`, such as [Intel
Hardware Accelerated Execution Manager
(HAXM)](https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager/),
the current workaround is not to run them at the same time. You can pause
`HyperKit` by quitting Docker for Mac temporarily while you work with HAXM. This
will allow you to continue work with the other tools and prevent `HyperKit` from
interfering.
<p></p> <p></p>

View File

@ -5,8 +5,8 @@ title: Open source components and licensing
notoc: true notoc: true
--- ---
Docker Desktop Editions are built using open source software. For Docker Desktop Editions are built using open source software. For details on the
details on the licensing, choose <img src="../images/whale-x.png"> licensing, choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline}
-->&nbsp;**About** from within the application, then click **Acknowledgements**. -->&nbsp;**About** from within the application, then click **Acknowledgements**.
Docker Desktop Editions distribute some components that are licensed under the Docker Desktop Editions distribute some components that are licensed under the

View File

@ -120,9 +120,11 @@ application file is not found, a volume mount is denied, or a service cannot
start (e.g., with [Docker Compose](/compose/gettingstarted.md)), you might need start (e.g., with [Docker Compose](/compose/gettingstarted.md)), you might need
to enable [shared drives](index.md#shared-drives). to enable [shared drives](index.md#shared-drives).
Volume mounting requires shared drives for Linux containers (not for Windows Volume mounting requires shared drives for Linux containers
containers). Go to <img src="images/whale-x.png"> --> **Settings** --> **Shared (not for Windows containers). Go to
Drives** and share the drive that contains the Dockerfile and volume. ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -->
**Settings** --> **Shared Drives** and share the drive that
contains the Dockerfile and volume.
### Verify domain user has permissions for shared drives (volumes) ### Verify domain user has permissions for shared drives (volumes)