Commits · 7cd6ac1e5ea3e2ef1b61c47cd138136acce3f22e · sora / achievement · GitLab

18 Mar, 2020 7 commits
- css微修正 · 7cd6ac1e
  Orine Matsui committed Mar 18, 2020
  
  7cd6ac1e Browse Files
- サービスページ不具合解消 · 2f4171a4
  o.kimura committed Mar 18, 2020
  
  2f4171a4 Browse Files
- ヘッダサブメニュー周りのcss調整 · 92a432cb
  Orine Matsui committed Mar 18, 2020
  
  92a432cb Browse Files
- サブメニューを反映 · c561a4ac
  Orine Matsui committed Mar 18, 2020
  
  c561a4ac
- サブメニューの調整 · 88d0788d
  Orine Matsui committed Mar 18, 2020
  
  88d0788d
- 本番と同じソースに戻し · 29b6c2ed
  Orine Matsui committed Mar 18, 2020
  
  29b6c2ed
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · 38c1604b
```
# Conflicts:
#	achievement-official.conohawing.com/assets/include/header.php
#	achievement-official.conohawing.com/assets/js/functions.js
#	achievement-official.conohawing.com/assets/js/functions.min.js
```
  Orine Matsui committed Mar 18, 2020
  38c1604b
17 Mar, 2020 10 commits
- メニュー・サービスの hove にアニメーション · 4adbfd63
  o.kimura committed Mar 17, 2020
  
  4adbfd63 Browse Files
- サービスのサブメニュー表示制御 · 6b631cea
  o.kimura committed Mar 17, 2020
  
  6b631cea Browse Files
- 画像差替 · ed71c021
  Orine Matsui committed Mar 17, 2020
  
  ed71c021
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · ffc55c65
  Orine Matsui committed Mar 17, 2020
  
  ffc55c65
- ヘッダサブメニューを表示 · ce353b0a
  Orine Matsui committed Mar 17, 2020
  
  ce353b0a
- FAQ調整 · e9e16121
  o.kimura committed Mar 17, 2020
  
  e9e16121 Browse Files
- FAQ検索をSPでも表示 · a654a1a3
  o.kimura committed Mar 17, 2020
  
  a654a1a3
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · cfeb35aa
  Orine Matsui committed Mar 17, 2020
  
  cfeb35aa Browse Files
- FQ文言修正 · 44d200ec
  Orine Matsui committed Mar 17, 2020
  
  44d200ec Browse Files
- メニューにサービスのサブ要素追加 · 9810f548
  Orine Matsui committed Mar 17, 2020
  
  9810f548 Browse Files
13 Mar, 2020 9 commits
- other.css使用ページにMV修正を反映 · db7690dd
  Orine Matsui committed Mar 13, 2020
  
  db7690dd
- other.cssのMV周りを統合→会員のみ反映中 · 27710949
  Orine Matsui committed Mar 13, 2020
  
  27710949
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · 79786b2d
  Orine Matsui committed Mar 13, 2020
  
  79786b2d Browse Files
- 会員css微調整 · 77196e25
  Orine Matsui committed Mar 13, 2020
  
  77196e25
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement · f2eaa714
  o.kimura committed Mar 13, 2020
  
  f2eaa714 Browse Files
- ヘッダ固定をコメントアウト · 5077ef5e
  o.kimura committed Mar 13, 2020
  
  5077ef5e Browse Files
- 会員情報追加修正 · ead17f37
  Orine Matsui committed Mar 13, 2020
  
  ead17f37
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · 61ea0ab8
```
# Conflicts:
#	achievement-official.conohawing.com/service/top/index.php
```
  Orine Matsui committed Mar 13, 2020
  61ea0ab8 Browse Files
- Ⓡを追加 · b7999dde
  Orine Matsui committed Mar 13, 2020
  
  b7999dde
12 Mar, 2020 4 commits
- 【css整理】MV統合：様子見 · 4e7c571b
  Orine Matsui committed Mar 12, 2020
  
  4e7c571b
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · f4e6cc03
  Orine Matsui committed Mar 12, 2020
  
  f4e6cc03 Browse Files
- FAQ検索機能実装 · 2a205cb8
  o.kimura committed Mar 12, 2020
  
  2a205cb8
- ニュース一覧・お知らせ一覧　110文字超過したら末尾を「...」に · 6cb5dd2e
  o.kimura committed Mar 12, 2020
  
  6cb5dd2e Browse Files
11 Mar, 2020 1 commit
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · c8280891
  Orine Matsui committed Mar 11, 2020
  
  c8280891 Browse Files
10 Mar, 2020 9 commits
- 20200310ニュース本文・文面差し替え · d335b5d6
  o.kimura committed Mar 10, 2020
  
  d335b5d6 Browse Files
- ニュース追加 · 1a5fbdfc
  o.kimura committed Mar 10, 2020
  
  1a5fbdfc Browse Files
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · a9952009
  Orine Matsui committed Mar 10, 2020
  
  a9952009 Browse Files
- 文言修正 · 49d169e4
  Orine Matsui committed Mar 10, 2020
  
  49d169e4 Browse Files
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · 209985e2
  Orine Matsui committed Mar 10, 2020
  
  209985e2 Browse Files
- 文言修正 · ec382319
  Orine Matsui committed Mar 10, 2020
  
  ec382319 Browse Files
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · fba22cfb
  Orine Matsui committed Mar 10, 2020
  
  fba22cfb Browse Files
- 文言修正　42000→43000 · baf0bdd7
  Orine Matsui committed Mar 10, 2020
  
  baf0bdd7 Browse Files
- Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理 · 86517c37
  Orine Matsui committed Mar 10, 2020
  
  86517c37 Browse Files