Skip to content
This repository has been archived by the owner. It is now read-only.

up to date ready to build version with design changes and 0.4.23 library #214

Merged
merged 34 commits into from
Mar 4, 2016
Merged

up to date ready to build version with design changes and 0.4.23 library #214

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b23f779
fonts
Sep 14, 2015
f604e0b
Merge branch 'master' of https://github.com/processing/p5.js-editor i…
Sep 30, 2015
0d307b6
fonts
Sep 30, 2015
2a7cd4f
progres
Sep 30, 2015
f59f13a
getting there
Sep 30, 2015
14e89df
some stuff
Oct 1, 2015
85e864f
buttons
Oct 4, 2015
146d697
scrollbar
Oct 4, 2015
2e48262
prefs
Oct 4, 2015
a0e98fc
icons
Oct 5, 2015
1c25639
buttons
Oct 5, 2015
1586d31
buttons
Oct 5, 2015
eebee5b
Merge branch 'master' of github.com:lmccart/p5.js-editor into design
Oct 13, 2015
f539f20
settings
Oct 13, 2015
668ba5f
recent
Jan 11, 2016
707988b
settings all working
Jan 11, 2016
855baf7
prefs done
Jan 12, 2016
ef21b36
prefs done
Jan 12, 2016
5f16b7c
header
Jan 15, 2016
d25ae42
sidebar
Jan 15, 2016
3a414de
toggle icon
Jan 15, 2016
5dc12f8
close
Jan 16, 2016
109ec42
minor borders
Jan 19, 2016
93541b1
fix run in browser
Jan 19, 2016
107600f
commented out find styling
Jan 19, 2016
ba33a63
remove npm-debug.log
Jan 19, 2016
189cbb8
styling
Jan 19, 2016
f621c8e
fix runInBrowser
Jan 22, 2016
3c763d9
design fully implemented?
Jan 23, 2016
da5deb9
Merge branch 'master' of https://github.com/processing/p5.js-editor i…
Mar 1, 2016
ca69cc3
fix to stop play button
Mar 4, 2016
73515cb
fix toggle runInBrowser
Mar 4, 2016
31ca7bf
updating package
Mar 4, 2016
db47970
Merge branch 'design' of github.com:lmccart/p5.js-editor
Mar 4, 2016
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
Prev Previous commit
Next Next commit
prefs done
  • Loading branch information
Lauren McCarthy committed Jan 12, 2016
commit 855baf7316d73b280c7531b379c62cd9b85b97be
26 changes: 22 additions & 4 deletions app/settings/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,28 @@
font-size: 16px;
font-family: inconsolata;
text-align: center;
margin-right: 22px;
margin: 0 18px;
display: inline-block;
vertical-align: top;
}

.adjustButtonContainer {
width: 43px;
text-align: center;
display: inline-block;
vertical-align: top;
}

.adjustButton {
width: 36px;
height: 36px;
width: 32px;
height: 32px;
cursor: pointer;
margin-right: 22px;
}

.adjustButtonContainer label {
font-size: 9px;
color: #b5b5b5;
margin-top: 8px;
}

input:focus {
Expand Down Expand Up @@ -202,6 +216,10 @@
display: inline;
}

#indentOptions {
margin-left: 12px;
}

#indentOptions .radioSelection {
margin-bottom: 10px;
margin-right: 0px;
Expand Down
36 changes: 23 additions & 13 deletions app/settings/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,35 @@
<!-- Text size -->
<div class="section">
<p class="label">Text size</p>
<img class="adjustButton button" src="images/minus-button.svg" v-on="click: decreaseFontSize">
<span class="adjustButtonContainer">
<img class="adjustButton button" src="images/minus-button.svg" v-on="click: decreaseFontSize">
<label>Decrease</label>
</span>
<input id="textAdjustInput" type="text" v-model="fontSize" size=3>
<img class="adjustButton button" src="images/plus-button.svg" v-on="click: increaseFontSize">
<span class="adjustButtonContainer">
<img class="adjustButton button" src="images/plus-button.svg" v-on="click: increaseFontSize">
<label>Increase</label>
</span>
</div>

<!-- Indentation amount -->
<div id="indentation" class="section">
<p class="label">Indentation amount</p>
<div id="indentationAmount">
<span class="adjustButtonContainer">
<img class="adjustButton button" src="images/minus-button.svg" v-on="click: decreaseTabSize">
<input id="tabSize" type="text" v-model="tabSizeDisplay" size=3 v-on="change: updateTabSize">
<label>Decrease</label>
</span>
<input id="tabSize" type="text" v-model="tabSizeDisplay" size=3 v-on="change: updateTabSize">
<span class="adjustButtonContainer">
<img class="adjustButton button" src="images/plus-button.svg" v-on="click: increaseTabSize">
</div>
<label>Increase</label>
</span>

<div id="indentOptions" class="hiddenRadio radioOptions">
<input type="radio" value="spaces" id="tabTypeS" v-model="tabType">
<label class="radioSelection" for="tabTypeS">spaces</label>
<label class="radioSelection" for="tabTypeS">Spaces</label>
<input type="radio" value="tabs" id="tabTypeT" v-model="tabType">
<label class="radioSelection" for="tabTypeT">tabs</label>
<label class="radioSelection" for="tabTypeT">Tabs</label>
</div>
</div>

Expand All @@ -34,9 +44,9 @@
<p class="label">Word wrap</p>
<div id="wwOptions" class="hiddenRadio radioOptions">
<input type="radio" value="true" id="wordWrapOn" v-model="wordWrap">
<label class="radioSelection" for="wordWrapOn">on</label>
<label class="radioSelection" for="wordWrapOn">On</label>
<input type="radio" value="false" id="wordWrapOff" v-model="wordWrap">
<label class="radioSelection" for="wordWrapOff">off</label>
<label class="radioSelection" for="wordWrapOff">Off</label>
</div>
</div>

Expand All @@ -45,9 +55,9 @@
<p class="label">Run in browser</p>
<div id="ribOptions" class="hiddenRadio radioOptions">
<input type="radio" value=true id="runInBrowserOn" v-model="runInBrowser">
<label class="radioSelection" for="runInBrowserOn">on</label>
<label class="radioSelection" for="runInBrowserOn">On</label>
<input type="radio" value=false id="runInBrowserOff" v-model="runInBrowser">
<label class="radioSelection" for="runInBrowserOff">off</label>
<label class="radioSelection" for="runInBrowserOff">Off</label>
</div>
</div>

Expand All @@ -71,9 +81,9 @@
<p class="label">Show sidebar</p>
<div id="ssOptions" class="hiddenRadio radioOptions">
<input type="radio" value="true" id="showSidebarOn" v-model="showSidebar">
<label class="radioSelection" for="showSidebarOn">on</label>
<label class="radioSelection" for="showSidebarOn">On</label>
<input type="radio" value="false" id="showSidebarOff" v-model="showSidebar">
<label class="radioSelection" for="showSidebarOff">off</label>
<label class="radioSelection" for="showSidebarOff">Off</label>
</div>
</div>

Expand Down