|
|
@@ -30,56 +30,60 @@
|
|
|
{% endif %}
|
|
|
</head>
|
|
|
<body>
|
|
|
+ <div class="container-fluid">
|
|
|
<div class="row" id="body-row">
|
|
|
<!-- Sidebar -->
|
|
|
- <div id="sidebar-container" class="sidebar-expanded d-none d-md-block"><!-- d-* hiddens the Sidebar in smaller devices. Its itens can be kept on the Navbar 'Menu' -->
|
|
|
+ <nav id="sidebar-container" class="sidebar-expanded col-2 sidebar"><!-- d-* hiddens the Sidebar in smaller devices. Its itens can be kept on the Navbar 'Menu' -->
|
|
|
+ <div class="sidebar-header">
|
|
|
+ </div>
|
|
|
<!-- Bootstrap List Group -->
|
|
|
<ul class="list-group">
|
|
|
- <!-- Separator with title -->
|
|
|
- <li class="list-group-item sidebar-separator-title text-muted d-flex align-items-center menu-collapsed">
|
|
|
- <small>小寶優居後台</small>
|
|
|
- </li>
|
|
|
<!-- /END Separator -->
|
|
|
<!-- Menu with submenu -->
|
|
|
<a href="{{ url_for('home.home') }}" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
- <span class="fa fa-dashboard fa-fw mr-3"></span>
|
|
|
- <span class="menu-collapsed">首頁</span>
|
|
|
- </div>
|
|
|
+<<<<<<< HEAD
|
|
|
</a>
|
|
|
<a href="{{ url_for('room_planner.main') }}" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
- <span class="fa fa-user fa-fw mr-3"></span>
|
|
|
- <span class="menu-collapsed">規劃師服務</span>
|
|
|
+ <i class="fas fa-user-alt mr-3"></i>
|
|
|
+ <span class="menu-collapsed">家具規劃師</span>
|
|
|
+ <span class="submenu-icon ml-auto"></span>
|
|
|
</div>
|
|
|
</a>
|
|
|
+=======
|
|
|
+ <i class="fas fa-home mr-3"></i>
|
|
|
+ <span class="menu-collapsed">首頁</span>
|
|
|
+ <span class="submenu-icon ml-auto"></span>
|
|
|
+ </div>
|
|
|
+>>>>>>> Adjust sidebar toggles in layout and links in sidebar
|
|
|
<a href="{{ url_for('collections.collection_list') }}" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
- <span class="fa fa-tasks fa-fw mr-3"></span>
|
|
|
+ <i class="fas fa-ruler-combined mr-3"></i>
|
|
|
<span class="menu-collapsed">規劃作品</span>
|
|
|
</div>
|
|
|
</a>
|
|
|
<a href="#" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
- <span class="fa fa-tasks fa-fw mr-3"></span>
|
|
|
+ <i class="fas fa-location-arrow mr-3"></i>
|
|
|
<span class="menu-collapsed">門市據點</span>
|
|
|
</div>
|
|
|
</a>
|
|
|
<a href="#" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
- <span class="fa fa-tasks fa-fw mr-3"></span>
|
|
|
+ <i class="fas fa-question-circle mr-3"></i>
|
|
|
<span class="menu-collapsed">常見問題</span>
|
|
|
</div>
|
|
|
</a>
|
|
|
<a href="#" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
- <span class="fa fa-tasks fa-fw mr-3"></span>
|
|
|
+ <i class="fas fa-tasks mr-3"></i>
|
|
|
<span class="menu-collapsed">關於小寶</span>
|
|
|
</div>
|
|
|
</a>
|
|
|
<a href="{{ url_for('blogs.blog_list') }}" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
- <span class="fa fa-tasks fa-fw mr-3"></span>
|
|
|
+ <i class="far fa-newspaper mr-3"></i>
|
|
|
<span class="menu-collapsed">設計專欄</span>
|
|
|
</div>
|
|
|
</a>
|
|
|
@@ -88,7 +92,7 @@
|
|
|
<small>OPTIONS</small>
|
|
|
</li>
|
|
|
<!-- /END Separator -->
|
|
|
- <a href="#" class="bg-dark list-group-item list-group-item-action">
|
|
|
+ <!-- <a href="#" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
<span class="fa fa-calendar fa-fw mr-3"></span>
|
|
|
<span class="menu-collapsed">Calendar</span>
|
|
|
@@ -99,16 +103,16 @@
|
|
|
<span class="fa fa-envelope-o fa-fw mr-3"></span>
|
|
|
<span class="menu-collapsed">Messages <span class="badge badge-pill badge-primary ml-2">5</span></span>
|
|
|
</div>
|
|
|
- </a>
|
|
|
+ </a> -->
|
|
|
<!-- Separator without title -->
|
|
|
- <li class="list-group-item sidebar-separator menu-collapsed"></li>
|
|
|
+ <!-- <li class="list-group-item sidebar-separator menu-collapsed"></li> -->
|
|
|
<!-- /END Separator -->
|
|
|
- <a href="#" class="bg-dark list-group-item list-group-item-action">
|
|
|
+ <!-- <a href="#" class="bg-dark list-group-item list-group-item-action">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
<span class="fa fa-question fa-fw mr-3"></span>
|
|
|
<span class="menu-collapsed">Help</span>
|
|
|
</div>
|
|
|
- </a>
|
|
|
+ </a> -->
|
|
|
<a href="#" data-toggle="sidebar-colapse" class="bg-dark list-group-item list-group-item-action d-flex align-items-center">
|
|
|
<div class="d-flex w-100 justify-content-start align-items-center">
|
|
|
<span id="collapse-icon" class="fa fa-2x mr-3"></span>
|
|
|
@@ -116,6 +120,7 @@
|
|
|
</div>
|
|
|
</a>
|
|
|
</ul><!-- List Group END-->
|
|
|
+<<<<<<< HEAD
|
|
|
</div><!-- sidebar-container END -->
|
|
|
<!-- MAIN -->
|
|
|
<<<<<<< HEAD
|
|
|
@@ -138,6 +143,12 @@
|
|
|
=======
|
|
|
|
|
|
>>>>>>> Modified button texts, button hover effect, input placeholder, main section width
|
|
|
+=======
|
|
|
+ </nav><!-- sidebar-container END -->
|
|
|
+
|
|
|
+ <!-- MAIN -->
|
|
|
+ <div class="main my-4 ml-auto col-10">
|
|
|
+>>>>>>> Adjust sidebar toggles in layout and links in sidebar
|
|
|
{% block main %}{% endblock %}
|
|
|
<!-- Main Col END -->
|
|
|
<div class='toTop'>
|
|
|
@@ -145,6 +156,7 @@
|
|
|
</div>
|
|
|
</div><!-- body-row END -->
|
|
|
</div><!-- container -->
|
|
|
+ </div>
|
|
|
<!-- partial -->
|
|
|
<script src='https://code.jquery.com/jquery-3.2.1.slim.min.js'></script>
|
|
|
<script src='https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js'></script>
|
huaisianhuang
