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
673c9fb0
Commit
673c9fb0
authored
Dec 10, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'UI-Improvements-3'
parents
55121dad
52f6af6a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
94 additions
and
88 deletions
+94
-88
app.css
app/app.css
+23
-2
filter.html
app/components/crud/templates/filter.html
+71
-69
list.html
app/components/crud/templates/list.html
+0
-17
No files found.
app/app.css
View file @
673c9fb0
...
...
@@ -74,6 +74,23 @@ a:hover {
margin-bottom
:
0
;
}
.buttons-on-bottom
{
float
:
left
;
}
.filter-inner
{
background-color
:
#fff
;
padding
:
15px
;
margin-top
:
104px
;
border
:
1px
solid
#E6E6E6
;
}
.filter-inner
h4
{
font-family
:
'robotobold'
;
color
:
#333
;
letter-spacing
:
0.5px
;
}
/** BRAND **/
.brand-bg
{
...
...
@@ -557,6 +574,7 @@ select {
margin
:
10px
auto
;
float
:
left
;
margin-right
:
10px
;
border
:
1px
solid
#E4E4E4
;
}
.sidebar-person-info
.identity
p
.identity-name
{
...
...
@@ -1463,7 +1481,6 @@ table.dataTable thead .sorting:after {
padding
:
15px
;
width
:
100%
;
text-align
:
center
;
background
:
whitesmoke
;
}
footer
span
{
...
...
@@ -1552,6 +1569,10 @@ table.dataTable thead .sorting:after {
}
@media
(
max-width
:
1000px
)
{
.personnel-info-container
{
width
:
500px
;
...
...
@@ -1599,7 +1620,7 @@ table.dataTable thead .sorting:after {
.tablescroll
{
width
:
100%
;
overflow-x
:
scroll
;
overflow-x
:
auto
;
overflow-y
:
visible
;
padding-bottom
:
1px
;
}
...
...
app/components/crud/templates/filter.html
View file @
673c9fb0
<div
style=
"background: white;"
>
<div>
<div
class=
"filter-inner"
>
<h4>
Filtrele
</h4>
<hr>
...
...
@@ -75,4 +76,5 @@
<div
style=
"margin-top: 40px;"
>
<button
type=
"button"
class=
"btn btn-warning"
ng-click=
"filterSubmit()"
>
Filtrele
</button>
</div>
</div>
</div>
\ No newline at end of file
app/components/crud/templates/list.html
View file @
673c9fb0
...
...
@@ -51,21 +51,6 @@
</table>
</div>
<br/>
<hr/>
<div
class=
"btn-group"
ng-if=
"objects[1]"
>
<button
type=
"button"
class=
"btn btn-info dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
İşlemler
<span
class=
"caret"
></span>
</button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
""
>
İşlem 1
</a></li>
<li><a
href=
""
>
İşlem 2
</a></li>
<li><a
href=
""
>
İşlem 3
</a></li>
<li
role=
"separator"
class=
"divider"
></li>
<li><a
href=
""
>
İşlem 4
</a></li>
</ul>
</div>
<nav
ng-if=
"pagination && pagination.total_pages > 1"
class=
"text-center"
>
<ul
class=
"pagination"
>
...
...
@@ -86,6 +71,4 @@
</ul>
</nav>
<hr>
</div>
\ No newline at end of file
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