From 3939b1b7040234ea3633b701e36831387f3d63b6 Mon Sep 17 00:00:00 2001 From: Yi Ding Date: Wed, 3 Jun 2015 19:34:13 -0700 Subject: [PATCH] Revert "logo usage page" --- _config.yml | 6 ++- _includes/head.html | 5 ++- _includes/navbar.html | 41 +++++++---------- _includes/odata-in-6-steps.html | 2 +- _layouts/default.html | 2 +- _layouts/scrollspy.html | 24 ---------- pages/getting-started/advanced-tutorial.html | 2 +- pages/getting-started/basic-tutorial.html | 2 +- pages/libraries.html | 14 ++++++ pages/odata-icon-usage-guidelines.html | 46 +++----------------- public/css/home.css | 28 ------------ public/css/site.css | 46 -------------------- public/site.js | 15 ++++--- 13 files changed, 55 insertions(+), 178 deletions(-) delete mode 100644 _layouts/scrollspy.html diff --git a/_config.yml b/_config.yml index 1774eb66..ee05aa68 100644 --- a/_config.yml +++ b/_config.yml @@ -6,14 +6,16 @@ description: > # this means to ignore newlines until "baseurl:" to allow the creation and consumption of queryable and interoperable RESTful APIs in a simple and standard way. baseurl: "" # the subpath of your site, e.g. /blog/ -url: "http://localhost:4000/" # the base hostname & protocol for your site +url: "http://odataorg.github.io" # the base hostname & protocol for your site twitter_username: odataorg github_username: odataorg permalink: /blog/:title -highlighter: rouge +highlighter: pygments # Build settings markdown: kramdown +gems: + - jekyll-sitemap \ No newline at end of file diff --git a/_includes/head.html b/_includes/head.html index d4d029b4..4b97f36c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -16,5 +16,8 @@ - + + + + diff --git a/_includes/navbar.html b/_includes/navbar.html index c02b5e94..15f5bc8e 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -10,49 +10,40 @@ - + @@ -61,9 +52,7 @@ - - - +Fork me on GitHub diff --git a/_includes/odata-in-6-steps.html b/_includes/odata-in-6-steps.html index a57b0902..a6a03960 100644 --- a/_includes/odata-in-6-steps.html +++ b/_includes/odata-in-6-steps.html @@ -1163,7 +1163,7 @@

Contribute to "Understanding OData in 6 steps"

Step 6: Invoking a function

-

In RESTful APIs, there can be some custom operations that contain complicated logic and can be frequently used. For that purpose, OData supports defining functions and actions to represent such operations. They are also resources themselves and can be bound to existing resources. After having explored the TripPin OData service, Russell finds out that the it has a function called GetInvolvedPeople from which he can find out the involved people of a specific trip. He invokes the function to find out who else other than him and Lewis goes to that trip in the U.S.

+

In RESTful APIs, there can be some custom operations that contain complicated logic and can be frequently used. For that purpose, OData supports defining functions and actions to represent such operations. They are also resources themselves and can be bound to existing resources. After having explored the TripPin OData service, Russell finds out that it has a function called GetInvolvedPeople from which he can find out the involved people of a specific trip. He invokes the function to find out who else other than him and Lewis goes to that trip in the U.S.

    diff --git a/_layouts/default.html b/_layouts/default.html index 2a3b8477..884c07e0 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@ {% include head.html %} - + {% include navbar.html %} diff --git a/_layouts/scrollspy.html b/_layouts/scrollspy.html deleted file mode 100644 index b54f4dd1..00000000 --- a/_layouts/scrollspy.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - {% include head.html %} - - - - {% include navbar.html %} - -
    -
    -

    {{ page.title }}

    -
    - {{ content }} -
    - - - - - - - {% include footer.html %} - - diff --git a/pages/getting-started/advanced-tutorial.html b/pages/getting-started/advanced-tutorial.html index 81d3e01d..edecb40f 100644 --- a/pages/getting-started/advanced-tutorial.html +++ b/pages/getting-started/advanced-tutorial.html @@ -1,5 +1,5 @@ --- -layout: scrollspy +layout: page title: Advanced Tutorial date: 2014-08-01 03:53:28.000000000 +08:00 permalink: /getting-started/advanced-tutorial/ diff --git a/pages/getting-started/basic-tutorial.html b/pages/getting-started/basic-tutorial.html index 7a15b0fc..a12cac57 100644 --- a/pages/getting-started/basic-tutorial.html +++ b/pages/getting-started/basic-tutorial.html @@ -1,5 +1,5 @@ --- -layout: scrollspy +layout: page title: Basic Tutorial date: 2014-08-01 03:44:56.000000000 +08:00 permalink: /getting-started/basic-tutorial/ diff --git a/pages/libraries.html b/pages/libraries.html index e6591f6d..a8c2b672 100644 --- a/pages/libraries.html +++ b/pages/libraries.html @@ -217,6 +217,13 @@ Client openui5.org + + DevExtreme + DevExtreme is cross-platform HTML 5/JS tools for next-generation mobile and web development. + V1-V4 + Both + js.devexpress.com +
