Skip to content

Commit

Permalink
removed unnecessary resolution and updated pragraph styles
Browse files Browse the repository at this point in the history
  • Loading branch information
prathap937 committed Dec 8, 2016
1 parent f0dbcb8 commit d25d6b2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@
"paper-icon-button": "PolymerElements/paper-icon-button#^1.1.2",
"web-socket": "*",
"paper-progress": "PolymerElements/paper-progress#^1.0.10",
"polymer-d3": "https://github.com/arunsoman/polymer-d3.git#6ab68e"
"polymer-d3": "arunsoman/polymer-d3.git"
},
"resolutions": {
"polymer-sortablejs": "master",
"paper-styles": "~1.0.13",
"web-animations-js": "^2.2.0",

This comment has been minimized.

Copy link
@sravan-s

sravan-s Dec 8, 2016

Collaborator

This might be necessary,
see PolymerElements/neon-animation#210

This comment has been minimized.

Copy link
@prathap937

prathap937 Dec 8, 2016

Author Collaborator

web-animations-js is not added as a dependency for this component

"neon-animation": "v1.2.4"
},
"_release": "bab9683ac5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@

.editor-true {
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26), 0 1px 0px 0 rgba(0, 0, 0, 0.12);
margin: 0.5rem 0 1rem 0;
}

.card {
.editor-card{
margin: 0.5rem 0 1rem 0;
}
.editor-true.card{
background-color: rgb(237, 237, 237);
border-radius: 2px;
}
.card {
padding: 2em;
position: relative;
margin-left: 15px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<link rel="import" type="css" href="zeppelin-paragraph.css">
<template>
<div class$="col-md-12 col-md-[[ paragraph.config.colWidth ]] col">
<article class$="card editor-[[ editor ]]">
<article class$="card editor-card editor-[[ !viewMode ]]">
<template is="dom-if" if="{{!viewMode}}">
<template is="dom-if" if="[[ editor ]]" restamp>
<template is="dom-if" if="[[ !viewMode ]]" restamp>
<!-- Title -->
<header>
<h2>[[paragraph.title]]</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Polymer({
// No editor, settings et al.
viewMode: {
type: Boolean,
value: false
value: true
},
// import dependency charts
charts: {
Expand Down

0 comments on commit d25d6b2

Please sign in to comment.