Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jordansissel/lol-logging
base: 6f427a458c
...
head fork: jordansissel/lol-logging
compare: 1c94110992
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 17 additions and 3 deletions.
  1. +4 −0 Makefile
  2. +7 −0 _layouts/landing.html
  3. +6 −3 sass/style.scss
View
4 Makefile
@@ -5,3 +5,7 @@ publish:
git checkout gh-pages
-sh update.sh
git checkout master
+
+publish2:
+ jekyll --no-auto --base-url /logging /tmp/generate-lol-logging
+ rsync -av --exclude .git /tmp/generate-lol-logging/ semicomplete.com:s/logging
View
7 _layouts/landing.html
@@ -26,6 +26,13 @@
Modernizr enables HTML5 elements & feature detects for optimal performance.
Create your own custom Modernizr build: www.modernizr.com/download/ -->
<script src="js/libs/modernizr-2.5.3.min.js"></script>
+ <style>
+ /* This is necessary because I don't know how to make Jekyll do template
+ * processing on sass/css files */
+ .splash .inner {
+ background: url("{{ site.baseurl }}/img/logstash.png") top right no-repeat;
+ }
+ </style>
</head>
<body class="landing">
<!-- Prompt IE 6 users to install Chrome Frame. Remove this if you support IE 6.
View
9 sass/style.scss
@@ -36,7 +36,9 @@ html {
.inner {
padding: 40px;
- background: url(/lol-logging/img/logstash.png) top right no-repeat;
+ /* Jekyll won't apply {{ foo }} template stuff to sass/css, so,
+ * this url is specified in _layouts/landing.html */
+ //background: url(/lol-logging/img/logstash.png) top right no-repeat;
}
h1 {
text-shadow: black 1px 1px 8px;
@@ -60,12 +62,13 @@ div#content {
.featurelet {
min-width: 300px;
- width: 31.623931624%;
float: left;
margin-top: 10px !important;
color: white;
- margin-left: 1.2820512819999976%;
+ /* 3 columns. (width * 3) + (margin-left * 4) == 100% */
+ width: 31.623931624%;
+ margin-left: 1.282051281%;
.inner {
@extend .secondary-b-2;
width: 100%;

No commit comments for this range

Something went wrong with that request. Please try again.