Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setup foundation for amp.dev #1307

Merged
merged 1,345 commits into from
Nov 29, 2018

Conversation

matthiasrohmer
Copy link
Collaborator

  • Adding some extensions to the Grow pod
  • Preparing packages (directories) for each of the main pillars of the new amp.dev: currently examples and content pages.
  • Bootstrap express.js as a proxy between Grow and the built samples

keevcodes and others added 30 commits November 20, 2018 18:17
fliter bubbles should wrap in their flex container for mobile devices
Destination switch inlining was not dynamic enough and the code was messy. Position fixes and a more dynmaic inlining approach has now been achieved
Padding for subnav was incorrect on desktop/larger devices
stage shortcode should be broken into a few parts, including the links and possiblity of a button, multiple headlines.
only temporary while destination switch shortcode gets built
Remove wrong view from all component pages. Add right view to component blueprints.
* develop: (59 commits)
  🐛 Only list docs of the current locale in sidebar.
  🐛 Fix teaser-grid styling in comoponents overview.
  🚚 Rename components scss.
  🎨 Cleanup component pages structure.
  💥 commented out stage dropdown temporarily
  🚧 implemented first parts of stage shortchode
  Revert "sort guides and tutorials by buckets"
  sort guides and tutorials by buckets
  ♻️ small changes made to the language dropdown
  📱 padding fix for header-subnav
  ♻️ refactored stage styling for destination switch
  📱 repsonsive changes added to template overview
  💄 padding added to intro text on mobile
  💄 flex wrap added to filer bubbles list
  ✨ implemented new div for clipped background
  💄 Implemented swoosh to stage background
  💄 added color and shadow mixins for filter bubbles
  ✨ created filter-bubble shortcode, styling
  ✨ created shortcode for filter-bubbles
  ✨ Start implementing component-overview page.
  ...

