mirror of https://github.com/docker/docs.git
Merge branch 'master' into master
This commit is contained in:
Brett Inman
GitHub
commit
98549b194e
|
|
@ -468,10 +468,6 @@
|
|||
<footer class="footer">
|
||||
{% include footer.html %}
|
||||
</footer>
|
||||
<script src="/js/theme-switcher.js"></script>
|
||||
<script src="/js/jquery.js"></script>
|
||||
<script src="/js/bootstrap.min.js"></script>
|
||||
<script defer src="/js/search.js"></script>
|
||||
|
||||
<script>
|
||||
window.onChangeHelpTab = function (name) {
|
||||
|
|
|
|||
|
|
@ -73,11 +73,5 @@
|
|||
{% include footer.html %}
|
||||
</footer>
|
||||
<script>const pageURL = "{{ page.url }}";</script>
|
||||
<script src="/js/theme-switcher.js"></script>
|
||||
<script defer src="/js/anchorlinks.js"></script>
|
||||
<script src="/js/jquery.js"></script>
|
||||
<script src="/js/bootstrap.min.js"></script>
|
||||
<script defer src="/js/docs.js"></script>
|
||||
<script defer src="/js/search.js"></script>
|
||||
{%- include analytics/polldaddy.html -%}
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -43,10 +43,41 @@
|
|||
<meta name="theme-color" content="#2496ed" />
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
{%- comment -%}
|
||||
We put these scripts in the head section, but use "defer" loading to allow the
|
||||
browser to start loading them as soon as possible. Actual execution of deferred
|
||||
scripts happens once the HTML is fully parsed.
|
||||
see https://flaviocopes.com/javascript-async-defer/#with-defer-in-the-head
|
||||
{%- endcomment -%}
|
||||
{%- if page.landing == true -%}
|
||||
<!-- landing page scripts -->
|
||||
<script defer src="/js/theme-switcher.js"></script>
|
||||
<script defer src="/js/jquery.js"></script>
|
||||
<script defer src="/js/bootstrap.min.js"></script>
|
||||
<script defer src="/js/search.js"></script>
|
||||
{%- else -%}
|
||||
<script defer src="/js/theme-switcher.js"></script>
|
||||
<script defer src="/js/anchorlinks.js"></script>
|
||||
<script defer src="/js/jquery.js"></script>
|
||||
<script defer src="/js/bootstrap.min.js"></script>
|
||||
<script defer src="/js/docs.js"></script>
|
||||
<script defer src="/js/search.js"></script>
|
||||
{%- endif -%}
|
||||
|
||||
{%- comment -%}
|
||||
preload fonts: https://www.freecodecamp.org/news/web-fonts-in-2018-f191a48367e8/
|
||||
we only preload the "woff2" variants, as older formats (woff, eot) are only used
|
||||
by older browsers, and we don't optimize for those.
|
||||
{%- endcomment -%}
|
||||
<link rel="preload" as="font" href="/fonts/geomanist/hinted-Geomanist-Book.woff2" type="font/woff2" crossorigin="anonymous">
|
||||
<link rel="preload" as="font" href="/fonts/geomanist/hinted-Geomanist-Regular.woff2" type="font/woff2" crossorigin="anonymous">
|
||||
<link rel="preload" as="font" href="/fonts/glyphicons-halflings-regular.woff2" type="font/woff2" crossorigin="anonymous">
|
||||
<link rel="preload" as="font" href="/fonts/fontawesome-webfont.woff2?v=4.7.0" type="font/woff2" crossorigin="anonymous">
|
||||
|
||||
<link rel="stylesheet" href="/css/font-awesome.min.css">
|
||||
<link rel="stylesheet" href="/css/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="/css/style.css" id="pagestyle">
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans">
|
||||
|
||||
<!-- SEO stuff -->
|
||||
<meta name="twitter:title" itemprop="title name" content="{{ page.title | default: page_title }}"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
<div id="navbar" class="nav-sidebar">
|
||||
<ul class="nav jsTOCHorizontal hidden-md hidden-lg">
|
||||
</ul>
|
||||
<div class="divider hidden-md hidden-lg"></div>
|
||||
<ul class="nav" id="jsTOCLeftNav">
|
||||
</ul>
|
||||
<ul class="nav jsTOCHorizontal hidden-md hidden-lg"></ul>
|
||||
<ul class="nav" id="jsTOCLeftNav"></ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,12 @@ body.landing {
|
|||
}
|
||||
|
||||
.header {
|
||||
// Container holds both the top-navigation bar (div.navbar-header), and
|
||||
// the "hamburger menu" (div.navbar-collapse)
|
||||
>.container {
|
||||
background-color: $bg-header;
|
||||
}
|
||||
|
||||
@include md-width {
|
||||
.navbar-collapse.collapse {
|
||||
display: flex !important;
|
||||
|
|
|
|||
|
|
@ -213,3 +213,9 @@ body.night {
|
|||
color: $white!important;
|
||||
}
|
||||
}
|
||||
|
||||
body.landing.night {
|
||||
.header>.container {
|
||||
background-color: $bg-header-night;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
src: url("../fonts/geomanist/hinted-Geomanist-Book.eot?#iefix") format("embedded-opentype"), url("../fonts/geomanist/hinted-Geomanist-Book.woff2") format("woff2"), url("../fonts/geomanist/hinted-Geomanist-Book.woff") format("woff"), url("../fonts/geomanist/hinted-Geomanist-Book.ttf") format("truetype"), url("../fonts/geomanist/hinted-Geomanist-Book.svg#Geomanist-Book") format("svg");
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
|
|
@ -16,6 +17,26 @@
|
|||
src: url("../fonts/geomanist/hinted-Geomanist-Regular.eot?#iefix") format("embedded-opentype"), url("../fonts/geomanist/hinted-Geomanist-Regular.woff2") format("woff2"), url("../fonts/geomanist/hinted-Geomanist-Regular.woff") format("woff"), url("../fonts/geomanist/hinted-Geomanist-Regular.ttf") format("truetype"), url("../fonts/geomanist/hinted-Geomanist-Book.svg#Geomanist-Regular") format("svg");
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
|
||||
/*
|
||||
* inlining the style from https://fonts.googleapis.com/css?family=Open+Sans&display=swap
|
||||
*
|
||||
* We're only including the "latin" glyphs. While including @font-faces for more
|
||||
* glyphs would not cause the fonts to be loaded, it would make the stylesheet
|
||||
* itself larger, and we don't need those glyhps for our purpose as the website
|
||||
* is written in US-English; https://stackoverflow.com/a/14897846/1811501
|
||||
*/
|
||||
|
||||
/* latin */
|
||||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: local('Open Sans Regular'), local('OpenSans-Regular'), url(https://fonts.gstatic.com/s/opensans/v18/mem8YaGs126MiZpBA-UFVZ0bf8pkAg.woff2) format('woff2');
|
||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
||||
}
|
||||
|
||||
h1,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -11,6 +11,36 @@ This page contains information about Docker Desktop Edge releases. Edge releases
|
|||
For information about Stable releases, see the [Stable release notes](release-notes.md). For Docker Desktop system requirements, see
|
||||
[What to know before you install](install.md#what-to-know-before-you-install).
|
||||
|
||||
## Docker Desktop Community 2.4.2.0
|
||||
2020-10-19
|
||||
|
||||
> [Download](https://desktop.docker.com/mac/edge/48975/Docker.dmg)
|
||||
|
||||
### New
|
||||
|
||||
- If you have enabled [Vulnerability Scanning](/docker-hub/vulnerability-scanning/) in Docker Hub, the scan results will now appear in Docker Desktop.
|
||||
|
||||
### Upgrades
|
||||
|
||||
- [Docker Engine 20.10.0 beta1](https://github.com/docker/docker-ce/blob/0fc7084265b3786a5867ec311d3f916af7bf7a23/CHANGELOG.md)
|
||||
- [Docker Compose CLI - 0.1.22](https://github.com/docker/compose-cli/releases/tag/v0.1.22)
|
||||
- [Linux kernel 5.4.39](https://hub.docker.com/layers/linuxkit/kernel/5.4.39-f39f83d0d475b274938c86eaa796022bfc7063d2/images/sha256-8614670219aca0bb276d4749e479591b60cd348abc770ac9ecd09ee4c1575405?context=explore).
|
||||
- [Kubernetes 1.19.2](https://github.com/kubernetes/kubernetes/releases/tag/v1.19.2)
|
||||
- [Go 1.15.2](https://github.com/golang/go/issues?q=milestone:Go1.15.2+label:CherryPickApproved)
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
- When sharing Linux directories (`/var`, `/bin`, etc) with containers, Docker Desktop avoids watching paths in the host file system.
|
||||
- When sharing a file into a container (e.g. `docker run -v ~/.gitconfig`) Docker Desktop does not watch the parent directory. Fixes [docker/for-mac#4981](https://github.com/docker/for-mac/issues/4981).
|
||||
- gRPC FUSE: fix `chown` when the file is read-only. Fixes `rabbitmq`, see [docker/for-mac#4964](https://github.com/docker/for-mac/issues/4964).
|
||||
- gRPC FUSE: generate `ATTRIB` inotify events as well as `MODIFY`. Fixes [docker/for-mac#4962](https://github.com/docker/for-mac/issues/4962).
|
||||
- gRPC FUSE: return `EOPNOTSUPP` from `fallocate` for unsupported modes. Fixes `minio`. See [docker/for-mac#4964](https://github.com/docker/for-mac/issues/4964).
|
||||
- Fixed an issue related to NFS mounting. See [docker/for-mac#4958](https://github.com/docker/for-mac/issues/4958).
|
||||
- Always flush file system caches synchronously on container start. See [docker/for-mac#4943](https://github.com/docker/for-mac/issues/4943).
|
||||
- Allow symlinks to point outside of shared volumes. Fixes [docker/for-mac#4862](https://github.com/docker/for-mac/issues/4862).
|
||||
- Diagnostics: avoid hanging when Kubernetes is in a broken state.
|
||||
- Fixed automatic start on log in. See [docker/for-mac#4877] and [docker/for-mac#4890].
|
||||
|
||||
## Docker Desktop Community 2.4.1.0
|
||||
2020-10-01
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,37 @@ This page contains information about Docker Desktop Edge releases. Edge releases
|
|||
For information about Stable releases, see the [Stable release notes](release-notes.md). For Docker Desktop system requirements, see
|
||||
[What to know before you install](install.md#what-to-know-before-you-install).
|
||||
|
||||
## Docker Desktop Community 2.4.2.0
|
||||
2020-10-19
|
||||
|
||||
> [Download](https://desktop.docker.com/win/edge/48975/Docker%20Desktop%20Installer.exe)
|
||||
|
||||
### New
|
||||
|
||||
- If you have enabled [Vulnerability Scanning](/docker-hub/vulnerability-scanning/) in Docker Hub, the scan results will now appear in Docker Desktop.
|
||||
|
||||
### Upgrades
|
||||
|
||||
- [Docker Engine 20.10.0 beta1](https://github.com/docker/docker-ce/blob/0fc7084265b3786a5867ec311d3f916af7bf7a23/CHANGELOG.md)
|
||||
- [Docker Compose CLI - 0.1.22](https://github.com/docker/compose-cli/releases/tag/v0.1.22)
|
||||
- [Linux kernel 5.4.39](https://hub.docker.com/layers/linuxkit/kernel/5.4.39-f39f83d0d475b274938c86eaa796022bfc7063d2/images/sha256-8614670219aca0bb276d4749e479591b60cd348abc770ac9ecd09ee4c1575405?context=explore)
|
||||
- [Kubernetes 1.19.2](https://github.com/kubernetes/kubernetes/releases/tag/v1.19.2)
|
||||
- [Go 1.15.2](https://github.com/golang/go/issues?q=milestone:Go1.15.2+label:CherryPickApproved)
|
||||
|
||||
* Deprecation
|
||||
- Docker Desktop cannot be installed on Windows 1703 (build 15063) anymore.
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
- Fixed an issue that can intermittently cause the WSL 2 backend to fail to start.
|
||||
- Fixed an issue related to NFS mounting. See [docker/for-mac#4958](https://github.com/docker/for-mac/issues/4958).
|
||||
- Fixed an issue with http proxy exclude lists containing entries such as `localhost` or `127.0.0.1`. Fixes [docker/for-win#8750](https://github.com/docker/for-win/issues/8750).
|
||||
- When WSL integration process unexpectedly stops, the user is now notified and can decide to restart it or not, instead of always try to restart it in a loop. fixes [docker/for-win#8968](https://github.com/docker/for-win/issues/8968).
|
||||
- Fixed an issue related to container logs that lag under heavy load. Fixes [docker/for-win#8216](https://github.com/docker/for-win/issues/8216).
|
||||
- Diagnostics: avoid hanging when Kubernetes is in a broken state.
|
||||
- When sharing a file into a container (e.g. `docker run -v ~/.gitconfig`) Docker Desktop does not watch the parent directory. Fixes [docker/for-mac#4981](https://github.com/docker/for-mac/issues/4981).
|
||||
- Always flush file system caches synchronously on container start. See [docker/for-mac#4943](https://github.com/docker/for-mac/issues/4943).
|
||||
|
||||
## Docker Desktop Community 2.4.1.0
|
||||
2020-10-01
|
||||
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ If you are using any third-party platforms, follow your provider’s instruction
|
|||
- [CircleCI](https://circleci.com/docs/2.0/private-images/){: target="_blank" rel="noopener" class="_"}
|
||||
- [Codefresh](https://codefresh.io/docs/docs/docker-registries/external-docker-registries/docker-hub/){: target="_blank" rel="noopener" class="_"}
|
||||
- [Drone.io](https://docs.drone.io/pipeline/docker/syntax/images/#pulling-private-images){: target="_blank" rel="noopener" class="_"}
|
||||
- [LayerCI](https://layerci.com/docs/advanced-workflows#logging-in-to-docker){: target="_blank" rel="noopener" class="_"}
|
||||
|
||||
## Other Limits
|
||||
|
||||
|
|
|
|||
|
|
@ -60,36 +60,6 @@ insufficient, it is still recommended to inherit from an Official Image
|
|||
base OS image to leverage the ongoing maintenance work, rather than duplicating
|
||||
these efforts.
|
||||
|
||||
## Official Image Vulnerability Scanning
|
||||
|
||||
Each of the images in the Official Images is scanned for vulnerabilities. The
|
||||
results of these security scans provide valuable information about which images
|
||||
contain security vulnerabilities, and allow you to choose images that align with
|
||||
your security standards.
|
||||
|
||||
To view the Docker Security Scanning results:
|
||||
|
||||
1. Make sure you're logged in to Docker Hub. You can view Official Images even
|
||||
while logged out, however the scan results are only available once you log
|
||||
in.
|
||||
|
||||
2. Navigate to the repository of the Official Image whose security scan you want
|
||||
to view.
|
||||
|
||||
3. Click the `Tags` tab to see a list of tags. and their security scan summaries.
|
||||
|
||||
|
||||
|
||||
4. Click on a tag to see the image's security scan summary.
|
||||
|
||||
|
||||
|
||||
|
||||
You can click into a tag's detail page to see more information about which
|
||||
layers in the image and which components within the layer are vulnerable.
|
||||
Details including a link to the official CVE report for the vulnerability appear
|
||||
when you click an individual vulnerable component.
|
||||
|
||||
## Submitting Feedback for Official Images
|
||||
|
||||
All Official Images contain a **User Feedback** section in their
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ is not supported by Docker nor is it eligible to become Certified.
|
|||
|
||||
| If your content: | Can publish | Can be Certified | Supported by publisher |
|
||||
|:-----|:--------|:------|:-----|
|
||||
| Works on Docker Enterprise | YES | YES | Required |
|
||||
| Works on Docker Community | YES | NO | Optional |
|
||||
| Does not work on Docker Certified Infrastructure | NO | N/A | N/A |
|
||||
|
||||
|
|
@ -185,85 +184,10 @@ response-time expectations, where applicable.
|
|||
|
||||
## Security and audit policies
|
||||
|
||||
Docker Hub [scans](#docker-security-scanning) your content for
|
||||
vulnerabilities with the Docker Security Scanning tool, and
|
||||
Docker Hub
|
||||
[audits](#usage-audit-and-reporting) consumer activity of your images to provide
|
||||
you intelligence about the use of your product.
|
||||
|
||||
### Docker Security Scanning
|
||||
|
||||
Docker Security Scanning automatically and continuously assesses the integrity
|
||||
of your products. The Docker Security Scanning tool deconstructs an image,
|
||||
conducts a binary scan of the bits to identify the open-source components
|
||||
present in each image layer, and associates those components with known
|
||||
vulnerabilities and exposures.
|
||||
|
||||
Docker then shares the scan results with you as the publisher, so that you can
|
||||
modify the content of your images as necessary. Your scan results are private,
|
||||
and are never shared with end customers or other publishers.
|
||||
|
||||
#### Interpret results
|
||||
|
||||
To interpret the results of a scanned image:
|
||||
|
||||
1. Log on to [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
2. Navigate to the repository details page (for example,
|
||||
[nodejs](https://hub.docker.com/_/nodejs){: target="_blank" rel="noopener" class="_"}).
|
||||
|
||||
3. Click **Tags**.
|
||||
|
||||
|
||||
|
||||
In this section, you can now view the different architectures separately to
|
||||
easily identify the right image for the architecture you need, complete
|
||||
with image size and operating system information.
|
||||
|
||||
|
||||
|
||||
4. Click on the digest for a particular architecture. You can now also see the
|
||||
actual source of the image: the layer-by-layer details that make up the image.
|
||||
|
||||
|
||||
|
||||
5. Click on any row in the **Image History** list. You’ll see that the image contains multiple components, and that some of them have known vulnerabilities ranging from minor to critical. To explore further, click on the caret to expand and view all of the found vulnerabilities:
|
||||
|
||||
|
||||
|
||||
Each vulnerability is linked directly to the CVE (Common Vulnerabilities and Exposures) list entry so that you can learn more about the CVE entry and its implications.
|
||||
|
||||
#### Classification of issues
|
||||
|
||||
* All Scan results include the CVE numbers and a CVSS (Common Vulnerability
|
||||
Scoring System) Score.
|
||||
|
||||
* CVE Identifiers (also referred to by the community as "CVE names," "CVE
|
||||
numbers," "CVE entries," "CVE-IDs," and "CVEs") are unique identifiers for
|
||||
publicly-known, cyber-security vulnerabilities.
|
||||
|
||||
* The Common Vulnerability Scoring System (CVSS) provides an open
|
||||
framework for communicating the characteristics and impacts of
|
||||
IT vulnerabilities. Its quantitative model ensures repeatable,
|
||||
accurate measurement while enabling users to see the underlying
|
||||
vulnerability characteristics that were used to generate the scores.
|
||||
As a result, CVSS is well-suited as a standard measurement system
|
||||
for industries, organizations, and governments that need accurate
|
||||
and consistent vulnerability-impact scores. CVSS is commonly used
|
||||
to prioritize vulnerability-remediation activities, and calculate
|
||||
the severity of vulnerabilities discovered on systems. The
|
||||
National Vulnerability Database (NVD) provides CVSS scores for
|
||||
almost all known vulnerabilities.
|
||||
|
||||
* In addition to CVSS, the Docker Security team can identify or classify
|
||||
vulnerabilities that need to be fixed, and categorize them in the
|
||||
minor-to-critical range.
|
||||
|
||||
* The publisher is presented with initial scan results, including all components
|
||||
with their CVEs and their CVSS scores.
|
||||
|
||||
* If you use Docker’s Scanning Service, you can subscribe to a notification
|
||||
service for new vulnerabilities.
|
||||
|
||||
### Usage audit and reporting
|
||||
|
||||
Unless otherwise negotiated, an audit of activity on publisher content is
|
||||
|
|
|
|||
|
|
@ -9,6 +9,12 @@ toc_max: 2
|
|||
Here you can learn about the latest changes, new features, bug fixes, and
|
||||
known issues for each Docker Hub release.
|
||||
|
||||
# 2020-10-07
|
||||
|
||||
### New features
|
||||
|
||||
* Docker introduces Hub Vulnerability Scanning which enables you to automatically scan Docker images for vulnerabilities using Snyk. For more information, see [Hub Vulnerability Scanning](vulnerability-scanning.md).
|
||||
|
||||
# 2020-05-14
|
||||
|
||||
### New features
|
||||
|
|
|
|||
|
|
@ -1,213 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Transfonter demo</title>
|
||||
<link href="stylesheet.css" rel="stylesheet">
|
||||
<style>
|
||||
/*
|
||||
http://meyerweb.com/eric/tools/css/reset/
|
||||
v2.0 | 20110126
|
||||
License: none (public domain)
|
||||
*/
|
||||
html, body, div, span, applet, object, iframe,
|
||||
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
|
||||
a, abbr, acronym, address, big, cite, code,
|
||||
del, dfn, em, img, ins, kbd, q, s, samp,
|
||||
small, strike, strong, sub, sup, tt, var,
|
||||
b, u, i, center,
|
||||
dl, dt, dd, ol, ul, li,
|
||||
fieldset, form, label, legend,
|
||||
table, caption, tbody, tfoot, thead, tr, th, td,
|
||||
article, aside, canvas, details, embed,
|
||||
figure, figcaption, footer, header, hgroup,
|
||||
menu, nav, output, ruby, section, summary,
|
||||
time, mark, audio, video {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
font-size: 100%;
|
||||
font: inherit;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
/* HTML5 display-role reset for older browsers */
|
||||
article, aside, details, figcaption, figure,
|
||||
footer, header, hgroup, menu, nav, section {
|
||||
display: block;
|
||||
}
|
||||
body {
|
||||
line-height: 1;
|
||||
}
|
||||
ol, ul {
|
||||
list-style: none;
|
||||
}
|
||||
blockquote, q {
|
||||
quotes: none;
|
||||
}
|
||||
blockquote:before, blockquote:after,
|
||||
q:before, q:after {
|
||||
content: '';
|
||||
content: none;
|
||||
}
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
}
|
||||
/* common styles */
|
||||
body {
|
||||
background: #f1f1f1;
|
||||
color: #000;
|
||||
}
|
||||
.page {
|
||||
background: #fff;
|
||||
width: 940px;
|
||||
margin: 0 auto;
|
||||
padding: 20px 20px 0 20px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.font-container {
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
margin-bottom: 40px;
|
||||
line-height: 1.3;
|
||||
white-space: nowrap;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
h1 {
|
||||
position: relative;
|
||||
background: #444;
|
||||
font-size: 32px;
|
||||
color: #fff;
|
||||
padding: 10px 20px;
|
||||
margin: 0 -20px 10px -20px;
|
||||
}
|
||||
.letters {
|
||||
font-size: 25px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.s10:before {
|
||||
content: '10px';
|
||||
}
|
||||
.s11:before {
|
||||
content: '11px';
|
||||
}
|
||||
.s12:before {
|
||||
content: '12px';
|
||||
}
|
||||
.s14:before {
|
||||
content: '14px';
|
||||
}
|
||||
.s18:before {
|
||||
content: '18px';
|
||||
}
|
||||
.s24:before {
|
||||
content: '24px';
|
||||
}
|
||||
.s30:before {
|
||||
content: '30px';
|
||||
}
|
||||
.s36:before {
|
||||
content: '36px';
|
||||
}
|
||||
.s48:before {
|
||||
content: '48px';
|
||||
}
|
||||
.s60:before {
|
||||
content: '60px';
|
||||
}
|
||||
.s72:before {
|
||||
content: '72px';
|
||||
}
|
||||
.s10:before, .s11:before, .s12:before, .s14:before,
|
||||
.s18:before, .s24:before, .s30:before, .s36:before,
|
||||
.s48:before, .s60:before, .s72:before {
|
||||
font-family: Arial, sans-serif;
|
||||
font-size: 10px;
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
color: #999;
|
||||
padding-right: 6px;
|
||||
}
|
||||
/* fonts demo styles */
|
||||
.demo-0 {
|
||||
font-family: 'Comfortaa';
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
.demo-1 {
|
||||
font-family: 'Comfortaa';
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
.demo-2 {
|
||||
font-family: 'Comfortaa';
|
||||
font-weight: bold;
|
||||
font-style: normal;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page">
|
||||
<div class="demo-0">
|
||||
<h1>Comfortaa</h1>
|
||||
<div class="font-container">
|
||||
<p class="letters">
|
||||
abcdefghijklmnopqrstuvwxyz <br />
|
||||
ABCDEFGHIJKLMNOPQRSTUVWXYZ <br /> 0123456789.:,;()*!?'@#<>$%&^+-=~
|
||||
</p>
|
||||
<p class="s10" style="font-size: 10px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s11" style="font-size: 11px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s12" style="font-size: 12px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s14" style="font-size: 14px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s18" style="font-size: 18px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s24" style="font-size: 24px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s30" style="font-size: 30px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s36" style="font-size: 36px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s48" style="font-size: 48px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s60" style="font-size: 60px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s72" style="font-size: 72px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="demo-1">
|
||||
<h1>Comfortaa Light</h1>
|
||||
<div class="font-container">
|
||||
<p class="letters">
|
||||
abcdefghijklmnopqrstuvwxyz <br />
|
||||
ABCDEFGHIJKLMNOPQRSTUVWXYZ <br /> 0123456789.:,;()*!?'@#<>$%&^+-=~
|
||||
</p>
|
||||
<p class="s10" style="font-size: 10px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s11" style="font-size: 11px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s12" style="font-size: 12px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s14" style="font-size: 14px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s18" style="font-size: 18px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s24" style="font-size: 24px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s30" style="font-size: 30px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s36" style="font-size: 36px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s48" style="font-size: 48px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s60" style="font-size: 60px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s72" style="font-size: 72px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="demo-2">
|
||||
<h1>Comfortaa Bold</h1>
|
||||
<div class="font-container">
|
||||
<p class="letters">
|
||||
abcdefghijklmnopqrstuvwxyz <br />
|
||||
ABCDEFGHIJKLMNOPQRSTUVWXYZ <br /> 0123456789.:,;()*!?'@#<>$%&^+-=~
|
||||
</p>
|
||||
<p class="s10" style="font-size: 10px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s11" style="font-size: 11px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s12" style="font-size: 12px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s14" style="font-size: 14px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s18" style="font-size: 18px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s24" style="font-size: 24px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s30" style="font-size: 30px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s36" style="font-size: 36px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s48" style="font-size: 48px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s60" style="font-size: 60px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
<p class="s72" style="font-size: 72px;">The quick brown fox jumps over the lazy dog.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 642 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 600 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 603 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,37 +0,0 @@
|
|||
/* This stylesheet generated by Transfonter (http://transfonter.org) on May 18, 2016 12:44 PM */
|
||||
|
||||
@font-face {
|
||||
font-family: 'Comfortaa';
|
||||
src: url('hinted-Comfortaa.eot');
|
||||
src: url('hinted-Comfortaa.eot?#iefix') format('embedded-opentype'),
|
||||
url('hinted-Comfortaa.woff2') format('woff2'),
|
||||
url('hinted-Comfortaa.woff') format('woff'),
|
||||
url('hinted-Comfortaa.ttf') format('truetype'),
|
||||
url('hinted-Comfortaa.svg#Comfortaa') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Comfortaa';
|
||||
src: url('hinted-Comfortaa-Light.eot');
|
||||
src: url('hinted-Comfortaa-Light.eot?#iefix') format('embedded-opentype'),
|
||||
url('hinted-Comfortaa-Light.woff2') format('woff2'),
|
||||
url('hinted-Comfortaa-Light.woff') format('woff'),
|
||||
url('hinted-Comfortaa-Light.ttf') format('truetype'),
|
||||
url('hinted-Comfortaa-Light.svg#Comfortaa-Light') format('svg');
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Comfortaa';
|
||||
src: url('hinted-Comfortaa-Bold.eot');
|
||||
src: url('hinted-Comfortaa-Bold.eot?#iefix') format('embedded-opentype'),
|
||||
url('hinted-Comfortaa-Bold.woff2') format('woff2'),
|
||||
url('hinted-Comfortaa-Bold.woff') format('woff'),
|
||||
url('hinted-Comfortaa-Bold.ttf') format('truetype'),
|
||||
url('hinted-Comfortaa-Bold.svg#Comfortaa-Bold') format('svg');
|
||||
font-weight: bold;
|
||||
font-style: normal;
|
||||
}
|
||||
Loading…
Reference in New Issue