Skip to content

Commit

Permalink
Merge pull request #13 from srowhani/master
Browse files Browse the repository at this point in the history
Feature request
  • Loading branch information
sglanzer committed Aug 23, 2016
2 parents 58e9b72 + 7bfa3dd commit 3f82c3d
Show file tree
Hide file tree
Showing 20 changed files with 328 additions and 266 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ env:
matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
before_install:
- npm config set spin false
- npm install -g coveralls pr-bumper
Expand Down Expand Up @@ -58,4 +60,4 @@ after_deploy:
- .travis/publish-gh-pages.sh
notifications:
slack:
secure: MvcvgkkRxhJPaJFh5fd9oilMm7KAPNYTrovRjr1DhjDW63HcBOWqZtvNrylGknciEp9AKs0wxfM2OetlJ84GctLAjRn6muxwYobEEZKGFi84eW3czu745Y+BmUnDkIWsUFwofKiPIXh+4+iWrIk8Z1DLgovXFKFPGYVUmcgnVSWIRD+dTaQv9nAI55JddGuFUhfLv7tNVoer4zKM3TA+eXZg3ZJXgrLuFgyfh2QTsVLN8g3+PDza/azX+kM1wx0bQQqTm5PdccHsg5jHFetWWTY7oNVvQLeadLc4zq5p91rTeRV9np05e5U0lnYS8ikyFfGeM/VRG1KNeNCwbcxgFli6rpW76TtVdBC/26pXwPBm44LrChhAw3QQc2i+rd9ah3OfePQ42MZcaxpDpWFDBjmVh/UhjplYHZa/yV8rwp0M7XZLg9h0TLOjUVY/co9b0Ci4l+R69DYYMYrgZDaIzedwUVjT+tzx9B0H3etW+QZYKKuAE4gOlN8kEIfC1e6WsWpwMvmKLw039owgSd4VWHLuqadQTNH/tq6oRFhFp3vuKI4TgL8ua/I6EKB7+B7Je9mszxhI5XMhBM+8uYcRHu+TPCpEvHOzyrtDlB2XHc1ozheyzpyJMKudBOvjS3XC3lcwUNqwrZXItnENTICWPzg4pMhyhLJRjKlLiwy80so=
secure: MvcvgkkRxhJPaJFh5fd9oilMm7KAPNYTrovRjr1DhjDW63HcBOWqZtvNrylGknciEp9AKs0wxfM2OetlJ84GctLAjRn6muxwYobEEZKGFi84eW3czu745Y+BmUnDkIWsUFwofKiPIXh+4+iWrIk8Z1DLgovXFKFPGYVUmcgnVSWIRD+dTaQv9nAI55JddGuFUhfLv7tNVoer4zKM3TA+eXZg3ZJXgrLuFgyfh2QTsVLN8g3+PDza/azX+kM1wx0bQQqTm5PdccHsg5jHFetWWTY7oNVvQLeadLc4zq5p91rTeRV9np05e5U0lnYS8ikyFfGeM/VRG1KNeNCwbcxgFli6rpW76TtVdBC/26pXwPBm44LrChhAw3QQc2i+rd9ah3OfePQ42MZcaxpDpWFDBjmVh/UhjplYHZa/yV8rwp0M7XZLg9h0TLOjUVY/co9b0Ci4l+R69DYYMYrgZDaIzedwUVjT+tzx9B0H3etW+QZYKKuAE4gOlN8kEIfC1e6WsWpwMvmKLw039owgSd4VWHLuqadQTNH/tq6oRFhFp3vuKI4TgL8ua/I6EKB7+B7Je9mszxhI5XMhBM+8uYcRHu+TPCpEvHOzyrtDlB2XHc1ozheyzpyJMKudBOvjS3XC3lcwUNqwrZXItnENTICWPzg4pMhyhLJRjKlLiwy80so=
12 changes: 12 additions & 0 deletions addon/components/frost-details-pod.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import layout from '../templates/components/frost-details-pod'
import FrostPods from './frost-pods'

