Dan Brown

Moved page tags to sidebar

Fixed #238
...@@ -135,7 +135,10 @@ ...@@ -135,7 +135,10 @@
135 border-left: 3px solid #BBB; 135 border-left: 3px solid #BBB;
136 background-color: #EEE; 136 background-color: #EEE;
137 padding: $-s; 137 padding: $-s;
138 - display: flex; 138 + display: block;
139 + > * {
140 + display: inline-block;
141 + }
139 &:before { 142 &:before {
140 font-family: 'Material-Design-Iconic-Font'; 143 font-family: 'Material-Design-Iconic-Font';
141 padding-right: $-s; 144 padding-right: $-s;
......
...@@ -110,6 +110,8 @@ ...@@ -110,6 +110,8 @@
110 border-left: 0px solid #FFF; 110 border-left: 0px solid #FFF;
111 background-color: #FFF; 111 background-color: #FFF;
112 &.fixed { 112 &.fixed {
113 + background-color: #FFF;
114 + z-index: 5;
113 position: fixed; 115 position: fixed;
114 top: 0; 116 top: 0;
115 padding-left: $-l; 117 padding-left: $-l;
......
...@@ -248,29 +248,32 @@ ...@@ -248,29 +248,32 @@
248 } 248 }
249 249
250 .tag-display { 250 .tag-display {
251 - margin: $-xl $-m; 251 + width: 100%;
252 - border: 1px solid #DDD; 252 + //opacity: 0.7;
253 - min-width: 180px;
254 - max-width: 320px;
255 - opacity: 0.7;
256 - z-index: 5;
257 position: relative; 253 position: relative;
258 table { 254 table {
259 width: 100%; 255 width: 100%;
260 margin: 0; 256 margin: 0;
261 padding: 0; 257 padding: 0;
262 } 258 }
259 + tr:first-child td {
260 + padding-top: 0;
261 + }
263 .heading th { 262 .heading th {
264 padding: $-xs $-s; 263 padding: $-xs $-s;
265 - color: #333; 264 + color: rgba(100, 100, 100, 0.7);
265 + border: 0;
266 font-weight: 400; 266 font-weight: 400;
267 } 267 }
268 td { 268 td {
269 border: 0; 269 border: 0;
270 - border-bottom: 1px solid #DDD; 270 + border-bottom: 1px solid #EEE;
271 padding: $-xs $-s; 271 padding: $-xs $-s;
272 color: #444; 272 color: #444;
273 } 273 }
274 + tr td:first-child {
275 + padding-left:0;
276 + }
274 .tag-value { 277 .tag-value {
275 color: #888; 278 color: #888;
276 } 279 }
......
...@@ -2,26 +2,6 @@ ...@@ -2,26 +2,6 @@
2 2
3 <h1 id="bkmrk-page-title" class="float left">{{$page->name}}</h1> 3 <h1 id="bkmrk-page-title" class="float left">{{$page->name}}</h1>
4 4
5 - @if(count($page->tags) > 0)
6 - <div class="tag-display float right">
7 - <table>
8 - <thead>
9 - <tr class="text-left heading primary-background-light">
10 - <th colspan="2">Page Tags</th>
11 - </tr>
12 - </thead>
13 - <tbody>
14 - @foreach($page->tags as $tag)
15 - <tr class="tag">
16 - <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
17 - @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
18 - </tr>
19 - @endforeach
20 - </tbody>
21 - </table>
22 - </div>
23 - @endif
24 -
25 <div style="clear:left;"></div> 5 <div style="clear:left;"></div>
26 6
27 @if (isset($diff) && $diff) 7 @if (isset($diff) && $diff)
......
...@@ -115,6 +115,8 @@ ...@@ -115,6 +115,8 @@
115 </div> 115 </div>
116 @endif 116 @endif
117 117
118 +
119 +
118 @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav]) 120 @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav])
119 </div> 121 </div>
120 122
......
1 1
2 <div class="book-tree" ng-non-bindable> 2 <div class="book-tree" ng-non-bindable>
3 3
4 + @if(isset($page) && $page->tags->count() > 0)
5 + <div class="tag-display">
6 + <h6 class="text-muted">Page Tags</h6>
7 + <table>
8 + <tbody>
9 + @foreach($page->tags as $tag)
10 + <tr class="tag">
11 + <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
12 + @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
13 + </tr>
14 + @endforeach
15 + </tbody>
16 + </table>
17 + </div>
18 + @endif
19 +
4 @if (isset($page) && $page->attachments->count() > 0) 20 @if (isset($page) && $page->attachments->count() > 0)
5 <h6 class="text-muted">Attachments</h6> 21 <h6 class="text-muted">Attachments</h6>
6 @foreach($page->attachments as $attachment) 22 @foreach($page->attachments as $attachment)
......