Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-release'

Browse source
This commit is contained in:
Jeff Parsons 2016-12-01 22:01:29 -08:00
commit c6aab61869
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/shared/templates/common.css
View file

@ -73,7 +73,7 @@ pre a, code a {
font-size: 15px; font-size: 15px;
} }
.machine { .machine {
margin: 15px; /*margin: 15px;*/
overflow: hidden; overflow: hidden;
} }
.c1pjs { .c1pjs {

2
modules/shared/templates/common.html
View file

@ -55,7 +55,7 @@
<p class="common-copyright"> <p class="common-copyright">
<!-- When using AWS, the pcjs.org domain must redirect to www.pcjs.org, so let's avoid unnecessary redirects in any absolute URLs --> <!-- When using AWS, the pcjs.org domain must redirect to www.pcjs.org, so let's avoid unnecessary redirects in any absolute URLs -->
<span class="common-copyright"><a href="http://www.pcjs.org/">pcjs.org</a> © 2012-<!-- pcjs:year --> by <a href="http://twitter.com/jeffpar">@jeffpar</a></span><br/> <span class="common-copyright"><a href="http://www.pcjs.org/">pcjs.org</a> © 2012-<!-- pcjs:year --> by <a href="http://twitter.com/jeffpar">@jeffpar</a></span><br/>
<span class="common-copyright"><a href="http://github.com/jeffpar/pcjs">PCjs</a> machines released under <a href="http://gnu.org/licenses/gpl.html">GPLv3</a></span> <span class="common-copyright"><a href="http://github.com/jeffpar/pcjs">PCjs Project</a> released under <a href="http://gnu.org/licenses/gpl.html">GPLv3</a></span>
</p> </p>
</div> </div>
</div> </div>

2
modules/shared/templates/common.xsl
View file

@ -50,7 +50,7 @@
<p class="common-reference"></p> <p class="common-reference"></p>
<p class="common-copyright"> <p class="common-copyright">
<span class="common-copyright"><a href="http://www.pcjs.org/">pcjs.org</a> © 2012-2016 by <a href="http://twitter.com/jeffpar">@jeffpar</a></span><br/> <span class="common-copyright"><a href="http://www.pcjs.org/">pcjs.org</a> © 2012-2016 by <a href="http://twitter.com/jeffpar">@jeffpar</a></span><br/>
<span class="common-copyright"><a href="http://github.com/jeffpar/pcjs">PCjs</a> machines released under <a href="http://gnu.org/licenses/gpl.html">GPLv3</a></span> <span class="common-copyright"><a href="http://github.com/jeffpar/pcjs">PCjs Project</a> released under <a href="http://gnu.org/licenses/gpl.html">GPLv3</a></span>
</p> </p>
</div> </div>
</xsl:template> </xsl:template>

11
modules/shared/templates/components.css
View file

@ -248,11 +248,16 @@
} }
} }
@media screen and (min-width: 1400px) { @media screen and (min-width: 1200px) {
.machine-left, .machine-right { .machine-left {
max-width: 45%; max-width: 48%;
float: left; float: left;
} }
.machine-right {
max-width: 48%;
float: left;
margin-left: 30px;
}
.machine-right + * { .machine-right + * {
clear: both; clear: both;
} }