8000 Comparing nadarei:master...trumaker:master · nadarei/nkss-rails · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
10000
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: nadarei/nkss-rails
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: trumaker/nkss-rails
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 16 commits
  • 7 files changed
  • 4 contributors

Commits on Mar 18, 2013

  1. Add kss.coffee to generate the pseudo-styles

    @eploko
    eploko committed Mar 18, 2013
    Configuration menu
    Copy the full SHA
    d895c7f View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2014

  1. クラス名を正しく出力されない問題を修正

    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    dc64356 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from ShareWis/hotfix/return_class_name_correctly 

    クラス名が正しく出力されない問題を修正
    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    9a314eb View commit details
    Browse the repository at this point in the history

  3. kss blockの背景のデフォルトを透明に変更

    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    bf2ec3b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from ShareWis/feature/change_default_settings 

    kss blockの背景のデフォルトを透明に変更
    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    4e01c4d View commit details
    Browse the repository at this point in the history

  5. https接続時に正しく外部jsとcssが読み込まれない問題を修正

    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    dc415de View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4 from ShareWis/hotfix/loading_external_css_js 

    https接続時に正しく外部jsとcssが読み込まれない問題を修正
    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    800bc69 View commit details
    Browse the repository at this point in the history

  7. 使う予定が無いため不要なcssファイルの読み込みを削除

    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    bf19b51 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #5 from ShareWis/refactor/remove_unused_css_loading 

    使う予定が無いため不要なcssファイルの読み込みを削除
    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    d5b8000 View commit details
    Browse the repository at this point in the history

  9. スタイルガイドを0-originに変更 

    スタイルガイドのroot_urlをoverviewとして扱うため
    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    567f904 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #6 from ShareWis/feature/change_origin_number 

    スタイルガイドを0-originに変更
    @akira-hamada
    akira-hamada committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    fc200bc View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. Fixed small header overlapping

    @atandon24
    atandon24 committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    9ba9426 View commit details
    Browse the repository at this point in the history

  2. ignore Gemfile.lock

    @pboling
    pboling committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    b01dd75 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2014

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

    @pboling
    pboling committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    4a8daa7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'eploko/master' 

    Conflicts:
	app/views/layouts/styleguide_page.html.haml
	app/views/styleguides/_block.html.haml
    @pboling
    pboling committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    dfad469 View commit details
    Browse the repository at this point in the history

  3. Format multiline

    @pboling
    pboling committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    1f9ec43 View commit details
    Browse the repository at this point in the history
Loading
0