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
go
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
go
Commits
ae2836ab
Commit
ae2836ab
authored
Dec 30, 2018
by
David Haynes
🙆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NavBar finished again again
- better use of space on desktop and mobile
parent
6ee83f33
Pipeline
#3559
passed with stage
in 1 minute and 14 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
go/go_ahead/src/Components/Molecules/AuthButton.jsx
go/go_ahead/src/Components/Molecules/AuthButton.jsx
+2
-2
go/go_ahead/src/Components/Organisms/NavBar.jsx
go/go_ahead/src/Components/Organisms/NavBar.jsx
+5
-6
No files found.
go/go_ahead/src/Components/Molecules/AuthButton.jsx
View file @
ae2836ab
...
...
@@ -32,11 +32,11 @@ class AuthButton extends React.Component {
return
(
<
div
>
{
is_auth
?
(
<
Button
color
=
"info
"
href
=
"/auth/logout"
>
<
Button
outline
color
=
"accent
"
href
=
"/auth/logout"
>
Logout
<
i
className
=
"fas fa-sign-out-alt"
/>
</
Button
>
)
:
(
<
Button
color
=
"info
"
href
=
"/auth/login"
>
<
Button
outline
color
=
"accent
"
href
=
"/auth/login"
>
Login
<
i
className
=
"fas fa-sign-in-alt"
/>
</
Button
>
)
}
...
...
go/go_ahead/src/Components/Organisms/NavBar.jsx
View file @
ae2836ab
...
...
@@ -36,15 +36,14 @@ class NavBar extends React.Component {
<
img
src
=
"static/go.svg"
className
=
"d-inline-block align-top"
width
=
"
30
"
height
=
"
30
"
width
=
"
42
"
height
=
"
42
"
alt
=
"SRCT Go"
/>
Go
</
NavbarBrand
>
<
NavbarToggler
onClick
=
{
this
.
toggleNavbar
}
className
=
"m
r-2
"
/>
<
NavbarToggler
onClick
=
{
this
.
toggleNavbar
}
className
=
"m
l-auto
"
/>
<
Collapse
isOpen
=
{
!
this
.
state
.
collapsed
}
navbar
>
<
Nav
className
=
"m
l
-auto"
navbar
>
<
Nav
className
=
"m
x
-auto"
navbar
>
<
NavItem
>
<
NavLink
href
=
"#/dhaynes"
active
=
{
pathname
==
"
/dhaynes
"
}
>
Dhaynes
...
...
@@ -60,8 +59,8 @@ class NavBar extends React.Component {
Debug
</
NavLink
>
</
NavItem
>
<
AuthButton
/>
</
Nav
>
<
AuthButton
className
=
"ml-auto"
/>
</
Collapse
>
</
Container
>
</
Navbar
>
...
...
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