Skip to content

Commit

Permalink
Style and other tweaks for v2 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
willsmythe committed Dec 7, 2017
1 parent 29acdaf commit 4be8aeb
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 218 deletions.
2 changes: 1 addition & 1 deletion dist/assets/app.js

Large diffs are not rendered by default.

Binary file modified dist/assets/logo-small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
172 changes: 1 addition & 171 deletions dist/assets/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/assets/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/assets/modal.js

Large diffs are not rendered by default.

45 changes: 12 additions & 33 deletions package.json
@@ -1,35 +1,14 @@
{
"_from": "github:zendesk/app_scaffold#v0.2.0",
"_id": "app_scaffold@0.1.0",
"_inBundle": false,
"_integrity": "sha1-00uhZ6W+HJVTgkHLrsvo2H4MB7A=",
"_location": "/zendesk_app_migrator/app_scaffold",
"_phantomChildren": {},
"_requested": {
"type": "git",
"raw": "app_scaffold@github:zendesk/app_scaffold#v0.2.0",
"name": "app_scaffold",
"escapedName": "app_scaffold",
"rawSpec": "github:zendesk/app_scaffold#v0.2.0",
"saveSpec": "github:zendesk/app_scaffold#v0.2.0",
"fetchSpec": null,
"gitCommittish": "v0.2.0"
},
"_requiredBy": [
"/zendesk_app_migrator"
],
"_resolved": "github:zendesk/app_scaffold#6116ac155658b07e4a85320939fd4a682f0d5a94",
"_spec": "app_scaffold@github:zendesk/app_scaffold#v0.2.0",
"_where": "C:\\Users\\trgau\\AppData\\Roaming\\npm\\node_modules\\zendesk_app_migrator",
"author": {
"name": "Zendesk"
"name": "Microsoft",
"email": "vsointegration@microsoft.com"
},
"bugs": {
"url": "https://github.com/zendesk/app_scaffold/issues"
"url": "https://github.com/Microsoft/vsts-zendesk-app/issues"
},
"bundleDependencies": false,
"deprecated": false,
"description": "A scaffold for developers to build ZAF v2 apps",
"description": "Visual Studio Team Services App for Zendesk",
"devDependencies": {
"babel-core": "^6.25.0",
"babel-eslint": "^7.2.3",
Expand Down Expand Up @@ -59,21 +38,21 @@
"url-loader": "^0.5.9",
"webpack": "^3.5.1"
},
"homepage": "https://github.com/zendesk/app_scaffold#readme",
"homepage": "https://github.com/Microsoft/vsts-zendesk-app",
"keywords": [
"zendesk",
"app",
"framework"
"microsoft",
"tfs",
"vsts",
"zendesk"
],
"license": "Apache-2.0",
"name": "app_scaffold",
"name": "vsts-zendesk-app",
"repository": {
"type": "git",
"url": "git+https://github.com/zendesk/app_scaffold.git"
"url": "https://github.com/Microsoft/vsts-zendesk-app"
},
"scripts": {
"build": "webpack -p",
"watch": "webpack --watch"
},
"version": "0.1.0"
"version": "0.6.0"
}
6 changes: 3 additions & 3 deletions spec/src/legacy_app_spec.js → spec/src/app_spec.js
@@ -1,12 +1,12 @@
import ZAFClient from 'zendesk_app_framework_sdk';
import LegacyApp from '../../src/javascripts/legacy_app';
import App from '../../src/javascripts/app';

describe('LegacyApp', () => {
describe('App', () => {
let app;

beforeEach(() => {
let client = ZAFClient.init();
app = new LegacyApp(client, { metadata: {}, context: {} });
app = new App(client, { metadata: {}, context: {} });
});

describe('#renderMain', () => {
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/javascripts/index.js
Expand Up @@ -3,7 +3,7 @@ This is the first JavaScript file that runs once your iframe is loaded within a
*/
import ZAFClient from 'zendesk_app_framework_sdk';
import I18n from 'i18n';
import LegacyApp from './legacy_app';
import App from './app';

// Create a new ZAFClient
var client = ZAFClient.init();
Expand All @@ -14,6 +14,6 @@ client.on('app.registered', function(appData) {
// load translations based on the account's current locale
I18n.loadTranslations(userData['currentUser.locale']);
// create a new instance of your app
new LegacyApp(client, appData);
new App(client, appData);
});
});
11 changes: 5 additions & 6 deletions src/stylesheets/app.scss
Expand Up @@ -17,8 +17,8 @@
margin-bottom: 8px;
}

.header h3.app_name {
font-size: 16px;
.header h3.app_name, .modal-header h3 {
font-size: 15px;
}

hr.split {
Expand Down Expand Up @@ -80,9 +80,8 @@
}

.workItems .workItem {
padding-left: 30px;
padding: 0px 10px 17px 10px;
border-bottom: 1px solid #dedede;
padding-bottom: 17px;
margin-top: 18px;
position: relative;
}
Expand All @@ -96,6 +95,7 @@
.workItem-title {
line-height: 14px;
margin-bottom: 8px;
font-size: 14px;
}

.workItem-fields-list {
Expand All @@ -110,8 +110,7 @@
}

.workItem-field-name {
font-weight: bold;
text-transform: uppercase;
font-weight: 500;
}

.workItem-field-name-icon {
Expand Down

0 comments on commit 4be8aeb

Please sign in to comment.