Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gutyán Gábor
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
681af7af
authored
May 06, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: new navbar
- add logo instead of CIRCLE text - make it smaller (45px)
parent
2b75c2fb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
1 deletions
+53
-1
circle/dashboard/static/dashboard/dashboard.css
+50
-0
circle/dashboard/static/dashboard/img/logo.png
+0
-0
circle/dashboard/templates/base.html
+3
-1
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
681af7af
...
@@ -23,6 +23,46 @@ html {
...
@@ -23,6 +23,46 @@ html {
padding-right
:
15px
;
padding-right
:
15px
;
}
}
/* values for 45px tall navbar */
.navbar
{
min-height
:
45px
;
}
.navbar-brand
{
height
:
45px
;
padding
:
12.5px
12.5px
;
}
.navbar-toggle
{
margin-top
:
5.5px
;
margin-bottom
:
5.5px
;
}
.navbar-form
{
margin-top
:
5.5px
;
margin-bottom
:
5.5px
;
}
.navbar-btn
{
margin-top
:
5.5px
;
margin-bottom
:
5.5px
;
}
.navbar-btn.btn-sm
{
margin-top
:
7.5px
;
margin-bottom
:
7.5px
;
}
.navbar-btn.btn-xs
{
margin-top
:
11.5px
;
margin-bottom
:
11.5px
;
}
.navbar-text
{
margin-top
:
12.5px
;
margin-bottom
:
12.5px
;
}
/* --- */
/* Responsive: Portrait tablets and up */
/* Responsive: Portrait tablets and up */
@media
screen
and
(
min-width
:
768px
)
{
@media
screen
and
(
min-width
:
768px
)
{
/* Let the jumbotron breathe */
/* Let the jumbotron breathe */
...
@@ -33,6 +73,12 @@ html {
...
@@ -33,6 +73,12 @@ html {
.body-content
{
.body-content
{
padding
:
0
;
padding
:
0
;
}
}
.navbar-nav
>
li
>
a
{
padding-top
:
12.5px
;
padding-bottom
:
12.5px
;
}
}
}
.no-margin
{
.no-margin
{
margin
:
0
!important
;
margin
:
0
!important
;
...
@@ -504,3 +550,7 @@ footer a, footer a:hover, footer a:visited {
...
@@ -504,3 +550,7 @@ footer a, footer a:hover, footer a:visited {
#template-access-table
th
:last-child
,
#template-access-table
td
:last-child
{
#template-access-table
th
:last-child
,
#template-access-table
td
:last-child
{
text-align
:
center
;
text-align
:
center
;
}
}
#notifications-button
{
margin
:
0
;
}
circle/dashboard/static/dashboard/img/logo.png
0 → 100644
View file @
681af7af
6 KB
circle/dashboard/templates/base.html
View file @
681af7af
...
@@ -24,7 +24,9 @@
...
@@ -24,7 +24,9 @@
<body>
<body>
<div
class=
"navbar navbar-inverse navbar-fixed-top"
>
<div
class=
"navbar navbar-inverse navbar-fixed-top"
>
<div
class=
"navbar-header"
>
<div
class=
"navbar-header"
>
<a
class=
"navbar-brand"
href=
"{% url "
dashboard
.
index
"
%}"
>
CIRCLE
</a>
<a
class=
"navbar-brand"
href=
"{% url "
dashboard
.
index
"
%}"
style=
"padding: 10px 15px;"
>
<img
src=
"{{ STATIC_URL}}dashboard/img/logo.png"
style=
"height: 25px;"
/>
</a>
<button
type=
"button"
class=
"navbar-toggle"
data-toggle=
"collapse"
data-target=
".navbar-collapse"
>
<button
type=
"button"
class=
"navbar-toggle"
data-toggle=
"collapse"
data-target=
".navbar-collapse"
>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
...
...
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