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
f89734b4
Commit
f89734b4
authored
Dec 09, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'UI-Improvements'
parents
1f7e4211
d7f0f0ae
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
12 deletions
+27
-12
app.css
app/app.css
+23
-8
form.html
app/components/crud/templates/form.html
+1
-1
brand-logo.png
app/img/brand-logo.png
+0
-0
brand-logo2.png
app/img/brand-logo2.png
+0
-0
index.html
app/index.html
+3
-0
sidebar.html
app/shared/templates/directives/sidebar.html
+0
-3
No files found.
app/app.css
View file @
f89734b4
...
@@ -91,19 +91,33 @@ button.brand-bg:hover {
...
@@ -91,19 +91,33 @@ button.brand-bg:hover {
}
}
.brand
{
.brand
{
height
:
98px
;
position
:
absolute
;
border-bottom
:
1px
solid
#ccc
;
width
:
120px
;
margin-left
:
auto
;
margin-right
:
auto
;
left
:
0
;
right
:
0
;
}
}
.logo
{
a
.logo
{
height
:
42px
;
display
:
block
;
text-align
:
center
;
line-height
:
38px
;
opacity
:
0.8
;
-webkit-transition
:
all
.2s
;
-moz-transition
:
all
.2s
;
-ms-transition
:
all
.2s
;
-o-transition
:
all
.2s
;
transition
:
all
.2s
;
}
a
.logo
:hover
{
opacity
:
1
;
}
}
.logo
img
{
.logo
img
{
width
:
80%
;
width
:
100px
;
margin-left
:
8%
;
margin-top
:
22px
;
margin-bottom
:
22px
;
}
}
/** END OF BRAND **/
/** END OF BRAND **/
...
@@ -340,7 +354,7 @@ select {
...
@@ -340,7 +354,7 @@ select {
}
}
.manager-view-content
{
.manager-view-content
{
padding
:
3
5px
40px
;
padding
:
5px
40px
;
overflow
:
auto
;
overflow
:
auto
;
-webkit-flex-grow
:
1
;
-webkit-flex-grow
:
1
;
flex-grow
:
1
;
flex-grow
:
1
;
...
@@ -1036,6 +1050,7 @@ table.dataTable thead .sorting:after {
...
@@ -1036,6 +1050,7 @@ table.dataTable thead .sorting:after {
border-right
:
none
;
border-right
:
none
;
border-bottom-right-radius
:
0
;
border-bottom-right-radius
:
0
;
border-top-right-radius
:
0
;
border-top-right-radius
:
0
;
margin-right
:
-5px
;
}
}
.dashboard-main-search
.fa
{
.dashboard-main-search
.fa
{
...
...
app/components/crud/templates/form.html
View file @
f89734b4
<div
class=
"container"
>
<div>
<h3>
{{ schema.title }}
</h3>
<h3>
{{ schema.title }}
</h3>
<div
class=
"buttons-on-top"
></div>
<div
class=
"buttons-on-top"
></div>
...
...
app/img/brand-logo.png
View replaced file @
1f7e4211
View file @
f89734b4
10.5 KB
|
W:
|
H:
13.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/img/brand-logo2.png
0 → 100644
View file @
f89734b4
10.5 KB
app/index.html
View file @
f89734b4
...
@@ -38,6 +38,9 @@
...
@@ -38,6 +38,9 @@
<!--<li><a href="">Ayarlar</a></li>-->
<!--<li><a href="">Ayarlar</a></li>-->
<!--</ul>-->
<!--</ul>-->
<div
class=
"navbar-header"
>
<div
class=
"navbar-header"
>
<div
class=
"brand"
>
<a
href=
"#/dashboard"
class=
"logo"
><img
src=
"/img/brand-logo.png"
/></a>
</div>
<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=
"sr-only"
>
Toggle navigation
</span>
<span
class=
"sr-only"
>
Toggle navigation
</span>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
...
...
app/shared/templates/directives/sidebar.html
View file @
f89734b4
<div
class=
"navbar-default sidebar"
role=
"navigation"
ng-mouseenter=
"openSidebar()"
ng-mouseleave=
"closeSidebar()"
>
<div
class=
"navbar-default sidebar"
role=
"navigation"
ng-mouseenter=
"openSidebar()"
ng-mouseleave=
"closeSidebar()"
>
<div
class=
"brand"
>
<a
href=
"#/dashboard"
class=
"logo"
><img
src=
"/img/brand-logo.png"
/></a>
</div>
<div
class=
"sidebar-nav navbar-collapse"
>
<div
class=
"sidebar-nav navbar-collapse"
>
<ul
class=
"nav in"
id=
"side-menu"
ng-class=
"{hidden: $root.loggedInUser != true}"
data-step=
"1"
<ul
class=
"nav in"
id=
"side-menu"
ng-class=
"{hidden: $root.loggedInUser != true}"
data-step=
"1"
...
...
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