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: roots/sage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: martensc/roots
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 56 files changed
  • 1 contributor

Commits on Jan 30, 2013

  1. removing less directory

    @martensc
    martensc committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    e7154ab View commit details
    Browse the repository at this point in the history

  2. added in thomas-mcdonald / bootstrap-sass files

    @martensc
    martensc committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    63961ce View commit details
    Browse the repository at this point in the history

  3. removing unused css files

    @martensc
    martensc committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    0a31f1f View commit details
    Browse the repository at this point in the history

  4. app.css is now sassy!

    @martensc
    martensc committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    be517fe View commit details
    Browse the repository at this point in the history

  5. updated the theme name to Sassy Roots

    @martensc
    martensc committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    4727841 View commit details
    Browse the repository at this point in the history

  6. added in the bloginfo description to the header.php

    @martensc
    martensc committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    d596119 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2013

  1. Merge remote-tracking branch 'upstream/master' 

    * upstream/master:
  Don't show comments on passworded posts
  Fix #639 - Add do_action('get_header')
  Simplify entry meta
  Change JS ordering
  Allow get_search_form() to be called more than once per request
  Update comment about jQuery
  JavaScript clean up
  Update Korean Translation
  Updated Macedonian translation (thx @maced0n)
  Remove conditional feed in head.php
  Introduce add_theme_support('bootstrap-gallery')
  config.php organization
  Rewrites organization
  Turkish translation updated
  Update Bulgarian l10n
  Update Bulgarian l10n
  Plural-Forms Fix - French
  Generate new roots.pot with makepot.php
  Use relative paths in README and docs TOC
  Added backslash to add_editor_style

Conflicts:
	lib/config.php
    @martensc
    martensc committed Feb 7, 2013
    Configuration menu
    Copy the full SHA
    fb885c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2013

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	assets/css/app.css
	assets/css/bootstrap-responsive.css
	assets/css/bootstrap.css
	assets/css/less/bootstrap.less
	assets/css/less/mixins.less
	assets/css/less/variables.less
	assets/css/scss/bootstrap/_buttons.scss
	assets/css/scss/bootstrap/_carousel.scss
	assets/css/scss/bootstrap/_close.scss
	assets/css/scss/bootstrap/_dropdowns.scss
	assets/css/scss/bootstrap/_forms.scss
	assets/css/scss/bootstrap/_labels-badges.scss
	assets/css/scss/bootstrap/_navbar.scss
	assets/css/scss/bootstrap/_navs.scss
	assets/css/scss/bootstrap/_pagination.scss
	assets/css/scss/bootstrap/_popovers.scss
	assets/css/scss/bootstrap/_responsive-navbar.scss
	assets/css/scss/bootstrap/_responsive-utilities.scss
	assets/css/scss/bootstrap/_scaffolding.scss
	assets/css/scss/bootstrap/_sprites.scss
	assets/css/scss/bootstrap/_tables.scss
	assets/css/scss/bootstrap/_thumbnails.scss
	assets/css/scss/bootstrap/_tooltip.scss
	assets/css/scss/bootstrap/_type.scss
	style.css
    @martensc
    martensc committed Feb 10, 2013
    Configuration menu
    Copy the full SHA
    5163c60 View commit details
    Browse the repository at this point in the history

  2. updated sass bootstrap. Feb 08, 2013

    @martensc
    martensc committed Feb 10, 2013
    Configuration menu
    Copy the full SHA
    a4932e8 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2013

  1. Merge remote-tracking branch 'upstream/master' 

    * upstream/master:
  Simplify alerts
  Add section about grunt to README
  Remove disabled post nav links
  Ref #652 - Add installation/config info to docs TOC
  Use Bootstrap media object for listing comments
  Remove WP Super Cache, add Soil to Recommended Plugins
  Updated polish translation
  Update README
  Update contributing guidelines
  Close #680 - Move Google Analytics to scripts.php
    @martensc
    martensc committed Feb 13, 2013
    Configuration menu
    Copy the full SHA
    a9a5305 View commit details
    Browse the repository at this point in the history

  2. Moved scss to root of assets dir and renamed sass

    @martensc
    martensc committed Feb 13, 2013
    Configuration menu
    Copy the full SHA
    80c9474 View commit details
    Browse the repository at this point in the history

  3. Commented line require 'bootstrap-sass' in config.rb file 

    This is so people don't get an error if they haven't installed the gem.
    @martensc
    martensc committed Feb 13, 2013
    Configuration menu
    Copy the full SHA
    af0fc07 View commit details
    Browse the repository at this point in the history
Loading