Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap を 2 系から to 3 系（3.4.1）に更新する #797

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+155 −7,720
Open

Bootstrap を 2 系から to 3 系（3.4.1）に更新する #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</a>
<div class="container">
<!-- Desktop -->
<div class="visible-desktop">
<a class="span3" href="/" id="logo">
<img alt="Rails Girls ガイド" src="/images/railsgirls-guides.png">
<div class="visible-lg visible-md row row-no-gutters">
<a class="col-md-3" href="/" id="logo">
<img class="header" alt="Rails Girls ガイド" src="/images/railsgirls-guides.png">
</a>
<nav class="nav pull-right">
<nav class="pull-right">
<span>日本語版</span>
<a href="/">Home</a>
<a href="/events/">Events</a>
Expand All @@ -23,18 +23,17 @@
</div>

<!-- Phone/Tablet -->
<div class="visible-tablet visible-phone">
<div class="nav navbar nav-pills">

<a class="btn btn-link btn-navbar collapsed" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>

<a class="brand" href="/">Rails Girls Guides</a>

<div class="nav-collapse navbar-responsive-collapse collapse" style="height: 0px;">
<div class="visible-sm visible-xs">
<div class="navbar nav-pills">
<div class="container">
<a class="btn btn-link btn-navbar navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="/">Rails Girls Guides</a>
</div>
<div class="navbar-responsive-collapse collapse">
<ul class="nav">
<li><a href="/">Home</a></li>
<li><a href="/events/">Events</a></li>
Expand Down
10 changes: 5 additions & 5 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script src="/js/prefixfree.min.js"></script>
<script src="https://code.jquery.com/jquery-3.5.0.min.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script>
jQuery.ajaxPrefilter( function( s ) {
if ( s.crossDomain ) {
Expand All @@ -18,9 +18,9 @@
<script src="/js/js.cookie.js"></script>
<script src="/js/guides.js"></script>
<script src="/js/mobile-menu.js"></script>
<script src="/js/bootstrap-collapse.js"></script>
<link href="/css/bootstrap.css" rel="stylesheet"/>
<link href="/css/bootstrap-responsive.css" rel="stylesheet" />
<script src="/js/bootstrap.min.js"></script>
<link href="/css/bootstrap.min.css" rel="stylesheet"/>
<link href="/css/bootstrap-theme.min.css" rel="stylesheet" />
<link href="/css/code.css" rel="stylesheet"/>
<link href="/css/text.css" rel="stylesheet"/>
<link href="/css/style.css" rel="stylesheet"/>
Expand All @@ -30,7 +30,7 @@
<body>
{% include header.html %}
<article class="container">
<div class="span10">
<div class="row-md-10">
{{ content }}
</div>
</article>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<article class="container">
<div class="row">

<div class="span10">
<div class="col-md-10">

<div class="page__header">
<h2 class="page__title">{{ page.title }}</h2>
Expand Down
4 changes: 4 additions & 0 deletions _pages/install/windows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,19 @@ We'll start by installing Ruby, the primary programming language used during the

ライセンス認証画面が表示されます。
確認の上、同意いただけるなら、「I accept the License」をチェックし、'Next'ボタンをクリックします。

![RubyInstaller Install Lincese](/images/windows_install/rubyinstaller_license.png "rubyinstaller license")

選択肢は全てデフォルトを選択し、'Install'ボタンをクリックします。

![RubyInstaller Install options](/images/windows_install/rubyinstaller_install_options1.png "rubyinstaller install options")

表示された画面で、選択肢は全てデフォルトを選択し、'Next'ボタンをクリックします。

![RubyInstaller Install options](/images/windows_install/rubyinstaller_install_options2.png "rubyinstaller install options")

Rubyのインストールが終了すると、以下の画面が表示されるので、'Finish'ボタンをクリックします。

![RubyInstaller Install Finish](/images/windows_install/rubyinstaller_install_finish.png "rubyinstaller install finish")

コマンドプロンプトが立ち上がってMSYS2のインストールに進みますのでデフォルトの選択肢(何も入力せずにエンター)を選びます。
Expand Down
6 changes: 3 additions & 3 deletions blog/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
---

<!-- 記事一覧 -->
<div class="row row-eq-height">
<div class="row row-no-gutters row-eq-height">

{% for post in paginator.posts %}

<article class="span3 entry" style="position: relative;">
<article class="col-md-3 entry" style="position: relative;">
<div class="entry_inner">
<div class="entry-header">
<img src="{{ post.image }}" alt="" title="" style="width: 100%; height: 15rem; object-fit: cover;">
<img src="{{ post.image }}" alt="" title="">
</div>

<div class="entry-content">
Expand Down
Loading
Loading