Skip to content

Commit

Permalink
Www fixes (ampproject#204)
Browse files Browse the repository at this point in the history
* Amp Start logo update.

* Minor License file update

* Footer Borders

* Carrot image

* Carrots for HTML Expansion

* Fix logo
  • Loading branch information
camelburrito authored Mar 3, 2017
1 parent e7a5251 commit 3aa3534
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 14 deletions.
12 changes: 12 additions & 0 deletions css/www/components/page.css
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ body .www-component-anchors .www-component-anchor[option][selected] {
background: var(--color-highlight-background);
}

.www-example-code amp-accordion h3::after {
content: "";
background: url(img/www/caret.svg) 0 0 transparent no-repeat;
width: 11px;
height: 7px;
display: inline-block;
margin-left: var(--space-3);
}
.www-example-code amp-accordion [expanded] h3::after {
transform: scaleY(-1);
}

@media (--breakpoint-xs) {
.www-component-desc > * {
padding-left: 0;
Expand Down
17 changes: 17 additions & 0 deletions css/www/shared.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ h1,h2,h3,h4,h5,h6,
font-family: Inconsolata, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
}

.ampstart-headerbar-nav .ampstart-nav-item {
padding-right: 1rem;
}

.ampstart-headerbar-nav .ampstart-nav-item.www-current-page {
color: #066573;
}
Expand Down Expand Up @@ -59,6 +63,19 @@ h1,h2,h3,h4,h5,h6,
bottom: 0;
}

.ampstart-footer {
position: relative;
}

.ampstart-footer::before {
content: '';
position: absolute;
width: 100%;
height: 35px;
background-image: var(--header-gradient);
top: 0;
}

.ampstart-device-preview-mask,
.ampstart-device-preview-select {
background: var(--color-highlight-background);
Expand Down
1 change: 1 addition & 0 deletions img/www/amp_start_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/www/caret.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tasks/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Normalize | https://github.com/necolas/normalize.css/blob/master/LICENSE.md
Normalize.css | https://github.com/necolas/normalize.css/blob/master/LICENSE.md
----------------------------------------------------------------------------
# The MIT License (MIT)
Copyright (c) 2013 – 2016 Brent Jackson
Expand Down
2 changes: 1 addition & 1 deletion www/components.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1 class="mb4 px2 col-12 sm-col-8 mx-auto">UI Components</h1>
<amp-selector layout="container">
<main class="flex pl2">
<aside class="www-components-sec-nav col-2 xs-hide sm-hide relative">
<ul class="www-component-anchors list-reset m0 p0 px1 caps">
<ul class="www-component-anchors list-reset m0 pt0 pb3 px1 caps">
{{#components}}
<li class="clearfix mb3"><a href="#{{id}}" class="www-component-anchor text-decoration-none left" option="">{{name}}</a></li>
{{/components}}
Expand Down
6 changes: 3 additions & 3 deletions www/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
},
"navbar": {
"logo": {
"url": "../img/www/amp_logo_black.svg",
"width": "24",
"height": "24",
"url": "../img/www/amp_start_logo.svg",
"width": "119",
"height": "26",
"classes": "xs-hide sm-hide",
"href": "/"
},
Expand Down
6 changes: 3 additions & 3 deletions www/getstarted.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
},
"navbar": {
"logo": {
"url": "../img/www/amp_logo_black.svg",
"width": "24",
"height": "24",
"url": "../img/www/amp_start_logo.svg",
"width": "119",
"height": "26",
"classes": "xs-hide sm-hide",
"href": "/"
},
Expand Down
6 changes: 3 additions & 3 deletions www/howitworks.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
},
"navbar": {
"logo": {
"url": "../img/www/amp_logo_black.svg",
"width": "24",
"height": "24",
"url": "../img/www/amp_start_logo.svg",
"width": "119",
"height": "26",
"classes": "xs-hide sm-hide",
"href": "/"
},
Expand Down
6 changes: 3 additions & 3 deletions www/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
},
"navbar": {
"logo": {
"url": "../img/www/amp_logo_black.svg",
"width": "24",
"height": "24",
"url": "../img/www/amp_start_logo.svg",
"width": "119",
"height": "26",
"classes": "xs-hide sm-hide",
"href": "/"
},
Expand Down

0 comments on commit 3aa3534

Please sign in to comment.