Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
a5baff5a
Commit
a5baff5a
authored
Nov 03, 2016
by
Phil Höfer
Browse files
style-fixes und navbar-Umbauten
parent
bc090cda
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
public/css/themes/default.css
View file @
a5baff5a
...
...
@@ -1581,7 +1581,7 @@ pre code {
}
@media
(
min-width
:
1200px
)
{
.container
{
width
:
1
3
70px
;
width
:
1
1
70px
;
}
}
.container-fluid
{
...
...
@@ -7129,13 +7129,13 @@ footer {
body
{
margin
:
0
;
}
header
{
position
:
fixed
;
background-color
:
white
;
z-index
:
500
;
width
:
100%
;
height
:
50px
;
}
/*
header {
position: fixed;
background-color: white;
z-index: 500;
width: 100%;
height: 50px;
}
*/
address
{
white-space
:
pre
;
}
...
...
@@ -7294,7 +7294,6 @@ nav .input-group {
position
:
fixed
;
top
:
0
;
width
:
100%
;
height
:
60px
;
z-index
:
500
;
width
:
80%
;
left
:
50%
;
...
...
@@ -7675,15 +7674,5 @@ footer a {
.lSNext
>
span
{
color
:
#ff8000
;
}
@media
(
min-width
:
1200px
)
{
.container
{
width
:
1150px
;
}
}
@media
(
min-width
:
1400px
)
{
.container
{
width
:
1370px
;
}
}
/*# sourceMappingURL=default.css.map */
public/css/themes/default.css.map
View file @
a5baff5a
This diff is collapsed.
Click to expand it.
resources/assets/less/default.less
View file @
a5baff5a
...
...
@@ -42,15 +42,4 @@
.lSPrev > span, .lSNext > span {
color: rgb(255, 128, 0);
}
@media(min-width: 1200px) {
.container {
width: 1150px;
}
}
@media(min-width: 1400px) {
.container {
width: 1370px;
}
}
\ No newline at end of file
resources/assets/less/metager/result-page.less
View file @
a5baff5a
...
...
@@ -108,7 +108,7 @@ nav .input-group {
position: fixed;
top: 0;
width: 100%;
height: 60px;
//
height: 60px;
z-index: 500;
width: 80%;
left: 50%;
...
...
resources/assets/less/metager/static-pages.less
View file @
a5baff5a
...
...
@@ -563,13 +563,13 @@ body {
margin: 0;
}
header {
/*
header {
position: fixed;
background-color: white;
z-index: 500;
width: 100%;
height: 50px;
}
}
*/
address {
white-space: pre;
...
...
resources/assets/less/variables-default.less
View file @
a5baff5a
...
...
@@ -6,9 +6,6 @@
@body-bg: rgb(250, 250, 250);
@input-border-focus: rgb(255, 128, 0);
@font-family-sans-serif: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@container-tablet: (720px + @grid-gutter-width);
@container-desktop: (940px + @grid-gutter-width);
@container-large-desktop: (1340px + @grid-gutter-width);
//** Global textual link color.
@link-color: #2A2ADE;
...
...
resources/views/layouts/researchandtabs.blade.php
View file @
a5baff5a
@
if
(
strpos
(
rtrim
(
Request
::
header
(
'REFERER'
),
'/'
),
LaravelLocalization
::
getLocalizedURL
(
LaravelLocalization
::
getCurrentLocale
(),
"/"
)
)
===
0
&&
(
$browser
===
'Firefox'
||
$browser
===
'Mozilla'
||
$browser
===
'Chrome'
||
$browser
===
'IE'
||
$browser
===
'Edge'
)
)
<
div
id
=
"searchplugin"
class
=
"alert alert-warning alert-dismissible"
role
=
"alert"
style
=
""
>
<
button
type
=
"button"
class
=
"close"
data
-
dismiss
=
"alert"
aria
-
label
=
"Close"
><
span
aria
-
hidden
=
"true"
>&
times
;
</
span
></
button
>
{
!!
trans
(
'researchandtabs.plugin.1'
,
[
'browser'
=>
$browser
])
!!
}
<
br
/>
<
div
style
=
""
>
<
a
href
=
"{{ action('StartpageController@loadStartPage', Request::all()) }}#plugin-modal"
target
=
"_blank"
rel
=
"noopener"
type
=
"button"
class
=
"btn btn-info"
style
=
""
>
{
!!
trans
(
'researchandtabs.plugin.2'
)
!!
}
</
a
>
</
div
>
</
div
>
@
endif
<
div
class
=
"content-wrapper"
>
<
header
id
=
"research"
>
<nav>
<
nav
class
=
"navbar navbar-default"
>
<
ul
class
=
"list-inline"
>
<
li
class
=
"hidden-xs hidden-sm pull-left"
>
<
div
class
=
"logo"
><
a
href
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
") }}"
><
h1
>
MetaGer
</
h1
></
a
>
...
...
@@ -30,17 +40,6 @@
</
li
>
</
ul
>
</
nav
>
</header>
@if( strpos(rtrim(Request::header('REFERER'), '/'), LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") ) === 0
&&
( $browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'IE' || $browser === 'Edge') )
<div
id=
"searchplugin"
class=
"alert alert-warning alert-dismissible"
role=
"alert"
style=
""
>
<button
type=
"button"
class=
"close"
data-dismiss=
"alert"
aria-label=
"Close"
><span
aria-hidden=
"true"
>
×
</span></button>
{!! trans('researchandtabs.plugin.1', ['browser' => $browser]) !!}
<br
/>
<div
style=
""
>
<a
href=
"{{ action('StartpageController@loadStartPage', Request::all()) }}#plugin-modal"
target=
"_blank"
rel=
"noopener"
type=
"button"
class=
"btn btn-info"
style=
""
>
{!! trans('researchandtabs.plugin.2') !!}
</a>
</div>
</div>
@endif
<
ul
class
=
"nav nav-tabs"
id
=
"foki"
role
=
"tablist"
>
@
if
(
$metager
->
getFokus
()
===
"web"
)
<
li
id
=
"webTabSelector"
role
=
"presentation"
data
-
loaded
=
"1"
class
=
"active tab-selector"
>
...
...
@@ -131,7 +130,7 @@
</
li
>
@
endif
</
ul
>
</
header
>
<
div
class
=
"tab-content container-fluid"
>
@
if
(
$metager
->
getFokus
()
===
"web"
)
...
...
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