Skip to content

Commit

Permalink
Merge pull request #70 from screwdriver-cd/alltheicons
Browse files Browse the repository at this point in the history
Update all the icons
  • Loading branch information
petey authored Oct 13, 2016
2 parents 9344dec + 028b612 commit 11a4668
Show file tree
Hide file tree
Showing 60 changed files with 71 additions and 79 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = {
indent: ['error', 2],
'no-underscore-dangle': 'off',
'prefer-const': 'off',
'import/extensions': 'off',
'import/no-extraneous-dependencies': 'off',
'import/no-unresolved': 'off',
'import/no-mutable-exports': 'off',
Expand Down
2 changes: 1 addition & 1 deletion app/authenticators/screwdriver-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default Base.extend({
* @return {Promise}
*/
invalidate() {
return new Ember.RSVP.Promise(resolve => {
return new Ember.RSVP.Promise((resolve) => {
Ember.$.ajax({
url: logoutUrl,
method: 'POST',
Expand Down
2 changes: 1 addition & 1 deletion app/build/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default Ember.Route.extend({
this.transitionTo('pipeline.builds.build', model.pipeline.id, model.build.id);
},
model(params) {
return this.store.findRecord('build', params.build_id).then(build => {
return this.store.findRecord('build', params.build_id).then((build) => {
// reload again in a little bit if queued
const reloadQueuedBuild = () => {
if (build.get('status') === 'QUEUED') {
Expand Down
1 change: 0 additions & 1 deletion app/components/app-header/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

.logo {
display: inline-block;
width: 156px;
height: 40px;

img {
Expand Down
2 changes: 1 addition & 1 deletion app/components/build-log/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default Ember.Component.extend({
Ember.run(() => {
if (Array.isArray(data) && data.length) {
// Add lines to log container
data.forEach(line => {
data.forEach((line) => {
this.set('logContent',
`${this.get('logContent')}${ansi_up.ansi_to_html(line.m)}\n`
);
Expand Down
7 changes: 3 additions & 4 deletions app/components/home-hero/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,8 @@
}

footer {
background: url('/assets/main_bkgrd_home.png') transparent;
background-size: cover;
color: $ycolor-gray-3;
background-color: $ycolor-gray-4;
color: $ycolor-gray-7;
padding: 10px 0;
font-size: 11px;
font-weight: 300;
Expand All @@ -119,7 +118,7 @@ footer {
}

a {
color: $ycolor-gray-3;
color: $ycolor-gray-7;
text-decoration: none;
}
a:hover {
Expand Down
8 changes: 4 additions & 4 deletions app/components/pipeline-builds-list/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default Ember.Component.extend(Ember.PromiseProxyMixin, {
const workflow = [];

// get a sub-workflow object to clone
this.get('jobs').forEach(j => {
this.get('jobs').forEach((j) => {
workflow.push({
id: j.get('id'),
name: j.get('name')
Expand All @@ -29,7 +29,7 @@ export default Ember.Component.extend(Ember.PromiseProxyMixin, {
const shas = {};
let result = [];

combined.forEach(build => {
combined.forEach((build) => {
const sha = build.get('sha');

// create a workflow based on shas
Expand All @@ -38,7 +38,7 @@ export default Ember.Component.extend(Ember.PromiseProxyMixin, {
}

// add the build info to correct job in the workflow
shas[sha].some(j => {
shas[sha].some((j) => {
if (j.id === build.get('jobId') && !j.build) {
j.build = build;

Expand All @@ -50,7 +50,7 @@ export default Ember.Component.extend(Ember.PromiseProxyMixin, {
});

// put the results into an array
Object.keys(shas).forEach(key => {
Object.keys(shas).forEach((key) => {
result.push(shas[key]);
});

Expand Down
26 changes: 9 additions & 17 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,15 @@
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="{{rootURL}}assets/screwdriver-ui.css">

<link rel="apple-touch-icon" sizes="57x57" href="{{rootURL}}assets/icons/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="{{rootURL}}assets/icons/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="{{rootURL}}assets/icons/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="{{rootURL}}assets/icons/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="{{rootURL}}assets/icons/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="{{rootURL}}assets/icons/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="{{rootURL}}assets/icons/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="{{rootURL}}assets/icons/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="{{rootURL}}assets/icons/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="{{rootURL}}assets/icons/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="{{rootURL}}assets/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="{{rootURL}}assets/icons/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="{{rootURL}}assets/icons/favicon-16x16.png">
<link rel="manifest" href="{{rootURL}}assets/icons/manifest.json">
<meta name="msapplication-TileColor" content="#0034a3">
<meta name="msapplication-TileImage" content="{{rootURL}}assets/icons/ms-icon-144x144.png">
<meta name="theme-color" content="#0034a3">

<link rel="apple-touch-icon" sizes="180x180" href="{{rootURL}}assets/icons/apple-touch-icon.png?v=A0RbkpndO6">
<link rel="icon" type="image/png" href="{{rootURL}}assets/icons/favicon-32x32.png?v=A0RbkpndO6" sizes="32x32">
<link rel="icon" type="image/png" href="{{rootURL}}assets/icons/favicon-16x16.png?v=A0RbkpndO6" sizes="16x16">
<link rel="manifest" href="{{rootURL}}assets/icons/manifest.json?v=A0RbkpndO6">
<link rel="mask-icon" href="{{rootURL}}assets/icons/safari-pinned-tab.svg?v=A0RbkpndO6" color="#0034a3">
<link rel="shortcut icon" href="{{rootURL}}assets/icons/favicon.ico?v=A0RbkpndO6">
<meta name="msapplication-config" content="{{rootURL}}assets/icons/browserconfig.xml?v=A0RbkpndO6">
<meta name="theme-color" content="#b9bdc5">

{{content-for "head-footer"}}
</head>
Expand Down
2 changes: 1 addition & 1 deletion app/pipeline/builds/build/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default Ember.Route.extend({
return `${model.job.get('name')} > #${model.build.get('sha').substr(0, 6)}`;
},
model(params) {
return this.store.findRecord('build', params.build_id).then(build => {
return this.store.findRecord('build', params.build_id).then((build) => {
// reload again in a little bit if queued
const reloadQueuedBuild = () => {
if (build.get('status') === 'QUEUED') {
Expand Down
8 changes: 4 additions & 4 deletions app/pipeline/builds/index/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import Ember from 'ember';
function getBuilds(jobs) {
const buildList = [];

jobs.forEach(j => {
jobs.forEach((j) => {
buildList.push(j.get('builds'));
});

// fetch all the builds
return Ember.RSVP.all(buildList).then(builds => {
return Ember.RSVP.all(buildList).then((builds) => {
let combined = [];

// put all the builds in a single array
builds.forEach(b => {
builds.forEach((b) => {
combined = combined.concat(b.slice());
});

Expand All @@ -33,7 +33,7 @@ export default Ember.Route.extend({
model() {
return this.get('pipeline.jobs')
// Split jobs from workflow
.then(jobs => {
.then((jobs) => {
// filter out the PRs
const workflowJobs = jobs.filter(j => !/^PR\-/.test(j.get('name')));

Expand Down
2 changes: 1 addition & 1 deletion app/pipeline/secrets/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default Ember.Controller.extend({
const newSecret = this.store.createRecord('secret', { name, value, pipelineId, allowInPR });

return newSecret.save()
.then(s => {
.then((s) => {
this.set('errorMessage', '');
this.get('model.secrets').reload();

Expand Down
2 changes: 1 addition & 1 deletion app/secret/serializer.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default DS.RESTSerializer.extend({

const dirty = snapshot.changedAttributes();

Object.keys(dirty).forEach(key => {
Object.keys(dirty).forEach((key) => {
dirty[key] = dirty[key][1];
});

Expand Down
1 change: 1 addition & 0 deletions app/styles/fuji-colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ $ycolor-gray-2: #f1f1f5;
$ycolor-gray-3: #e0e4e9;
$ycolor-gray-4: #d8dade;
$ycolor-gray-6: #979ba7;
$ycolor-gray-7: #878c91;
$ycolor-gray-11: #26282a;

/* colors,starting at noon position and moving clockwise in 1/18 slices */
Expand Down
Binary file removed public/assets/icons/android-icon-144x144.png
Binary file not shown.
Binary file removed public/assets/icons/android-icon-192x192.png
Binary file not shown.
Binary file removed public/assets/icons/android-icon-36x36.png
Binary file not shown.
Binary file removed public/assets/icons/android-icon-48x48.png
Binary file not shown.
Binary file removed public/assets/icons/android-icon-72x72.png
Binary file not shown.
Binary file removed public/assets/icons/android-icon-96x96.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-114x114.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-120x120.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-144x144.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-152x152.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-180x180.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-57x57.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-60x60.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-72x72.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-76x76.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon-precomposed.png
Binary file not shown.
Binary file removed public/assets/icons/apple-icon.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/apple-touch-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/apple-touch-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/apple-touch-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/apple-touch-icon-76x76.png
Binary file added public/assets/icons/apple-touch-icon.png
11 changes: 9 additions & 2 deletions public/assets/icons/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig><msapplication><tile><square70x70logo src="/assets/icons/ms-icon-70x70.png"/><square150x150logo src="/assets/icons/ms-icon-150x150.png"/><square310x310logo src="/assets/icons/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/assets/icons/mstile-150x150.png?v=A0RbkpndO6"/>
<TileColor>#b9bdc5</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file modified public/assets/icons/favicon-16x16.png
Binary file modified public/assets/icons/favicon-32x32.png
Binary file removed public/assets/icons/favicon-96x96.png
Diff not rendered.
Binary file added public/assets/icons/favicon.ico
Binary file not shown.
43 changes: 4 additions & 39 deletions public/assets/icons/manifest.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,6 @@
{
"name": "Screwdriver",
"icons": [
{
"src": "\/assets\/icons\/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/assets\/icons\/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/assets\/icons\/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/assets\/icons\/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/assets\/icons\/android-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/assets\/icons\/android-icon-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
"name": "screwdriver.cd",
"icons": [
],
"theme_color": "#b9bdc5"
}
Binary file removed public/assets/icons/ms-icon-144x144.png
Diff not rendered.
Binary file removed public/assets/icons/ms-icon-150x150.png
Diff not rendered.
Binary file removed public/assets/icons/ms-icon-310x310.png
Diff not rendered.
Binary file removed public/assets/icons/ms-icon-70x70.png
Diff not rendered.
Binary file added public/assets/icons/mstile-150x150.png
28 changes: 28 additions & 0 deletions public/assets/icons/safari-pinned-tab.svg
Binary file modified public/assets/sd_icon.png
Binary file modified public/assets/sd_logo.png
Binary file removed public/assets/sd_mainlogo.png
Diff not rendered.
Binary file modified public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/acceptance/pipeline-builds-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const shas = [
const makeBuilds = (jobId) => {
const builds = [];

shas.forEach(sha => {
shas.forEach((sha) => {
const b = Ember.copy(BUILD, true);
const config = {
id: Math.floor(Math.random() * 99999999999),
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/application/adapter-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ test('it uses cors for ajax', function (assert) {

let adapter = this.subject();

return adapter.ajax('fakeurl', 'GET').then(response => {
return adapter.ajax('fakeurl', 'GET').then((response) => {
assert.deepEqual(response, { foo: 'bar' });
});
});
Expand Down

0 comments on commit 11a4668

Please sign in to comment.