@@ -246,6 +253,13 @@ For server/client Download from + + OData4ObjC + This library makes it easy for iOS app developers to interact with data in any OData-compliant web service. It supports metadata-aware client-side code generation and full CRUD with query. If someone exposes a data model via OData, OData4ObjC makes it easy to get that model onto your iOS device. + V1-3 + Client + GitHub + ODataPy (Python) ODataPy is an open-source Python library that implements the Open Data Protocol (OData). It supports the OData protocol version 4.0. It is built on top of ODataCpp using language binding. It is under development and currently serves only parts of client and client side proxy generation (code gen) aspects of OData. diff --git a/pages/odata-icon-usage-guidelines.html b/pages/odata-icon-usage-guidelines.html index 348f9cfb..5a73f6af 100644 --- a/pages/odata-icon-usage-guidelines.html +++ b/pages/odata-icon-usage-guidelines.html @@ -1,49 +1,14 @@ --- layout: page -title: Logo Usage +title: OData Icon Usage Guidelines date: 2014-05-27 09:39:22.000000000 +08:00 permalink: /odata-icon-usage-guidelines/ --- -

These logo usage guidelines will help you determine the best way to use our logo. Click the to download any individual version.

-
-
-
- -
250x250
-
-
-
- -
150x150
-
-
-
- -
96x96
-
-
-
- -
24x24
-
-
- -
48x48
-
-
-
-
- -
16x16
-
-
- -
32x32
-
-
- +

You may download the OData icon (“OData Icon”) pictured below and may use it to identify conforming implementations of the OData specification in accordance with these guidelines. Or you can directly download the zip file OData Icons which contains OData Icons of different sizes.

+
+ODataLogo-96
-

Download all

+

The OData Icon represents all versions of the OData technical specification as published by:

    @@ -68,7 +33,6 @@

    Visual Guidelines:

  • The color version of the OData Icon must be used if possible; if not, a grayscale version may be used.
  • The OData Icon must be used in its original 1:1 aspect ratio and may not be rotated, inverted, animated, or otherwise distorted.
  • The OData Icon may not be used as a repeating pattern or background element.
    • -

Protecting the Value of the Mark

You agree to correct promptly any improper use of the OData Icon. Any party authorized to enforce the mark may take action against any use that does not conform to these guidelines or that violates applicable law.

diff --git a/public/css/home.css b/public/css/home.css index 0f0e06d4..a0b34b64 100644 --- a/public/css/home.css +++ b/public/css/home.css @@ -1,31 +1,3 @@ -body { - font-family: "Microsoft Yahei Light"; - background-color:#FEF9F7; - font-size: 16px; - color: #6F6F6E; -} - -.navbar-default { - background-color: #FFFFFF; - border-color: #ffffff; - border-radius: 0; - box-shadow: 0 3px 5px rgba(0,0,0,0.1); -} - -.navbar-default .navbar-nav>li>a { - color: #F18B1B; -} - -.navbar-default .navbar-nav { - float: right; - width: 60% ; -} - -h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: "Microsoft Yahei"; -} - - .step-buttons{ font-size: 12px; } diff --git a/public/css/site.css b/public/css/site.css index 6e7f02ab..7737a34e 100644 --- a/public/css/site.css +++ b/public/css/site.css @@ -1,49 +1,3 @@ -body { - font-family: "Microsoft Yahei Light"; - background-color:#FEF9F7; - font-size: 16px; - color: #6F6F6E; -} - -.navbar-default { - background-color: #FFFFFF; - border-color: #ffffff; - border-radius: 0; - box-shadow: 0 3px 5px rgba(0,0,0,0.1); -} - -.navbar-default .navbar-nav>li>a { - color: #F18B1B; -} - -.navbar-default .navbar-nav { - float: right; - width: 60% ; -} - -h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: "Microsoft Yahei"; -} - -h1, .h1 { - font-size: 34px; - color: #F18918; - font-family: "Microsoft Yahei light"!important; -} - -h2, .h2 { - font-size: 28px; - color: #6F6F6E; - font-weight: 300; -} - -h3, .h3 { - font-size: 24px; - color: #6F6F6E; - font-weight: 400; - text-align: center; -} - .theme-font{ color: #dd4814; } diff --git a/public/site.js b/public/site.js index 496602ef..6a40f1c8 100644 --- a/public/site.js +++ b/public/site.js @@ -12,14 +12,17 @@ $(function () { $(document).ready(function(){ + if ($(window).width() < 768) { + $('#fork-me-on-github').hide(); + } // Window width change $( window ).resize(function() { - if ($(window).width() < 768) { - $('#fork-me-on-github').hide(); - } - else{ - $('#fork-me-on-github').show(); - } + if ($(window).width() < 768) { + $('#fork-me-on-github').hide(); + } + else{ + $('#fork-me-on-github').show(); + } }); });