Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MetaGer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
open-source
MetaGer
Commits
ace2a9d5
Commit
ace2a9d5
authored
Oct 05, 2018
by
Karl Hasselbring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Das label steht jetzt hinter dem Link in der selben Zeile
parent
e5cfb0d9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
37 deletions
+50
-37
resources/assets/less/metager/result.less
resources/assets/less/metager/result.less
+28
-23
resources/views/layouts/ad.blade.php
resources/views/layouts/ad.blade.php
+6
-4
resources/views/layouts/result.blade.php
resources/views/layouts/result.blade.php
+10
-6
resources/views/parts/fake-result.blade.php
resources/views/parts/fake-result.blade.php
+6
-4
No files found.
resources/assets/less/metager/result.less
View file @
ace2a9d5
...
...
@@ -46,30 +46,35 @@
white-space: nowrap;
}
}
span.partnershop-info {
background-color: #0d9c0d;
color: white;
padding: 3px;
border-radius: 4px;
font-weight: bold;
font-size: 10px;
margin-right: 10px;
}
.result-link {
.overflow-ellipsis;
display: block;
font-size: @result-font-small;
width: fit-content;
max-width: 100%;
&,
&:active,
&:hover,
&:focus,
&:visited {
font-size: @result-font-url;
text-decoration: none;
.result-subheadline {
width: 100%;
display: flex;
.result-link {
.overflow-ellipsis;
display: block;
font-size: @result-font-small;
width: fit-content;
max-width: 100%;
&,
&:active,
&:hover,
&:focus,
&:visited {
font-size: @result-font-url;
text-decoration: none;
}
span.advertisement-mark {
background-color: #0d9c0d;
color: white;
padding: 3px;
border-radius: 4px;
font-weight: bold;
font-size: 10px;
margin-right: 10px;
}
}
span.advertisement-mark {
span.partnershop-info {
margin-left: 20px;
background-color: #0d9c0d;
color: white;
padding: 3px;
...
...
resources/views/layouts/ad.blade.php
View file @
ace2a9d5
...
...
@@ -10,10 +10,12 @@
</
h2
>
<
a
class
=
"ad-label"
href
=
"{{
$ad->gefVonLink
}}"
target
=
"_blank"
rel
=
"noopener"
>
{
!!
$ad
->
gefVon
!!
}
</
a
>
</
div
>
<
a
class
=
"result-link"
href
=
"{{
$ad->link
}}"
target
=
"{{
$metager->getNewtab
() }}"
>
<
span
class
=
"advertisement-mark"
>
Anzeige
</
span
>
{{
$ad
->
anzeigeLink
}}
</
a
>
<
div
class
=
"result-subheadline"
>
<
a
class
=
"result-link"
href
=
"{{
$ad->link
}}"
target
=
"{{
$metager->getNewtab
() }}"
>
<
span
class
=
"advertisement-mark"
>
Anzeige
</
span
>
{{
$ad
->
anzeigeLink
}}
</
a
>
</
div
>
</
div
>
<
div
class
=
"result-body"
>
<
div
class
=
"result-description"
>
...
...
resources/views/layouts/result.blade.php
View file @
ace2a9d5
...
...
@@ -14,12 +14,16 @@
</h2>
<a
class=
"result-hoster"
href=
"{{ $result->gefVonLink }}"
target=
"{{ $metager->getNewtab() }}"
rel=
"noopener"
>
{{ $result->gefVon }}
</a>
</div>
@if( isset($result->partnershop)
&&
$result->partnershop === TRUE )
<a
href=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
partnershops
")
}}"
target=
"_blank"
rel=
"noopener"
><span
class=
"partnershop-info"
>
{!! trans('result.options.4') !!}
</span></a>
@endif
<a
class=
"result-link"
href=
"{{ $result->link }}"
target=
"{{ $metager->getNewtab() }}"
rel=
"noopener"
>
{{ $result->anzeigeLink }}
</a>
<div
class=
"result-subheadline"
>
<a
class=
"result-link"
href=
"{{ $result->link }}"
target=
"{{ $metager->getNewtab() }}"
rel=
"noopener"
>
{{ $result->anzeigeLink }}
</a>
@if( isset($result->partnershop)
&&
$result->partnershop === TRUE)
<a
href=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
partnershops
")
}}"
target=
"_blank"
rel=
"noopener"
>
<span
class=
"partnershop-info"
>
{!! trans('result.options.4') !!}
</span>
</a>
@endif
</div>
</div>
<div
class=
"result-body"
>
@if( isset($result->logo) )
...
...
resources/views/parts/fake-result.blade.php
View file @
ace2a9d5
...
...
@@ -8,9 +8,11 @@
</h2>
<a
class=
"result-hoster"
href=
"javascript:void(0);"
data-tooltip=
"{{ trans('fake-result.link') }}"
>
MetaGer
</a>
</div>
<a
class=
"result-link"
href=
"javascript:void(0);"
data-tooltip=
"{{ trans('fake-result.link') }}"
>
de.wikipedia.org
</a>
<div
class=
"result-subheadline"
>
<a
class=
"result-link"
href=
"javascript:void(0);"
data-tooltip=
"{{ trans('fake-result.link') }}"
>
de.wikipedia.org
</a>
</div>
</div>
<div
class=
"resultpage-body"
>
<div
class=
"result-description"
data-tooltip=
"{{ trans('fake-result.description') }}"
>
...
...
@@ -60,4 +62,4 @@
</ul>
</div>
</div>
</div>
\ No newline at end of file
</div>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment