Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2016-07-03 09:58:45 +0100
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
b0a63ba0cc078a2f69fcc9efcbcdb4ab3935914e
b0a63ba0
1 parent
7b6c88f1
Tightened and cleaned some list styles
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
43 additions
and
11 deletions
app/Http/Controllers/SearchController.php
resources/assets/js/global.js
resources/assets/sass/_lists.scss
resources/assets/sass/_pages.scss
resources/assets/sass/_text.scss
resources/assets/sass/styles.scss
resources/views/chapters/list-item.blade.php
resources/views/chapters/move.blade.php
resources/views/search/entity-ajax-list.blade.php
app/Http/Controllers/SearchController.php
View file @
b0a63ba
...
...
@@ -163,7 +163,7 @@ class SearchController extends Controller
$entities
=
$this
->
viewService
->
getPopular
(
20
,
0
,
$entityNames
);
}
return
view
(
'
partials/entity
-list'
,
[
'entities'
=>
$entities
]);
return
view
(
'
search/entity-ajax
-list'
,
[
'entities'
=>
$entities
]);
}
}
...
...
resources/assets/js/global.js
View file @
b0a63ba
...
...
@@ -118,10 +118,5 @@ $(function () {
});
function
elemExists
(
selector
)
{
return
document
.
querySelector
(
selector
)
!==
null
;
}
// Page specific items
require
(
'./pages/page-show'
);
...
...
resources/assets/sass/_lists.scss
View file @
b0a63ba
.page-list
{
h3
{
margin
:
$-l
0
$-m
0
;
margin
:
$-l
0
$-xs
0
;
font-size
:
1
.666em
;
}
a
.chapter
{
color
:
$color-chapter
;
...
...
@@ -8,7 +9,6 @@
.inset-list
{
display
:
none
;
overflow
:
hidden
;
// padding-left: $-m;
margin-bottom
:
$-l
;
}
h4
{
...
...
resources/assets/sass/_pages.scss
View file @
b0a63ba
...
...
@@ -48,7 +48,7 @@
max-width
:
100%
;
height
:auto
;
}
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
pre
{
clear
:
left
;
}
hr
{
...
...
resources/assets/sass/_text.scss
View file @
b0a63ba
...
...
@@ -225,6 +225,15 @@ p.secondary, p .secondary, span.secondary, .text-secondary {
color
:
$color-chapter
;
}
}
.faded
.text-book
:hover
{
color
:
$color-book
!
important
;
}
.faded
.text-chapter
:hover
{
color
:
$color-chapter
!
important
;
}
.faded
.text-page
:hover
{
color
:
$color-page
!
important
;
}
span
.highlight
{
//background-color: rgba($primary, 0.2);
...
...
resources/assets/sass/styles.scss
View file @
b0a63ba
...
...
@@ -246,7 +246,7 @@ $btt-size: 40px;
}
.entity-list-item.selected
{
h3
,
i
,
p
,
a
{
h3
,
i
,
p
,
a
,
span
{
color
:
#EEE
;
}
}
...
...
resources/views/chapters/list-item.blade.php
View file @
b0a63ba
<div
class=
"chapter entity-list-item"
data-entity-type=
"chapter"
data-entity-id=
"{{$chapter->id}}"
>
<h3>
@if (isset($showPath)
&&
$showPath)
<a
href=
"{{ $chapter->book->getUrl() }}"
class=
"text-book"
>
<i
class=
"zmdi zmdi-book"
></i>
{{ $chapter->book->name }}
</a>
<span
class=
"text-muted"
>
»
</span>
@endif
<a
href=
"{{ $chapter->getUrl() }}"
class=
"text-chapter"
>
<i
class=
"zmdi zmdi-collection-bookmark"
></i>
{{ $chapter->name }}
</a>
...
...
resources/views/chapters/move.blade.php
View file @
b0a63ba
...
...
@@ -9,7 +9,7 @@
<div
class=
"breadcrumbs"
>
<a
href=
"{{$book->getUrl()}}"
class=
"text-book text-button"
><i
class=
"zmdi zmdi-book"
></i>
{{ $book->getShortName() }}
</a>
<span
class=
"sep"
>
»
</span>
<a
href=
"{{$chapter->getUrl()}}"
class=
"text-
page text-button"
><i
class=
"zmdi zmdi-file-text
"
></i>
{{ $chapter->getShortName() }}
</a>
<a
href=
"{{$chapter->getUrl()}}"
class=
"text-
chapter text-button"
><i
class=
"zmdi zmdi-collection-bookmark
"
></i>
{{ $chapter->getShortName() }}
</a>
</div>
</div>
</div>
...
...
resources/views/search/entity-ajax-list.blade.php
0 → 100644
View file @
b0a63ba
<div
class=
"entity-list @if(isset($style)){{ $style }}@endif"
ng-non-bindable
>
@if(count($entities) > 0)
@foreach($entities as $index => $entity)
@if($entity->isA('page'))
@include('pages/list-item', ['page' => $entity])
@elseif($entity->isA('book'))
@include('books/list-item', ['book' => $entity])
@elseif($entity->isA('chapter'))
@include('chapters/list-item', ['chapter' => $entity, 'hidePages' => true, 'showPath' => true])
@endif
@if($index !== count($entities) - 1)
<hr>
@endif
@endforeach
@else
<p
class=
"text-muted"
>
No items available
</p>
@endif
</div>
\ No newline at end of file
Please
register
or
sign in
to post a comment