Skip to content

Porting to Polymer 1.0 #3

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.

Sign up for GitHub

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

Merged
SmokyBob merged 11 commits into from
Jul 5, 2015
Merged

Porting to Polymer 1.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
84a46ef
evaluate all the lines for maxLenght
SmokyBob Dec 24, 2014
2503454
Branch clarifications
SmokyBob Dec 25, 2014
543844c
Merge branch 'chromeApp' of github.com:SmokyBob/PrettyCode into 0.9
SmokyBob May 22, 2015
1c7f89f
initial port to 1.0 UI
SmokyBob Jun 28, 2015
2ad67a9
partially fixed js for 1.0, fixed style changes from js, added code t…
SmokyBob Jun 28, 2015
dc748ed
added fixed color style
SmokyBob Jun 30, 2015
e754f0c
added missing styles and small style fixes
SmokyBob Jun 30, 2015
b2bd646
use computedProperties to calculate classes and partially cleaned up …
SmokyBob Jun 30, 2015
6ce9128
fix fontSize change
SmokyBob Jun 30, 2015
6741d7e
bump version to 1.0
SmokyBob Jul 1, 2015
0d667ba
small fix
SmokyBob Jul 1, 2015
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
bower_components
vulcanized.js
vulcanized.html
vulcanized.html
index.build.html
index.build.js
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ PrettyCode
==========

Chrome App to prettify code and have it ready to copy and paste in presentation/documents keeping the formatting
`master` branch is the website version
`chromeApp` is the code with the changes needed to make everything works in a Chrome App
2 changes: 1 addition & 1 deletion background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
chrome.app.runtime.onLaunched.addListener(function(launchData) {
chrome.app.window.create(
'index.html',
'index.html',//Open the minified and CSP enabled code
{
id: 'mainWindow',
bounds: {width: 800, height: 600}
Expand Down
16 changes: 8 additions & 8 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"author": "",
"private": true,
"dependencies": {
"polymer": "Polymer/polymer#^0.5.2",
"core-elements": "Polymer/core-elements#^0.5.2",
"prettify-element": "SmokyBob/prettify-element#master",
"paper-button": "Polymer/paper-button#~0.5.2",
"paper-dropdown-menu": "Polymer/paper-dropdown-menu#~0.5.2",
"paper-dropdown": "Polymer/paper-dropdown#~0.5.2",
"paper-input": "Polymer/paper-input#~0.5.2",
"paper-toggle-button": "Polymer/paper-toggle-button#~0.5.2"
"polymer": "Polymer/polymer#^1.0.5",
"prettify-element": "smokybob/prettify-element#1.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.1",
"iron-icons": "PolymerElements/iron-icons#^1.0.1",
"paper-input": "PolymerElements/paper-input#^1.0.0",
"paper-button": "PolymerElements/paper-button#^1.0.1",
"paper-toggle-button": "PolymerElements/paper-toggle-button#^1.0.1",
"iron-autogrow-textarea": "SmokyBob/iron-autogrow-textarea#inherit-color"
}
}
51 changes: 32 additions & 19 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,36 @@
<html>
<head>
<title>PrettyCode</title>
<link rel="stylesheet" href="styles.css">
<!--<link rel="stylesheet" href="styles.css">-->
<link rel="stylesheet" href="fonts.css">

<script src="setShadow.js"></script>

<link rel="import" href="bower_components/polymer/polymer.html">
<link rel="import" href="bower_components/iron-flex-layout/classes/iron-flex-layout.html">
<link rel="import" href="bower_components/prettify-element/prettify-element.html">
<link rel="import" href="bower_components/core-icons/core-icons.html">
<link rel="import" href="bower_components/core-menu/core-menu.html">
<link rel="import" href="bower_components/paper-item/paper-item.html">
<link rel="import" href="bower_components/iron-icons/iron-icons.html">
<link rel="import" href="bower_components/paper-input/paper-input.html">
<link rel="import" href="bower_components/paper-input/paper-autogrow-textarea.html">
<link rel="import" href="bower_components/paper-input/paper-textarea.html">
<link rel="import" href="bower_components/paper-button/paper-button.html">
<link rel="import" href="bower_components/paper-toggle-button/paper-toggle-button.html">
<link rel="import" href="bower_components/paper-dropdown/paper-dropdown.html">
<link rel="import" href="bower_components/paper-dropdown-menu/paper-dropdown-menu.html">

<link rel="import" href="styles.html">
</head>

<body unresolved fit>
<template id='mainContent' is="auto-binding">
<div fit layout vertical>
<div horizontal layout style="margin-top:5px">
<body class="fit">
<template id="mainContent" is="dom-bind">
<div id="mainDiv" class$="[[_computedBodyClass(theme)]]">
<div class="horizontal layout" style="margin-top:5px">
<div style="margin:5px">Light</div>
<paper-toggle-button id="ptbTheme" style="margin:5px" on-change="{{chTheme}}"></paper-toggle-button>
<paper-toggle-button id="ptbTheme" checked="{{_selTheme(theme)}}"
style="margin:5px"
on-change="chTheme"></paper-toggle-button>
<div style="margin:5px">Dark</div>
</div>
<div layout horizontal>
<div class="layout horizontal">
<!--Language selection hidden as now the lang class id difficult to set on the prettify-element-->
<!--
<paper-dropdown-menu id="pdmLanguage" label="Select Language"
on-core-select="{{languageSelected}}">
<paper-dropdown id="lang" class="dropdown">
Expand All @@ -41,16 +46,24 @@
</core-menu>
</paper-dropdown>
</paper-dropdown-menu>
<paper-input id="ptDimension" label="Font size (pt)" value="{{fontPt}}"
floatingLabel="true" on-change="{{ptChange}}"
-->
<paper-input id="ptDimension" label="Font size (pt)"
class$="[[_computedThemeClass(theme)]]"
value="{{fontPt}}" on-value-changed="ptChange"
type="number" auto-validate
always-float-label
style="margin-left:10px;" ></paper-input>
</div>
<paper-autogrow-textarea id="agTa" maxrows='20'>
<textarea id="taCode"></textarea>
</paper-autogrow-textarea>
<paper-textarea id="agTa" class$="[[_computedThemeClass(theme)]]"
value="{{code}}" on-value-changed="codeChanged">
</paper-textarea>
<div id="slidesWarnings">
</div>
<prettify-element id="destination" text="{{code}}" language="{{language}}" on-tap="{{selPrettyCode}}" flex style='overflow:auto'></prettify-element>
<prettify-element id="destination"
text="{{code}}"
language="{{language}}"
on-tap="selPrettyCode"
class$="[[_computedDestinationClass(theme)]]"></prettify-element>
</div>
</template>

Expand Down
Loading