export default FrostPods.extend({
layout,
classNames: [
'top',
'right',
'frost-details-pod'
],
pack: 'frost'
})
3 changes: 3 additions & 0 deletions addon/components/frost-pods.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import _ from 'lodash/lodash'

export default Ember.Component.extend({
classNames: ['frost-pods'],
classNameBindings: ['orientation'],

orientation: 'vertical',

podNames: Ember.computed('podStack.[]', function () {
return _.dropRight(this.get('podStack').map(function (entry) {
Expand Down
90 changes: 90 additions & 0 deletions addon/styles/_frost-details-pod.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
@import 'node_modules/ember-frost-core/addon/styles/frost-theme';
.frost-pods {
&.frost-details-pod {
.pod {
&.context {
display: (flex);

.header {
border-bottom: 1px solid $frost-color-lgrey-1;
.session {
.row {
padding: 15px 15px 0 15px;
display: flex;
flex-direction: row;
border-bottom: 1px solid $frost-color-lgrey-1;
.property {
color: #7D85B2;
flex: 1;
.title {
font-size: $frost-font-s;
font-weight: bold;
color: $frost-color-grey-5;
}
.value {
padding-top: 5px;
font-size: $frost-font-s;
color: $frost-color-grey-1;
}
.link {
padding-top: 5px;
flex-direction: row-reverse;
font-size: $frost-font-s;
color: $frost-color-grey-1;
margin-left: auto;
display: block;
width: 65px;
}
}
}
padding: 10px 15px 10px 20px;
display: flex;
flex-direction: column;

&.with-bottom {
border-bottom: 1px solid $frost-color-lgrey-1;
}
}
.close {
border: none;
position: relative;

.icon {
width: 70px;
height: 70px;
svg {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 50px;
height: 50px;
}
}
.frost-test {
margin: 10px 10px 10px 10px;
padding: 5px 5px 5px 5px;
border: 5px groove $frost-color-lgrey-1;
}
}
}
.content {
display: flex;
flex-direction: column;
overflow: scroll;
max-height: 70vh;
max-width: 100vw;
}
.bottom {
padding: 1px 15px 10px 15px;
display: flex;
flex-direction: row-reverse;
.row {
padding: 10px 15px 0 15px;
display: flex;
}
}
}
}
}
}
13 changes: 12 additions & 1 deletion addon/styles/addon.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
@import 'node_modules/ember-frost-core/addon/styles/frost-theme';

@import 'frost-details-pod';
$frost-color-critical-1: #E52C2C;
$frost-color-major-1: #EF8E00;
$frost-color-minor-1: #DDD326;
$frost-color-warn-1: #7D85B2;

.frost-pods {
position: absolute;
&.vertical {
.pod.context {
flex-direction: column;
}
}
&.horizontal {
.pod.context {
flex-direction: row;
}
}
}

.frost-pods.top {
Expand Down Expand Up @@ -35,6 +45,7 @@ $frost-color-warn-1: #7D85B2;
}

.frost-pods .pod.context {
transition: flex-direction 0.2s ease;
padding-bottom: 15px;
}

Expand Down
44 changes: 44 additions & 0 deletions addon/templates/components/frost-details-pod.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{{#liquid-if isPodVisible}}
{{#liquid-if podLayer.root class='liquid-pods'}}
<div class="pod context">
<div class="header">
{{#if icon}}
<div class="close">
<div class='icon'>
{{frost-icon icon=icon pack=pack}}
</div>
</div>
{{/if}}

<div class="title">
<div class="primary">{{title}}
<div class="comment">{{subTitle}}</div>
</div>
<div class='secondary'>
{{description}}
</div>
</div>
</div>
<div class='content'>
{{yield this (hash
openPod=(action 'openPod')
closePod=(action 'closePod')
changePod=(action 'changePod')
)}}
</div>
<div class="bottom">
{{#each menuActions as |item|}}
<div class="row">
{{#frost-button
class='text small'
priority=item.priority
onClick=(action item.action)
}}
{{item.text}}
{{/frost-button}}
</div>
{{/each}}
</div>
</div>
{{/liquid-if}}
{{/liquid-if}}
3 changes: 1 addition & 2 deletions addon/templates/components/frost-pods.hbs
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
ember-frost-pods component
{{yield}}
{{yield}}
1 change: 1 addition & 0 deletions app/components/frost-details-pod.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from 'ember-frost-pods/components/frost-details-pod'
7 changes: 4 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ember-frost-pods",
"dependencies": {
"ember": "~2.3.0",
"ember": "~2.6.0",
"ember-cli-shims": "0.1.0",
"ember-cli-test-loader": "0.2.2",
"ember-inflector": "1.3.1",
Expand All @@ -11,10 +11,11 @@
"lodash": "^4.10.0",
"perfect-scrollbar": ">=0.6.7 <2.0.0",
"pretender": "~0.12.0",
"sinonjs": "1.17.1"
"sinonjs": "1.17.1",
"animation-frame": "~0.2.4"
},
"resolutions": {
"ember": "~2.3.0"
"ember": "~2.6.0"
},
"devDependencies": {
"blanket": "5e94fc30f2e694bb5c3718ddcbf60d467f4b4d26"
Expand Down
30 changes: 22 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"build": "ember build",
"start": "ember server",
"test": "npm run lint && ember test",
"lint": "eslint *.js addon app config tests"
"lint": "eslint *.js addon app config tests --fix"
},
"repository": "git@github.com:ciena-frost/ember-frost-pods.git",
"engines": {
Expand All @@ -21,33 +21,47 @@
"devDependencies": {
"broccoli-asset-rev": "^2.2.0",
"ember-ajax": "0.7.1",
"ember-async-image": "0.1.1",
"ember-block-slots": "1.1.1",
"ember-browserify": "1.1.12",
"ember-cli": "~2.3.0",
"ember-cli-app-version": "^1.0.0",
"ember-cli-blanket": "0.9.2",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-import-polyfill": "0.2.0",
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-mirage": "~0.1.11",
"ember-cli-mocha": "^0.10.0",
"ember-cli-notifications": "^3.2.0",
"ember-cli-release": "0.2.8",
"ember-cli-sri": "^2.0.0",
"ember-cli-uglify": "^1.2.0",
"ember-computed-decorators": "0.2.2",
"ember-concurrency": "0.7.8",
"ember-data": "~2.3.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-frost-core": ">=0.7.0 <2.0.0",
"ember-frost-core": "0.25.0",
"ember-frost-list": "0.7.6",
"ember-frost-notifier": "2.1.1",
"ember-hook": "1.3.1",
"ember-load-initializers": "^0.5.0",
"ember-lodash": "0.0.7",
"ember-one-way-controls": "0.6.3",
"ember-lodash-shim": "0.1.18",
"ember-one-way-controls": "1.0.0",
"ember-prop-types": "2.5.4",
"ember-redux": "1.5.1",
"ember-resolver": "^2.0.3",
"ember-run-raf": "1.1.2",
"ember-truth-helpers": "1.2.0",
"ember-try": "^0.2.0",
"eslint": "2.9.0",
"eslint-config-frost-standard": "^2.0.0",
"loader.js": "^4.0.0",
"ember-frost-list": "^0.6.0"
"lodash-es": "4.14.1",
"redux": "3.5.2",
"redux-thunk": "2.1.0",
"smoke-and-mirrors": "0.5.4",
"svg4everybody": "2.1.0"
},
"keywords": [
"ember-addon",
Expand All @@ -58,9 +72,9 @@
"ember-computed-decorators": "^0.2.2",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-sass": "^5.2.0",
"liquid-fire": "^0.22.0"
"liquid-fire": "^0.24.1"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}
5 changes: 3 additions & 2 deletions testem.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
"test_page": "tests/index.html?hidepassed&coverage",
"disable_watching": true,
"launch_in_ci": [
"Firefox"
"Firefox"
],
"launch_in_dev": [
"Chrome"
"Firefox",
"Chrome"
]
}
45 changes: 0 additions & 45 deletions tests/acceptance/pods-test.js

This file was deleted.

Loading

0 comments on commit 3f82c3d

Please sign in to comment.