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
895fef72
Commit
895fef72
authored
Feb 20, 2019
by
Dominik Hebeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added more space to the left of the results
parent
14604ae5
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
28 deletions
+19
-28
app/Http/Controllers/MetaGerSearch.php
app/Http/Controllers/MetaGerSearch.php
+2
-2
resources/less/metager/pages/resultpage/result-page.less
resources/less/metager/pages/resultpage/result-page.less
+14
-23
resources/views/layouts/researchandtabs.blade.php
resources/views/layouts/researchandtabs.blade.php
+2
-2
resources/views/layouts/resultPage.blade.php
resources/views/layouts/resultPage.blade.php
+1
-1
No files found.
app/Http/Controllers/MetaGerSearch.php
View file @
895fef72
...
...
@@ -6,7 +6,7 @@ use App;
use
App\MetaGer
;
use
Illuminate\Http\Request
;
const
TIP_SERVER
=
'http://
localhost
:63825/tips.xml'
;
const
TIP_SERVER
=
'http://
metager3.de
:63825/tips.xml'
;
class
MetaGerSearch
extends
Controller
{
...
...
@@ -76,7 +76,7 @@ class MetaGerSearch extends Controller
public
function
tips
(
Request
$request
)
{
$tips_text
=
file_get_contents
(
TIP_SERVER
);
$tips
=
[];
$tips
=
[];
try
{
$tips_xml
=
simplexml_load_string
(
$tips_text
);
...
...
resources/less/metager/pages/resultpage/result-page.less
View file @
895fef72
...
...
@@ -334,21 +334,20 @@ a {
margin: @padding-small-default;
margin-left: @results-margin-left;
display: grid;
grid-template-columns: @results-width-max @additions-width-max;
grid-template-areas: "
searchbar ." "foki ." "options ." "results additions
";
grid-template-columns:
minmax(0px, 150px)
@results-width-max @additions-width-max;
grid-template-areas: "
whitespace searchbar ." "whitespace foki ." "whitespace options ." "whitespace results additions" "whitespace footer .
";
grid-column-gap: (@padding-small-default * 2);
grid-row-gap: @padding-small-default;
justify-items: stretch;
align-items: stretch;
/**/
background-color: @resultpage-background-color;
#
research-bar-container
{
grid-area:
searchbar
;
#
whitespace
{
grid-area:
whitespace
;
}
#research-bar-
placehold
er {
#research-bar-
contain
er {
grid-area: searchbar;
/**/
max-width: @results-width-max;
position: sticky;
}
#foki {
grid-area: foki;
...
...
@@ -372,16 +371,19 @@ a {
display: none;
}
}
footer {
grid-area: footer;
}
@media (max-width: @resultpage-breakpoint-max) {
@supports (display: grid) {
grid-template-columns:~"calc(60% - 8px)"~"calc(40% - 8px)";
grid-template-areas: "searchbar ." "foki ." "options ." "results additions";
grid-template-areas: "searchbar ." "foki ." "options ." "results additions"
"footer ."
;
}
}
@media (max-width: @resultpage-breakpoint-min) {
margin-left: @padding-small-default;
grid-template-columns: 100%;
grid-template-areas: "searchbar" "foki" "options" "results";
grid-template-areas: "searchbar" "foki" "options" "results"
"footer"
;
#additions-container {
display: none;
}
...
...
@@ -389,24 +391,12 @@ a {
}
#research-bar-container {
margin-left: (@results-margin-left - @padding-small-default);
position: fixed;
position: sticky;
z-index: 5;
top: 0;
left: 0;
background-color: @resultpage-background-color;
padding: @padding-small-default @padding-small-default 0px @padding-small-default;
width: (@results-width-max + 2 * @padding-small-default);
max-width: (@results-width-max + 2 * @padding-small-default);
@media (max-width: @resultpage-breakpoint-max) {
@supports (display: grid) {
width: ~"calc(60% - 6px)";
}
}
@media (max-width: @resultpage-breakpoint-min) {
width: 100%;
margin-left: 0px;
}
max-width: @results-width-max;
#research-bar {
background-color: white;
border: 1px solid #ccc;
...
...
@@ -568,6 +558,7 @@ a {
}
footer.resultPageFooter {
max-width: @results-width-max;
margin-top: 20px;
@media (max-width: (2 * @results-margin-left + @results-width-max - 1px)) {
...
...
resources/views/layouts/researchandtabs.blade.php
View file @
895fef72
<div
id=
"resultpage-container"
>
<div
id=
"whitespace"
></div>
<div
id=
"research-bar-container"
>
<div
id=
"research-bar"
>
<div
id=
"header-logo"
>
...
...
@@ -15,8 +16,6 @@
<div
class=
"sidebar-opener-placeholder"
></div>
</div>
</div>
<div
id=
"research-bar-placeholder"
>
</div>
<div
id=
"foki"
>
<div
class=
"scrollbox"
>
<div
class=
"scrollfade-left"
></div>
...
...
@@ -81,4 +80,5 @@
</div>
@endif
</div>
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
</div>
resources/views/layouts/resultPage.blade.php
View file @
895fef72
...
...
@@ -40,8 +40,8 @@
@yield('results')
</div>
</div>
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
@endif
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
<script
src=
"{{ mix('js/lib.js') }}"
></script>
<script
src=
"{{ mix('js/scriptResultPage.js') }}"
defer
></script>
<script
src=
"{{ mix('js/focus-creator.js') }}"
defer
></script>
...
...
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