Skip to content

U
ulakbus-ui
Commit efc045d9 authored by Erkan Öğümsöğütlü's avatar Erkan Öğümsöğütlü
Browse files
Options

Conflict fix 

Fixed
parents a8bf5d0e e0579fc6
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 35 deletions
app/app.css
View file @ efc045d9
...@@ -123,7 +123,7 @@ a.navbar-brand img { ...@@ -123,7 +123,7 @@ a.navbar-brand img {
* Code licensed under the Apache License v2.0. * Code licensed under the Apache License v2.0.
* For details, see http://www.apache.org/licenses/LICENSE-2.0. * For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/ */
select { select {
padding: 5px 10px; padding: 5px 10px;
border-color: #dcdcdc; border-color: #dcdcdc;
...@@ -673,7 +673,7 @@ table.dataTable thead .sorting:after { ...@@ -673,7 +673,7 @@ table.dataTable thead .sorting:after {
.navbar-top-links .dropdown-alerts { .navbar-top-links .dropdown-alerts {
margin-left: auto; margin-left: auto;
} }
.container { .container {
max-width: 730px; max-width: 730px;
} }
......
app/components/dashboard/dashboard.html
View file @ efc045d9
<div ng-app="ulakbus.dashboard"> <div ng-app="ulakbus.dashboard">
<div class="starter-template"> <div class="starter-template">
<!-- table view --> <!-- table view -->
<table class="table table-bordered" style="background-color:#fff;"> <table class="table table-bordered" style="background-color:#fff;">
<thead> <thead>
...@@ -101,20 +102,6 @@ ...@@ -101,20 +102,6 @@
<hr> <hr>
</div> </div>
</div> </div>
\ No newline at end of file
app/index.html
View file @ efc045d9
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header"> <div class="navbar-header">
<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>
...@@ -45,24 +44,24 @@ ...@@ -45,24 +44,24 @@
<div class="manager-view"> <div class="manager-view">
<div class="manager-view-inner"> <div class="manager-view-inner">
<!-- manager-header --> <!-- manager-header -->
<div class="manager-view-header container-fluid"> <div class="manager-view-header container-fluid">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="#">Personeller</a></li> <li><a href="#">Personeller</a></li>
<li><a href="#">Liste</a></li> <li><a href="#">Liste</a></li>
<li class="active">Tablo</li> <li class="active">Tablo</li>
</ul> </ul>
<button type="button" class="btn btn-primary">Kaydet</button> <button type="button" class="btn btn-primary">Kaydet</button>
</div> </div>
<!-- end of manager-header --> <!-- end of manager-header -->
<div class="manager-view-content container-fluid"> <div class="manager-view-content container-fluid">
<div class="row"> <div class="row">
<div class="main" ng-view> <div class="main" ng-view>
</div>
<hr>
</div> </div>
<hr>
</div> </div>
</div> </div>
</div>
</div> </div>
......
index.html
View file @ efc045d9
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header"> <div class="navbar-header">
<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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment