~franz/aeecamera.ir

3d6799e14886ec3433d15d0b6901517965f8bfb3 — Franz 6 years ago 878227d + 9bd0bbd
Merge branch 'translation' of https://github.com/franzos/aeecamera.ir

Conflicts:
	_includes/header.html
1 files changed, 25 insertions(+), 9 deletions(-)

M _includes/header.html
M _includes/header.html => _includes/header.html +25 -9
@@ 19,9 19,9 @@
        </button>
        <a href="/" class="navbar-brand toggle-button"><img class="logo" src="{{ "/assets/images/aee-logo.png" | prepend: site.baseurl }}"></a>
      </div>

      <div class="collapse navbar-collapse" id="navigation" dir="auto">
        <ul class="nav navbar-nav navbar-right">
<<<<<<< HEAD
          <li class="dropdown">
            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">دوربین <span class="caret"></span></a>
            <ul class="dropdown-menu">


@@ 36,7 36,16 @@
              <li class="disabled"><a href="#">Steadygrip</a></li>
              -->
            </ul>
=======
>>>>>>> 444c1eb9d5d12fb338cd0c0e8a4616a5df12996e
          </li>
          <li><a href="{{ "/contact/" | prepend: site.baseurl }}">تماس با ما</a></li>
          <li><a href="{{ "/support/" | prepend: site.baseurl }}">پشتيبانى</a></li>
          <li><a href="{{ "/news/" | prepend: site.baseurl }}">اخبار</a></li>
          <li><a href="https://community.aeecamera.ir/" target="_blank">انجمن</a></li>
          <li><a href="{{ "/sponsorship/" | prepend: site.baseurl }}">اسپانسر</a></li>
          <li><a href="{{ "/videos/" | prepend: site.baseurl }}">فیلم</a></li>
          <li><a href="{{ "/shop/" | prepend: site.baseurl }}">فروشگاه</a></li>
          <li class="dropdown">
            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">هواپیمای بدون سرنشین <span class="caret"></span></a>
            <ul class="dropdown-menu">


@@ 45,14 54,21 @@
              <li><a href="{{ "/product/toruk-ap9/" | prepend: site.baseurl }}">Toruk AP9
                <br><small>AEE, GoPro</small></a></li>
            </ul>
          </li>
          <li><a href="{{ "/shop/" | prepend: site.baseurl }}">فروشگاه</a></li>
          <li><a href="{{ "/videos/" | prepend: site.baseurl }}">فیلم</a></li>
          <li><a href="{{ "/sponsorship/" | prepend: site.baseurl }}">اسپانسر</a></li>
          <li><a href="{{ "/news/" | prepend: site.baseurl }}">اخبار</a></li>
          <li><a href="https://community.aeecamera.ir/" target="_blank">شبکه اجتماعی</a></li>
          <li><a href="{{ "/support/" | prepend: site.baseurl }}">پشتيبانى</a></li>
          <li><a href="{{ "/contact/" | prepend: site.baseurl }}">تماس با ما</a></li>
            <li class="dropdown">
              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">دوربین <span class="caret"></span></a>
              <ul class="dropdown-menu">
                <li><a href="{{ "/product/lyfe-onyx/" | prepend: site.baseurl }}">Lyfe Onyx
                  <br><small>4K@30fps</small></a></li>
                <li><a href="{{ "/product/s60plus/" | prepend: site.baseurl }}">S60+
                  <br><small>1080p@60fps</small></a></li>
                <!--
                  <li class="disabled" ><a href="#">Lyfe Black</a></li>
                  <li class="disabled" ><a href="#">Lyfe Silver</a></li>
                <li role="separator" class="divider"></li>
                <li class="disabled"><a href="#">Steadygrip</a></li>
                -->
              </ul>
            </li>
        </ul>
      </div>
    </div>