# Conflicts:
#	content/amp-dev/documentation/guides-and-tutorials/advertising/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/advertising/adnetwork-integration.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/ads-vendors.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/a4a-spec.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/create-amphtml-ad.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/create-an-amphtml-ad/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/create-an-amphtml-ad/create-shell.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/create-an-amphtml-ad/image-ad.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/create-an-amphtml-ad/summary.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/create-an-amphtml-ad/track-views.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/amphtml-ads/create-an-amphtml-ad/validate.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/integration-guide.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/introduction-ads.md
#	content/amp-dev/documentation/guides-and-tutorials/advertising/monetization.md
#	content/amp-dev/documentation/guides-and-tutorials/analytics/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/analytics/amp-managing-user-state.md
#	content/amp-dev/documentation/guides-and-tutorials/analytics/analytics-amp.md
#	content/amp-dev/documentation/guides-and-tutorials/analytics/analytics-basics.md
#	content/amp-dev/documentation/guides-and-tutorials/analytics/analytics-vendors.md
#	content/amp-dev/documentation/guides-and-tutorials/analytics/deep-dive-analytics.md
#	content/amp-dev/documentation/guides-and-tutorials/analytics/integrating-analytics.md
#	content/amp-dev/documentation/guides-and-tutorials/analytics/use-cases.md
#	content/amp-dev/documentation/guides-and-tutorials/contribute/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/contribute/governance.md
#	content/amp-dev/documentation/guides-and-tutorials/contribute/index.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/actions-and-events.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/amp-caches-and-cors.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/amp-caches-and-cors/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/amp-caches-and-cors/amp-cached.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/amp-caches-and-cors/cors-in-amp.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/amp-caches-and-cors/debug-cache-error.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/amphtml-layout-system/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/amphtml-layout-system/demonstrating-amp-layouts.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/amphtml-layout-sytem.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/how-amp-is-different.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/spec.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/spec/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/spec/amp-boilerplate.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/validation-workflow.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/validation-workflow/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/validation-workflow/validate-amp.md
#	content/amp-dev/documentation/guides-and-tutorials/core-concepts/validation-workflow/validation-errors.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/amp-html-layout.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/html-layout/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/html-layout/layouts-demonstrated.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/responsive_amp.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/style-and-layout/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/style-and-layout/art-direction.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/style-and-layout/control-layout.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/style-and-layout/custom-fonts.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/style-and-layout/placeholders.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/style-and-layout/responsive-design.md
#	content/amp-dev/documentation/guides-and-tutorials/design-and-layout/style-and-layout/style-pages.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/animation-in-amp.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/animation-in-amp/2.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/animation-in-amp/3.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/animation-in-amp/4.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/animation-in-amp/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/develop/animation-in-amp/support-css.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/creative-a-blog.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/creative-a-login.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/creative-interactive.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/include-iframes.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/include-images-video.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/include-third-party.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/monetizing.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/style-and-layout.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/style-and-layout/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/develop/style-and-layout/add-custom.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/style-and-layout/create-responsive.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/style-and-layout/layout-media.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/style-and-layout/placeholders-fallbacks.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/style-and-layout/responsive-images.md
#	content/amp-dev/documentation/guides-and-tutorials/develop/style-and-layout/support-css.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/amp-cors-requests.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/amp-story-best-practices.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/converting.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/discovery.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/engagement.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/how_cached.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/optimize_amp.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/third-party-components.md
#	content/amp-dev/documentation/guides-and-tutorials/fundamentals/validate.md
#	content/amp-dev/documentation/guides-and-tutorials/integration/integrate-with-apps.md
#	content/amp-dev/documentation/guides-and-tutorials/integration/pwa-amp.md
#	content/amp-dev/documentation/guides-and-tutorials/integration/pwa-amp/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/integration/pwa-amp/amp-as-pwa.md
#	content/amp-dev/documentation/guides-and-tutorials/integration/pwa-amp/amp-in-pwa.md
#	content/amp-dev/documentation/guides-and-tutorials/integration/pwa-amp/amp-to-pwa.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/actions-and-events-in-amp.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/amp-email-format.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/create-a-live-blog.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/interactivity.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/interactivity/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/interactivity/advanced-interactivity.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/interactivity/get-familiar.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/interactivity/prereqs-setup.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/interactivity/remote-data.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/interactivity/wrapping-up.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/login-requiring.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/login-requiring/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/login-requiring/add-comment.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/login-requiring/login.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/login-requiring/logout.md
#	content/amp-dev/documentation/guides-and-tutorials/interactivity-and-dynamic-content/login-requiring/summary.md
#	content/amp-dev/documentation/guides-and-tutorials/multimedia-and-animations/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/multimedia-and-animations/amp-replacements.md
#	content/amp-dev/documentation/guides-and-tutorials/multimedia-and-animations/iframes.md
#	content/amp-dev/documentation/guides-and-tutorials/start/add-advanced.md
#	content/amp-dev/documentation/guides-and-tutorials/start/convert-html.md
#	content/amp-dev/documentation/guides-and-tutorials/start/create-your-first-amp-page.md
#	content/amp-dev/documentation/guides-and-tutorials/troubleshootig/_blueprint.yaml
#	content/amp-dev/documentation/guides-and-tutorials/troubleshootig/amp-cache-debugging.md
#	content/amp-dev/documentation/guides-and-tutorials/troubleshootig/validation_errors.md
matthiasrohmer and others added 22 commits November 28, 2018 00:55
* develop: (62 commits)
  🎨 Correctly link all overview pages between each other.
  💄 fixed style issue home
  💄 Adjust stage color.
  💄 home styling
  🐛 Give images whitespace.
  🐛 Syntax fix.
  💄 Move link slightly to right.
  💄 Add space to copy images.
  🐛 Fix stories stage.
  🐛 Fix logo size.
  💄 changes monosapce to inconsolata
  💄 Decrease font-size of toc.
  🐛 Apply teaser indention only on desktop.
  🐛 fixed file name for teaser-dummy-image
  🚚 renamed and replaced some images files
  🐛 Fix dest.-switch.
  ✨ added new images to static
  🐛 Fix dest.-switch width and remove shadow.
  💄 Polish benefit cards.
  💄 fixed ui styling documtentaion tempaltes
  ...

# Conflicts:
#	content/shared/fill-ins/use-case-3.md
#	content/shared/fill-ins/use-case-4.md
Copy link
Collaborator

@pbakaus pbakaus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YOLO!

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here (e.g. I signed it!) and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

@matthiasrohmer
Copy link
Collaborator Author

I signed it!

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again. If the bot doesn't comment, it means it doesn't think anything has changed.

@keevcodes
Copy link
Contributor

I signed it

@sebil
Copy link
Collaborator

sebil commented Nov 29, 2018

Signed it.

@pbakaus pbakaus merged commit d69b05d into ampproject:future Nov 29, 2018
@pbakaus pbakaus deleted the prototype/merge-preparation branch November 29, 2018 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants