Skip to content

Commit

Permalink
Merge branch 'master' into feature/1508-asset-upload
Browse files Browse the repository at this point in the history
  • Loading branch information
saad-mo committed Jul 9, 2019
2 parents 4224230 + 1b6dfc2 commit e48f1de
Show file tree
Hide file tree
Showing 23 changed files with 49 additions and 72 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ A clear and concise description of what the bug is.

> Is this issue related to a specific component?
> What version of the Fiori Fundamentals are you using?
> What version of the Fundamentals are you using?
> What offering/product do you work on? Any pressing ship or release dates we should be aware of?
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
> What browser are you working in?
> What version of the Fiori Fundamentals are you using?
> What version of the Fundamentals are you using?
> What offering/product do you work on? Any pressing ship or release dates we should be aware of?
Expand Down
2 changes: 1 addition & 1 deletion config/postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = {
level: 1
},
'postcss-banner': {
banner: `Fiori Fundamentals v${packageVersion}
banner: `Fundamentals v${packageVersion}
Copyright (c) ${year} SAP SE or an SAP affiliate company.
Licensed under Apache License 2.0 (https://github.com/SAP/Fundamental/blob/master/LICENSE)`,
important: true
Expand Down
8 changes: 4 additions & 4 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ repository: /SAP/fundamental
output: web

# this appears on the top navigation bar next to the home button
topnav_title: Fiori Fundamentals
topnav_title: SAP Fundamentals

# this appears in the html browser tab for the site title (seen mostly by search engines, not users)
site_title: SAP Fiori Fundamentals
site_title: SAP Fundamentals

site_description: SAP Fiori Fundamentals is a Fiori 3 component library and SASS toolkit for building SAP user interfaces with any technology.

# this appears in the footer
company_name: SAP Fiori Fundamentals
company_name: SAP Fundamentals

# if you have google-analytics ID, put it in. if not, edit this value to blank.
google_analytics: UA-126805333-1
Expand All @@ -24,7 +24,7 @@ host: 127.0.0.1
# the port where the preview is rendered. You can leave this as is unless you have other Jekyll builds using this same port that might cause conflicts. in that case, use another port such as 4006.
port: 4000

feedback_subject_line: Fiori Fundamentals Documentation Feedback
feedback_subject_line: Fundamentals Documentation Feedback

# used as a contact email for the Feedback link in the top navigation bar
feedback_email: fundamental@sap.com
Expand Down
4 changes: 0 additions & 4 deletions docs/_data/sidebars/left-navigation-sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,3 @@ entries:
- title: Implementation Libraries
url: /resources/fundamentals-libraries.html
output: web

- title: Office Hours
url: /office-hours/
output: web
2 changes: 1 addition & 1 deletion docs/_data/strings.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# placed here for translation purposes
headerDisclaimer: Although the following examples use the `<h3>` tag for the title element, the styling provided by Fiori Fundamentals will remain consistent for any heading level used. `<h1>` should be reserved for the page title.
headerDisclaimer: Although the following examples use the `<h3>` tag for the title element, the styling provided by SAP Fundamentals will remain consistent for any heading level used. `<h1>` should be reserved for the page title.
search_placeholder_text: search...
search_no_results_text: No results found
2 changes: 1 addition & 1 deletion docs/_includes/demo-page-components/shell-header.html
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<ul>
<li>
<span class="fd-product-switcher__product-icon"><img src="{{site.baseurl}}/images/products/01.png"></span>
<span class="fd-product-switcher__product-title">Fiori Home</span>
<span class="fd-product-switcher__product-title">Home</span>
</li>
<li>
<span class="fd-product-switcher__product-icon"><img src="{{site.baseurl}}/images/products/02.png"></span>
Expand Down
2 changes: 1 addition & 1 deletion docs/_includes/topnav.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- logo -->
<a class="docs-top-nav__logo" href="{{site.baseurl}}/index.html">
SAP Fiori <span class="docs-top-nav__logo__accent">Fundamentals</span>
SAP <span class="docs-top-nav__logo__accent">Fundamentals</span>
</a>

<button id="mobile-sidenav-btn" class="fd-button--light sap-icon--menu2" aria-haspopup="true" aria-expanded="false" aria-label="Menu"></button>
Expand Down
25 changes: 4 additions & 21 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<div class="docs-home_hero">
<div class="fd-container fd-container--fluid">
<div class="fd-col--6 docs-home_hero-content">
<h1 class="docs-home_hero-heading"><span class="docs-home_hero-bold">Develop</span> with Fiori <br>Fundamentals.</h1>
<h1 class="docs-home_hero-heading"><span class="docs-home_hero-bold">Develop</span> with SAP <br>Fundamentals.</h1>
<p class="docs-home_hero-description">
Fiori Fundamentals is SCSS ready! Explore some functions and mixins to maintain consistency & quality of your SCSS.
SAP Fundamentals is SCSS ready! Explore some functions and mixins to maintain consistency & quality of your SCSS.
</p>
<a class="fd-button docs-home_hero-btn" href="components/index.html">
EXPLORE COMPONENTS
Expand Down Expand Up @@ -50,7 +50,7 @@ <h2 class="docs-home_panel-heading">Colors.</h2>
<div class="fd-container">
<div class="fd-col--7">
<h2 class="docs-home_panel-heading">Grid.</h2>
<p class="docs-home_panel-description">Fiori Fundamentals uses responsive grid system that achieves flexible 12-column flow layout. It is used to create flexible layouts for various screen sizes and device types.</p>
<p class="docs-home_panel-description">SAP Fundamentals uses responsive grid system that achieves flexible 12-column flow layout. It is used to create flexible layouts for various screen sizes and device types.</p>
<a href="foundation/grid.html" class="docs-home_panel-action">READ MORE</a>
</div>
<div class="fd-col--5">
Expand Down Expand Up @@ -79,7 +79,7 @@ <h2 class="docs-home_panel-heading">Spacing.</h2>
<div class="fd-container">
<div class="fd-col--7">
<h2 class="docs-home_panel-heading">Type.</h2>
<p class="docs-home_panel-description">Fiori Fundamentals uses a set of sans-serif system fonts. They are timeless fonts ensures that the fresh, clean, and minimalist style. It works well across all browsers, devices, and platforms for customization to be easy.</p>
<p class="docs-home_panel-description">SAP Fundamentals uses a set of sans-serif system fonts. They are timeless fonts ensures that the fresh, clean, and minimalist style. It works well across all browsers, devices, and platforms for customization to be easy.</p>
<a href="foundation/type.html" class="docs-home_panel-action">READ MORE</a>
</div>
<div class="fd-col--5">
Expand Down Expand Up @@ -142,20 +142,3 @@ <h1 class="docs-home_panel-title"><a href="resources/index.html">resources.</a><
</div>
</div>

<div class="docs-home_panel">
<h1 class="docs-home_panel-title"><a href="{{site.baseurl}}/office-hours/">office hours.</a></h1>
<div class="fd-container fd-container--fluid">
<div class="fd-col--7">
<h2 class="docs-home_panel-heading">Live monthly demos with Q&A.</h2>
<p class="docs-home_panel-description">Every month the SAP Fiori Fundamentals team hosts a live stream of a presentation covering anything from library updates, how-to's and demos. It's also an opportunity for us to engage with our users and answer pre-submitted questions or those that come in live.</p>
<a href="{{site.baseurl}}/office-hours/" class="docs-home_panel-action">LEARN MORE</a>
</div>
<div class="fd-col--5">
<h2 class="docs-home_panel-heading">Next Session.</h2>
<div class="docs-officehours _two">
<h3 class="docs-officehours-heading">Office Hours</h3>
<p class="docs-officehours-description">TBD, February 2019</p>
</div>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions docs/pages/foundation/getting-started-designers.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
toc: false
permalink: foundation/getting-started-designers.html
folder: foundation
summary: Create a harmonious experience for users with Fiori Fundamentals design language. As designers, deliver geat outcomes with flexible consistent design that guarantees faster build times.
summary: Create a harmonious experience for users with SAP Fundamentals design language. As designers, deliver geat outcomes with flexible consistent design that guarantees faster build times.
breadcrumb: Getting Started Designers
---

Expand All @@ -29,11 +29,11 @@ <h3 class="docs-header-h3">Adaptive</h3>
[ IMAGE OF UI KIT ]

<ol>
<li>To start designing, download the Fiori Fundamentals Kit: Sketch or Axure. Fundament UI Kit is built to provide the core visual styles, components, and templates.</li>
<li>To start designing, download the SAP Fundamentals Kit: Sketch or Axure. Fundament UI Kit is built to provide the core visual styles, components, and templates.</li>
<li>Make sure to learn more about our UI Guidlines: Colors, Grid, Spacing and Type.</li>
</ol>

<h3 class="docs-header-h3">Releases</h3>
<p>Fiori Fundamentals team is always making improvements to the kit. Keep track of updates.</p>
<p>SAP Fundamentals team is always making improvements to the kit. Keep track of updates.</p>

<p>If you have any questions, email our team.</p>
2 changes: 1 addition & 1 deletion docs/pages/foundation/grid.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
---

<p class="docs-intro">
Fiori Fundamentals uses responsive grid system with a 12-column flow layout. It is used to create flexible layouts for various screen sizes and device types.
SAP Fundamentals uses responsive grid system with a 12-column flow layout. It is used to create flexible layouts for various screen sizes and device types.
</p>

<h3 class="docs-header-h3">Tablet example grid</h3>
Expand Down
6 changes: 3 additions & 3 deletions docs/pages/foundation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ toc: false
sidebar: left-navigation-sidebar
permalink: foundation/index.html
folder: foundation
summary: Fiori Fundamentals is a unified, flexible design system that solves complex
summary: SAP Fundamentals is a unified, flexible design system that solves complex
problems in a meaningful way and creates simple intuitive experience.
---

Expand All @@ -26,7 +26,7 @@ summary: Fiori Fundamentals is a unified, flexible design system that solves com
Grid
</h2>
<p class="fd-tile__description">
Fiori Fundamentals uses responsive grid system that achieves flexible 12-column flow layout. It is used to create flexible layouts for various screen sizes and device types.
SAP Fundamentals uses responsive grid system that achieves flexible 12-column flow layout. It is used to create flexible layouts for various screen sizes and device types.
</p>
</div>
</a>
Expand All @@ -46,7 +46,7 @@ summary: Fiori Fundamentals is a unified, flexible design system that solves com
Type
</h2>
<p class="fd-tile__description">
Fiori Fundamentals uses a set of sans-serif system fonts.
SAP Fundamentals uses a set of sans-serif system fonts.
</p>
</div>
</a>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/foundation/type.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
---

<p class="docs-intro">
SAP 72 font family was designed from the ground up and made it possible to meet SAP Fiori’s typographic requirements, including - legibility enhancements, font styles, brand voice, character set and language support.
SAP 72 font family was designed from the ground up and made it possible to meet SAP typographic requirements, including - legibility enhancements, font styles, brand voice, character set and language support.
</p>

<br>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sidebar: left-navigation-sidebar
toc: false
permalink: getting-started.html
folder:
summary: SAP Fiori Fundamentals is a light-weight presentation layer using HTML and CSS with the following implementations under active development:<a href="https://sap.github.io/fundamental-ngx/" target="_blank">Angular</a>, <a href="https://sap.github.io/fundamental-react/" target="_blank">React</a>, and <a href="https://sap.github.io/fundamental-vue/" target="_blank">Vue</a>. With Fiori Fundamentals’ library of stylesheets and HTML tags, developers can build consistent Fiori apps in any web-based technology.
summary: SAP Fundamentals is a light-weight presentation layer using HTML and CSS with the following implementations under active development:<a href="https://sap.github.io/fundamental-ngx/" target="_blank">Angular</a>, <a href="https://sap.github.io/fundamental-react/" target="_blank">React</a>, and <a href="https://sap.github.io/fundamental-vue/" target="_blank">Vue</a>. With Fundamentals’ library of stylesheets and HTML tags, developers can build consistent SAP apps in any web-based technology.
---


Expand Down
2 changes: 1 addition & 1 deletion docs/pages/layouts/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ folder: layouts
summary:
---

Layouts in Fiori Fundamentals are for structuring the main parts of your application. Organized in three main categories
Layouts in SAP Fundamentals are for structuring the main parts of your application. Organized in three main categories


<br>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/resources/design-system-utilities.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sidebar: left-navigation-sidebar
toc: false
permalink: resources/design-system-utilities.html
folder: resources
summary: The following guide covers all the major utility features of the Fiori Fundamentals (FDUI) design system toolkit. We recommend that you utilize these functions, mixins and helper classes to maintain consistency throughout your application. Using the toolkit features will ensure that you application will remain compatible and easy to upgrade with the future versions of FDUI, transition between themes and customization.
summary: The following guide covers all the major utility features of the SAP Fundamentals (FDUI) design system toolkit. We recommend that you utilize these functions, mixins and helper classes to maintain consistency throughout your application. Using the toolkit features will ensure that you application will remain compatible and easy to upgrade with the future versions of FDUI, transition between themes and customization.
---

## Text Utilities
Expand Down
10 changes: 5 additions & 5 deletions docs/pages/resources/fundamentals-libraries.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
---
title: SAP Fiori Fundamentals Implementation Libraries
title: SAP Fundamentals Implementation Libraries
keywords: libraries frameworks angular vue react
sidebar: left-navigation-sidebar
toc: false
permalink: resources/fundamentals-libraries.html
folder: resources
summary: SAP Fiori Fundamentals can be used with your framework of choice, however fundamentals-react, fundamentals-ngx, and fundamentals-vue are currently in active development.
summary: SAP Fundamentals can be used with your framework of choice, however fundamentals-react, fundamentals-ngx, and fundamentals-vue are currently in active development.
---
<hr>

## Fundamental NGX ([GitHub](https://github.com/SAP/fundamental-ngx){:target="_blank"})
{: .docs-header-h2}
[Fundamental NGX](https://sap.github.io/fundamental-ngx/){:target="_blank"} is a set of Angular components built with the SAP Fiori Fundamentals library.
[Fundamental NGX](https://sap.github.io/fundamental-ngx/){:target="_blank"} is a set of Angular components built with the SAP Fundamentals library.

## Fundamental React ([GitHub](https://github.com/SAP/fundamental-react){:target="_blank"})
{: .docs-header-h2}
[Fundamental React](https://sap.github.io/fundamental-react/){:target="_blank"} is a set of React components built with the SAP Fiori Fundamentals library.
[Fundamental React](https://sap.github.io/fundamental-react/){:target="_blank"} is a set of React components built with the SAP Fundamentals library.

## Fundamental Vue ([GitHub](https://github.com/SAP/fundamental-vue){:target="_blank"})
{: .docs-header-h2}
[Fundamental Vue](https://sap.github.io/fundamental-vue/){:target="_blank"} is a set of Vue components built with the SAP Fiori Fundamentals library.
[Fundamental Vue](https://sap.github.io/fundamental-vue/){:target="_blank"} is a set of Vue components built with the SAP Fundamentals library.
Loading

0 comments on commit e48f1de

Please sign in to comment.