diff --git a/_config.yml b/_config.yml index ee05aa68..1774eb66 100644 --- a/_config.yml +++ b/_config.yml @@ -6,16 +6,14 @@ 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://odataorg.github.io" # the base hostname & protocol for your site +url: "http://localhost:4000/" # the base hostname & protocol for your site twitter_username: odataorg github_username: odataorg permalink: /blog/:title -highlighter: pygments +highlighter: rouge # Build settings markdown: kramdown -gems: - - jekyll-sitemap \ No newline at end of file diff --git a/_includes/head.html b/_includes/head.html index 4b97f36c..d4d029b4 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -16,8 +16,5 @@ - - - - + diff --git a/_includes/navbar.html b/_includes/navbar.html index 15f5bc8e..c02b5e94 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -10,40 +10,49 @@ - +
@@ -52,7 +61,9 @@ - + + + diff --git a/_includes/odata-in-6-steps.html b/_includes/odata-in-6-steps.html index a6a03960..a57b0902 100644 --- a/_includes/odata-in-6-steps.html +++ b/_includes/odata-in-6-steps.html @@ -1163,7 +1163,7 @@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.
+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.
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.
-These logo usage guidelines will help you determine the best way to use our logo. Click the to download any individual version.
+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 a0b34b64..0f0e06d4 100644 --- a/public/css/home.css +++ b/public/css/home.css @@ -1,3 +1,31 @@ +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 7737a34e..6e7f02ab 100644 --- a/public/css/site.css +++ b/public/css/site.css @@ -1,3 +1,49 @@ +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 6a40f1c8..496602ef 100644 --- a/public/site.js +++ b/public/site.js @@ -12,17 +12,14 @@ $(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(); + } }); });