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

fix UHF header CSS #3469

Merged
merged 2 commits into from
Sep 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "typed-schema",
"name": "ac-typed-schema",
"version": "0.5.2",
"description": "Generates the element/property tables for our specs based on the schema file.",
"author": "AdaptiveCards",
Expand Down
1 change: 1 addition & 0 deletions source/nodejs/adaptivecards-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"version": "3.9.0"
},
"devDependencies": {
"ac-typed-schema": "^0.5.2",
"adaptivecards": "^1.3.0-alpha.2",
"adaptivecards-designer": "^0.7.1",
"adaptivecards-visualizer": "^1.2.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
<link rel="icon" href="<%- theme.favicon %>">
<% } %>

<link rel="stylesheet" href="https://statics-uhf-eas.akamaized.net/west-european/shell/_scrf/css/themes=default.device=uplevel_web_pc/ec-f8ec33/b7-01890e/67-f66a05/bb-33df2f/d6-3f8236/1c-14fb9c/8e-0f0147/17-1042c1?ver=2.0" type="text/css" media="all" /><link rel="stylesheet" href="https://statics-uhf-eus.akamaized.net/statics/override.css?c=4" type="text/css" />

<% if(is_current("visualizer")) { %>
<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
<%- css("visualizer/css/visualizer.css") %>
Expand Down Expand Up @@ -71,7 +69,17 @@


<% /* from UHF MSDocsHeader-AdaptiveCards */ %>
<script src="https://statics-uhf-eas.akamaized.net/shell/_scrf/js/themes=default/54-af9f9f/c0-247156/de-099401/e1-a50eee/e7-954872/d8-97d509/f0-251fe2/46-be1318/77-04a268/7f-652c90/63-077520/a4-34de62/2f-2c5417/db-bc0148/bc-5b77d5/78-4c7d22/df-e4d70f/e4-8302f6/cd-23d3b0/6d-1e7ed0/b7-cadaa7/ca-40b7b0/c3-6454d7/f9-7592d3/db-2792b1/f9-fa0ea3/7e-cda2d3/32-6dafa3/b0-8ba565/e0-3c9860/91-97a04f/1f-100dea/33-abe4df/85-2572bb/8f-d24839?ver=2.0&amp;iife=1" defer=""></script>
<!-- <script src="https://statics-uhf-eas.akamaized.net/shell/_scrf/js/themes=default/54-af9f9f/c0-247156/de-099401/e1-a50eee/e7-954872/d8-97d509/f0-251fe2/46-be1318/77-04a268/7f-652c90/63-077520/a4-34de62/2f-2c5417/db-bc0148/bc-5b77d5/78-4c7d22/df-e4d70f/e4-8302f6/cd-23d3b0/6d-1e7ed0/b7-cadaa7/ca-40b7b0/c3-6454d7/f9-7592d3/db-2792b1/f9-fa0ea3/7e-cda2d3/32-6dafa3/b0-8ba565/e0-3c9860/91-97a04f/1f-100dea/33-abe4df/85-2572bb/8f-d24839?ver=2.0&amp;iife=1" defer=""></script> -->



<!-- <script src="/bundles/jquery?v=FVs3ACwOLIVInrAl5sdzR2jrCDmVOWFbZMY6g6Q0ulE1"></script> -->



<link rel="stylesheet" href="https://www.microsoft.com/onerfstatics/marketingsites-wcus-prod/west-european/shell/_scrf/css/themes=default.device=uplevel_web_pc/59-469920/ad-9005a4/bd-292223/26-13ca9e/b7-1464e7/8e-a868c0/58-faa810/34-4fda9f?ver=2.0" type="text/css" media="all" />
<link rel='stylesheet' href='https://statics-marketingsites-wcus-ms-com.akamaized.net/statics/override.css?c=7' type='text/css' />
<script src="https://www.microsoft.com/onerfstatics/marketingsites-wcus-prod/shell/_scrf/js/themes=default/54-af9f9f/c0-247156/de-099401/e1-a50eee/e7-954872/d8-97d509/f0-251fe2/46-be1318/77-04a268/11-240c7b/63-077520/a4-34de62/1b-c96630/db-bc0148/dc-7e9864/78-4c7d22/39-97e6ff/16-4c1a9d/cd-23d3b0/6d-1e7ed0/b7-cadaa7/ca-40b7b0/4e-ee3a55/3e-f5c39b/c3-6454d7/f9-7592d3/92-10345d/79-499886/7e-cda2d3/62-95a6e7/93-283c2d/e0-3c9860/91-97a04f/1f-100dea/33-abe4df/f2-fae105?ver=2.0&iife=1"></script>

<% /* Load scripts based on the URL */ %>
<% if(is_current("visualizer")) { %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"use strict";

var markedschema = require("marked-schema");
var typedschema = require("typed-schema");
var typedschema = require("ac-typed-schema");
var marked = require("marked");
var fs = require("hexo-fs");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
"use strict";

var typedschema = require("typed-schema");
var typedschema = require("ac-typed-schema");
var marked = require("marked");
var fs = require("fs");
var path = require("path");
Expand Down
2 changes: 1 addition & 1 deletion source/nodejs/lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
"adaptivecards*/**",
"spec-generator/**",
"typed-schema/**"
"ac-typed-schema/**"
],
"command": {
"publish": {
Expand Down
2 changes: 1 addition & 1 deletion source/nodejs/spec-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"marked-schema": "^0.1.4",
"p-iteration": "^1.1.8",
"rimraf": "^2.6.2",
"typed-schema": "^0.5.2",
"ac-typed-schema": "^0.5.2",
"typescript": "^3.2.2",
"webpack": "^4.27.1",
"webpack-cli": "^3.1.2"
Expand Down
4 changes: 2 additions & 2 deletions source/nodejs/spec-generator/src/spec-generator.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
import * as markedschema from "marked-schema";
import * as typedschema from "typed-schema";
import * as typedschema from "ac-typed-schema";
var fs = require("fs");
import { forEach } from "p-iteration";
import { Schema, SchemaType, SchemaClass, SchemaEnum } from "typed-schema";
import { Schema, SchemaType, SchemaClass, SchemaEnum } from "ac-typed-schema";

export async function generateAsync() {

Expand Down
90 changes: 0 additions & 90 deletions source/nodejs/typed-schema/src/markdown/build-model.ts

This file was deleted.