Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
ulakbus-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ulakbus
ulakbus-ui
Commits
b6a8bbae
Commit
b6a8bbae
authored
Sep 28, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'footer'
parents
dee87179
3f3a1525
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
12 deletions
+36
-12
app.css
app/app.css
+28
-7
dashboard.html
app/components/dashboard/dashboard.html
+1
-1
sidebar.html
app/shared/templates/directives/sidebar.html
+7
-4
No files found.
app/app.css
View file @
b6a8bbae
...
@@ -68,6 +68,7 @@ button.brand-bg:hover {
...
@@ -68,6 +68,7 @@ button.brand-bg:hover {
}
}
.brand
{
.brand
{
height
:
98px
;
border-bottom
:
1px
solid
#ccc
;
border-bottom
:
1px
solid
#ccc
;
}
}
...
@@ -773,6 +774,10 @@ table.dataTable thead .sorting:after {
...
@@ -773,6 +774,10 @@ table.dataTable thead .sorting:after {
font-family
:
'robotolight'
;
font-family
:
'robotolight'
;
}
}
.dashboard
.major-buttons
a
button
:focus
{
color
:
#fff
;
}
/* END OF DASHBOARD */
/* END OF DASHBOARD */
...
@@ -931,6 +936,28 @@ table.dataTable thead .sorting:after {
...
@@ -931,6 +936,28 @@ table.dataTable thead .sorting:after {
.manager-view
{
.manager-view
{
height
:
100%
;
height
:
100%
;
}
}
.sidebar
.sidebar-nav.navbar-collapse
{
overflow-x
:
visible
;
overflow-y
:
scroll
;
position
:
absolute
;
width
:
100%
;
max-height
:
calc
(
85%
-
139px
);
border-bottom
:
2px
solid
#ccc
;
}
footer
{
position
:
absolute
;
bottom
:
35px
;
padding
:
15px
;
width
:
100%
;
text-align
:
center
;
}
footer
span
{
font-family
:
'robotobold'
;
color
:
#777
;
}
}
}
@media
(
max-width
:
767px
)
{
@media
(
max-width
:
767px
)
{
...
@@ -1062,10 +1089,4 @@ table.dataTable thead .sorting:after {
...
@@ -1062,10 +1089,4 @@ table.dataTable thead .sorting:after {
position
:
absolute
;
position
:
absolute
;
right
:
0
;
right
:
0
;
top
:
auto
;
top
:
auto
;
}
}
\ No newline at end of file
.sidebarscroll
{
overflow-x
:
visible
;
overflow-y
:
scroll
;
height
:
700px
;
}
app/components/dashboard/dashboard.html
View file @
b6a8bbae
<div
ng-app=
"ulakbus.dashboard"
>
<div
ng-app=
"ulakbus.dashboard"
class=
"dashboard"
>
<div
class=
"starter-template"
>
<div
class=
"starter-template"
>
<div
class=
"row"
>
<div
class=
"row"
>
...
...
app/shared/templates/directives/sidebar.html
View file @
b6a8bbae
<div
class=
"navbar-default sidebar"
role=
"navigation"
>
<div
class=
"navbar-default sidebar"
role=
"navigation"
>
<div
class=
"brand"
>
<a
href=
""
class=
"logo"
><img
src=
"/img/brand-logo.png"
/></a>
</div>
<div
class=
"sidebar-nav navbar-collapse"
>
<div
class=
"sidebar-nav navbar-collapse"
>
<div
class=
"brand"
>
<ul
class=
"nav in"
id=
"side-menu"
ng-class=
"{hidden: $root.loggedInUser != true}"
>
<a
href=
""
class=
"logo"
><img
src=
"/img/brand-logo.png"
/></a>
</div>
<ul
class=
"nav in sidebarscroll"
id=
"side-menu"
ng-class=
"{hidden: $root.loggedInUser != true}"
>
<!--<sidebar-search></sidebar-search>-->
<!--<sidebar-search></sidebar-search>-->
<li
ui-sref-active=
"active"
>
<li
ui-sref-active=
"active"
>
<a
href=
"#/dashboard"
ng-click=
"breadcrumb(['Panel'])"
><i
class=
"fa fa-dashboard fa-fw"
></i>
<a
href=
"#/dashboard"
ng-click=
"breadcrumb(['Panel'])"
><i
class=
"fa fa-dashboard fa-fw"
></i>
...
@@ -20,4 +20,7 @@
...
@@ -20,4 +20,7 @@
</ul>
</ul>
</div>
</div>
<!-- /.sidebar-collapse -->
<!-- /.sidebar-collapse -->
<footer>
<span>
v 0.0.3 ® Lorem Ipsum
</span>
</footer>
</div>
</div>
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