Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola-site
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 48db2c8eb6f4
Choose a base ref
...
head repository: getnikola/nikola-site
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b291f905e92c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 24, 2015

  1. Shorten header for input feature (didn’t fit)

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    Kwpolska committed Jul 24, 2015
    Copy the full SHA
    20b1669 View commit details
  2. Drop width “fix” (looks bad on 96 dpi)

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    Kwpolska committed Jul 24, 2015
    Copy the full SHA
    37b1eaa View commit details
  3. Use -webkit- prefix for brightness filter

    cc @Aeyoun
    
    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    Kwpolska committed Jul 24, 2015
    Copy the full SHA
    b291f90 View commit details
Showing with 5 additions and 4 deletions.
  1. +4 −3 files/assets/css/custom.css
  2. +1 −1 stories/index.html
7 changes: 4 additions & 3 deletions files/assets/css/custom.css
Original file line number Diff line number Diff line change
@@ -32,17 +32,18 @@ blockquote p, blockquote, p {
-ms-hyphens: auto;
-webkit-hyphens: auto;
hyphens: auto;
width: 32.1%;
}

.btn-primary.get-started {
-webkit-filter: brightness(100%);
filter: brightness(100%);
transition: filter 0.25s ease-in-out;
transition: filter,-webkit-filter 0.25s ease-in-out;
}

.btn-primary.get-started:hover {
-webkit-filter: brightness(107.5%);
filter: brightness(107.5%);
transition: filter 0.2s ease-out;
transition: filter,-webkit-filter 0.2s ease-out;
}

.feature-icon {
2 changes: 1 addition & 1 deletion stories/index.html
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ <h2 class="index-feature">Fast, incremental builds.</h2>
<div class="feature-icon feature-icon-formats">
<span class="fa-stack fa-3x"><i class="fa fa-circle fa-stack-2x"></i><i class="fa fa-file-text fa-stack-1x fa-inverse"></i></span>
</div>
<h2 class="index-feature">Any input format you like.</h2>
<h2 class="index-feature">Multiple input formats.</h2>
</a>
<p><a href="/handbook.html#supported-input-formats">Nikola will take input in many formats</a>. Out of the box, we support reStructuredText, Markdown, IPython (Jupyter) Notebooks and HTML, and have plugins for many other formats.</p>
</div>