Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
hubzilla
core
Commits
171b6a22
Commit
171b6a22
authored
Mar 28, 2017
by
Mario
Browse files
fixes for latest bootstrap
parent
f0518132
Changes
4
Hide whitespace changes
Inline
Side-by-side
view/css/bootstrap-red.css
View file @
171b6a22
...
...
@@ -29,6 +29,11 @@ nav .badge {
height
:
2.3rem
;
}
.navbar-toggler-right
{
padding
:
0.2rem
0
;
}
#navbar-collapse-1
i
{
font-size
:
1rem
;
}
...
...
@@ -42,13 +47,14 @@ nav.navbar {
max-height
:
100vh
;
}
#navbar-collapse-2
{
flex-basis
:
100%
;
}
#navbar-collapse-2
.show
{
overflow
:
auto
;
}
.navbar-toggler-right
{
top
:
0.5rem
;
}
/* nav overrides end */
.wall-item-tools
.dropdown-menu
{
...
...
view/php/default.php
View file @
171b6a22
...
...
@@ -8,7 +8,7 @@
<body
<?php
if
(
$page
[
'direction'
])
echo
'dir="rtl"'
?>
>
<?php
if
(
x
(
$page
,
'banner'
))
echo
$page
[
'banner'
];
?>
<header>
<?php
if
(
x
(
$page
,
'header'
))
echo
$page
[
'header'
];
?>
</header>
<nav
class=
"navbar fixed-top navbar-expand-
s
m navbar-inverse bg-inverse"
>
<?php
if
(
x
(
$page
,
'nav'
))
echo
$page
[
'nav'
];
?>
</nav>
<nav
class=
"navbar fixed-top navbar-expand-m
d
navbar-inverse bg-inverse"
>
<?php
if
(
x
(
$page
,
'nav'
))
echo
$page
[
'nav'
];
?>
</nav>
<main>
<aside
id=
"region_1"
><div
id=
"left_aside_spacer"
><div
id=
"left_aside_wrapper"
>
<?php
if
(
x
(
$page
,
'aside'
))
echo
$page
[
'aside'
];
?>
</div></div></aside>
<section
id=
"region_2"
>
<?php
if
(
x
(
$page
,
'content'
))
echo
$page
[
'content'
];
?>
...
...
view/php/full.php
View file @
171b6a22
...
...
@@ -7,7 +7,7 @@
</head>
<body>
<header>
<?php
if
(
x
(
$page
,
'header'
))
echo
$page
[
'header'
];
?>
</header>
<nav
class=
"navbar fixed-top navbar-expand-
s
m navbar-inverse bg-inverse"
>
<?php
if
(
x
(
$page
,
'nav'
))
echo
$page
[
'nav'
];
?>
</nav>
<nav
class=
"navbar fixed-top navbar-expand-m
d
navbar-inverse bg-inverse"
>
<?php
if
(
x
(
$page
,
'nav'
))
echo
$page
[
'nav'
];
?>
</nav>
<section>
<?php
if
(
x
(
$page
,
'content'
))
echo
$page
[
'content'
];
?>
<div
id=
"page-footer"
></div>
</section>
...
...
view/tpl/nav.tpl
View file @
171b6a22
...
...
@@ -10,24 +10,6 @@
{
{/
if
}
}
</div>
{
{/
if
}
}
<div
class=
"navbar-toggler-right"
>
{
{
if
$nav.help.6
}
}
<button
id=
"context-help-btn"
class=
"navbar-toggler border-0"
type=
"button"
onclick=
"contextualHelp(); return false;"
>
<i
class=
"fa fa-question-circle"
></i>
</button>
{
{/
if
}
}
<button
id=
"expand-aside"
type=
"button"
class=
"navbar-toggler border-0"
data-toggle=
"offcanvas"
data-target=
"#region_1"
>
<i
class=
"fa fa-arrow-circle-right"
id=
"expand-aside-icon"
></i>
</button>
{
{
if
$localuser
}
}
<button
id=
"notifications-btn"
type=
"button"
class=
"navbar-toggler border-0 text-white"
data-toggle=
"collapse"
data-target=
"#navbar-collapse-1"
>
<i
class=
"fa fa-exclamation-circle"
></i>
</button>
{
{/
if
}
}
<button
class=
"navbar-toggler"
type=
"button"
data-toggle=
"collapse"
data-target=
"#navbar-collapse-2"
>
<i
class=
"fa fa-bars"
></i>
</button>
</div>
{
{
if
$userinfo
}
}
<div
class=
"dropdown usermenu"
>
<div
class=
"fakelink"
data-toggle=
"dropdown"
>
...
...
@@ -73,6 +55,24 @@
{
{/
if
}
}
</div>
{
{/
if
}
}
<div
class=
"navbar-toggler-right"
>
{
{
if
$nav.help.6
}
}
<button
id=
"context-help-btn"
class=
"navbar-toggler border-0"
type=
"button"
onclick=
"contextualHelp(); return false;"
>
<i
class=
"fa fa-question-circle"
></i>
</button>
{
{/
if
}
}
<button
id=
"expand-aside"
type=
"button"
class=
"navbar-toggler border-0"
data-toggle=
"offcanvas"
data-target=
"#region_1"
>
<i
class=
"fa fa-arrow-circle-right"
id=
"expand-aside-icon"
></i>
</button>
{
{
if
$localuser
}
}
<button
id=
"notifications-btn"
type=
"button"
class=
"navbar-toggler border-0 text-white"
data-toggle=
"collapse"
data-target=
"#navbar-collapse-1"
>
<i
class=
"fa fa-exclamation-circle"
></i>
</button>
{
{/
if
}
}
<button
class=
"navbar-toggler"
type=
"button"
data-toggle=
"collapse"
data-target=
"#navbar-collapse-2"
>
<i
class=
"fa fa-bars"
></i>
</button>
</div>
<div
class=
"collapse navbar-collapse"
id=
"navbar-collapse-1"
>
<ul
class=
"navbar-nav mr-auto"
>
{
{
if
$nav.network
}
}
...
...
@@ -201,7 +201,7 @@
</ul>
</div>
<div
class=
"collapse d-md-none"
id=
"navbar-collapse-2"
>
<div
class=
"navbar-nav"
>
<div
class=
"navbar-nav
mr-auto
"
>
{
{
foreach
$navapps
as
$navapp
}
}
{
{
$navapp
|
replace
:
'dropdown-item'
:
'nav-link'
}
}
{
{/
foreach
}
}
...
...
Write
Preview
Supports
Markdown
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