Commit 7fabbe24 authored by Evren Kutar's avatar Evren Kutar

Merge branch 'designmerge'

parents 2f909655 ef6ee58a
/*/!**/
/** Base structure*/
/**!/*/
/*/!* Move down content because we have a fixed navbar that is 50px tall *!/*/
/*body {*/
/*padding-top: 50px;*/
/*}*/
/*/!**/
/** Global add-ons*/
/**!/*/
/*.sub-header {*/
/*padding-bottom: 10px;*/
/*border-bottom: 1px solid #eee;*/
/*}*/
/*/!**/
/** Top navigation*/
/** Hide default border to remove 1px line.*/
/**!/*/
/*.navbar-fixed-top {*/
/*border: 0;*/
/*}*/
/*/!**/
/** Sidebar*/
/**!/*/
/*/!* Hide for mobile, show later *!/*/
/*.sidebar {*/
/*display: none;*/
/*}*/
/*@media (min-width: 768px) {*/
/*.sidebar {*/
/*position: fixed;*/
/*top: 51px;*/
/*bottom: 0;*/
/*left: 0;*/
/*z-index: 1000;*/
/*display: block;*/
/*padding: 20px;*/
/*overflow-x: hidden;*/
/*overflow-y: auto; /!* Scrollable contents if viewport is shorter than content. *!/*/
/*background-color: #f5f5f5;*/
/*border-right: 1px solid #eee;*/
/*}*/
/*}*/
/*/!* Sidebar navigation *!/*/
/*.nav-sidebar {*/
/*margin-right: -21px; /!* 20px padding + 1px border *!/*/
/*margin-bottom: 20px;*/
/*margin-left: -20px;*/
/*}*/
/*.nav-sidebar > li > a {*/
/*padding-right: 20px;*/
/*padding-left: 20px;*/
/*}*/
/*.nav-sidebar > .active > a,*/
/*.nav-sidebar > .active > a:hover,*/
/*.nav-sidebar > .active > a:focus {*/
/*color: #fff;*/
/*background-color: #428bca;*/
/*}*/
/*/!**/
/** Main content*/
/**!/*/
/*.main {*/
/*padding: 20px;*/
/*}*/
/*@media (min-width: 768px) {*/
/*.main {*/
/*padding-right: 40px;*/
/*padding-left: 40px;*/
/*}*/
/*}*/
/*.main .page-header {*/
/*margin-top: 0;*/
/*}*/
/*/!**/
/** Placeholder dashboard ideas*/
/**!/*/
/*.placeholders {*/
/*margin-bottom: 30px;*/
/*text-align: center;*/
/*}*/
/*.placeholders h4 {*/
/*margin-bottom: 0;*/
/*}*/
/*.placeholder {*/
/*margin-bottom: 20px;*/
/*}*/
/*.placeholder img {*/
/*display: inline-block;*/
/*border-radius: 50%;*/
/*}*/
/* Space out content a bit */ /* Space out content a bit */
body { body {
padding-bottom: 20px; font-family:'robotoregular';
} }
/* Everything but the jumbotron gets side spacing for mobile first views */ /* Everything but the jumbotron gets side spacing for mobile first views */
.header, .header,
.marketing, .marketing,
.footer { .footer {
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
} }
/* Custom page header */ /* Custom page header */
.header { .header {
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
/* Make the masthead heading the same height as the navigation */ /* Make the masthead heading the same height as the navigation */
.header h3 { .header h3 {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
line-height: 40px; line-height: 40px;
padding-bottom: 19px; padding-bottom: 19px;
} }
/* Custom page footer */ /* Custom page footer */
.footer { .footer {
padding-top: 19px; padding-top: 19px;
color: #777; color: #777;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
} }
/* Customize container */ nav.navbar {
@media (min-width: 768px) { background-color: #A61229;
.container { border-color: #941A1A;
max-width: 730px; min-height:65px;
} }
a.navbar-brand img {
height:45px;
margin-top:-6px;
}
.navbar-default .navbar-toggle .icon-bar {
background-color:#fff;
}
.navbar-default .navbar-toggle:hover {
background-color:#9a1026;
}
.navbar-default .navbar-toggle:focus {
background-color:#A61229;
} }
.container-narrow > hr { .container-narrow > hr {
margin: 30px 0; margin: 30px 0;
} }
/* Main marketing message and sign up button */ /* Main marketing message and sign up button */
.jumbotron { .jumbotron {
text-align: center; text-align: center;
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
.jumbotron .btn { .jumbotron .btn {
font-size: 21px; font-size: 21px;
padding: 14px 24px; padding: 14px 24px;
} }
/* Supporting marketing content */ /* Supporting marketing content */
.marketing { .marketing {
margin: 40px 0; margin: 40px 0;
} }
.marketing p + h4 { .marketing p + h4 {
margin-top: 28px; margin-top: 28px;
} }
/* Responsive: Portrait tablets and up */ .nav>li>a {
@media screen and (min-width: 768px) { color: #b8c7ce;
/* Remove the padding we set earlier */ border-left: 3px solid transparent;
.header, padding:15px;
.marketing, -webkit-transition: all .2s;
.footer { -moz-transition: all .2s;
padding-left: 0; -ms-transition: all .2s;
padding-right: 0; -o-transition: all .2s;
} transition: all .2s;
}
/* Space out the masthead */ .nav>li>a:visited {
.header { background-color: #222d32;
margin-bottom: 30px; }
}
/* Remove the bottom border on the jumbotron for visual effect */ .nav>li.active>a {
.jumbotron { text-decoration: none;
border-bottom: 0; background-color: #1e282c;
} color:#fff;
border-color:#A61229;
} }
.nav > li.active > a { .nav>li>a:hover {
text-decoration: none; background-color: #1e282c;
background-color: #eee; color:#fff;
} }
/*! /*!
...@@ -198,7 +109,7 @@ body { ...@@ -198,7 +109,7 @@ body {
*/ */
body { body {
background-color: #f8f8f8; background-color: #222d32;
} }
#wrapper { #wrapper {
...@@ -211,15 +122,6 @@ body { ...@@ -211,15 +122,6 @@ body {
background-color: #fff; background-color: #fff;
} }
@media (min-width: 768px) {
#page-wrapper {
position: inherit;
margin: 0 0 0 250px;
padding: 0 30px;
border-left: 1px solid #e7e7e7;
}
}
.navbar-top-links { .navbar-top-links {
margin-right: 0; margin-right: 0;
} }
...@@ -233,8 +135,31 @@ body { ...@@ -233,8 +135,31 @@ body {
} }
.navbar-top-links li a { .navbar-top-links li a {
padding: 15px; padding: 22px 20px;
min-height: 50px; min-height: 65px;
color:#fff;
cursor:pointer;
}
.navbar-top-links li>a:hover,
.navbar-top-links .open>a,
.navbar-top-links .open>a:hover,
.navbar-top-links .open>a:active,
.navbar-top-links .open>a:focus {
background-color:#9A1026;
}
.navbar-top-links .dropdown-menu li.divider {
margin:0;
}
.navbar-top-links .dropdown-menu li a:hover {
background-color:#fcfcfc;
}
.navbar-top-links .open>a,
.navbar-top-links .open>a:hover {
border-color:#9A1026;
} }
.navbar-top-links .dropdown-menu li { .navbar-top-links .dropdown-menu li {
...@@ -246,8 +171,9 @@ body { ...@@ -246,8 +171,9 @@ body {
} }
.navbar-top-links .dropdown-menu li a { .navbar-top-links .dropdown-menu li a {
padding: 3px 20px; padding: 10px 20px;
min-height: 0; min-height: 0;
color:#444;
} }
.navbar-top-links .dropdown-menu li a div { .navbar-top-links .dropdown-menu li a div {
...@@ -278,6 +204,10 @@ body { ...@@ -278,6 +204,10 @@ body {
left: auto; left: auto;
} }
.sidebar {
background-color:#222d32;
}
.sidebar .sidebar-nav.navbar-collapse { .sidebar .sidebar-nav.navbar-collapse {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
...@@ -288,7 +218,6 @@ body { ...@@ -288,7 +218,6 @@ body {
} }
.sidebar ul li { .sidebar ul li {
border-bottom: 1px solid #e7e7e7;
} }
.sidebar ul li a.active { .sidebar ul li a.active {
...@@ -303,13 +232,13 @@ body { ...@@ -303,13 +232,13 @@ body {
content: "\f104"; content: "\f104";
} }
.sidebar .active > a > .fa.arrow:before { .sidebar .active>a>.fa.arrow:before {
content: "\f107"; content: "\f107";
} }
.sidebar .nav-second-level li, .sidebar .nav-second-level li,
.sidebar .nav-third-level li { .sidebar .nav-third-level li {
border-bottom: 0 !important; border-bottom: 0!important;
} }
.sidebar .nav-second-level li a { .sidebar .nav-second-level li a {
...@@ -320,21 +249,6 @@ body { ...@@ -320,21 +249,6 @@ body {
padding-left: 52px; padding-left: 52px;
} }
@media (min-width: 768px) {
.sidebar {
z-index: 1;
position: absolute;
width: 250px;
margin-top: 51px;
}
.navbar-top-links .dropdown-messages,
.navbar-top-links .dropdown-tasks,
.navbar-top-links .dropdown-alerts {
margin-left: auto;
}
}
.btn-outline { .btn-outline {
color: inherit; color: inherit;
background-color: transparent; background-color: transparent;
...@@ -446,7 +360,7 @@ table.dataTable thead .sorting:after { ...@@ -446,7 +360,7 @@ table.dataTable thead .sorting:after {
content: "\f0dc"; content: "\f0dc";
float: right; float: right;
font-family: fontawesome; font-family: fontawesome;
color: rgba(50, 50, 50, .5); color: rgba(50,50,50,.5);
} }
.btn-circle { .btn-circle {
...@@ -481,7 +395,7 @@ table.dataTable thead .sorting:after { ...@@ -481,7 +395,7 @@ table.dataTable thead .sorting:after {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
border: 1px solid #ddd; border: 1px solid #ddd;
background-color: #eee !important; background-color: #eee!important;
} }
.show-grid { .show-grid {
...@@ -691,6 +605,49 @@ table.dataTable thead .sorting:after { ...@@ -691,6 +605,49 @@ table.dataTable thead .sorting:after {
margin-top: 5px; margin-top: 5px;
} }
/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
/* Remove the padding we set earlier */
.header,
.marketing,
.footer {
padding-left: 0;
padding-right: 0;
}
/* Space out the masthead */
.header {
margin-bottom: 30px;
}
/* Remove the bottom border on the jumbotron for visual effect */
.jumbotron {
border-bottom: 0;
}
.sidebar {
z-index: 1;
position: absolute;
width: 250px;
margin-top: 65px;
}
.navbar-top-links .dropdown-messages,
.navbar-top-links .dropdown-tasks,
.navbar-top-links .dropdown-alerts {
margin-left: auto;
}
#page-wrapper {
position: inherit;
margin: 0 0 0 250px;
padding: 0 30px;
border-left: 1px solid #e7e7e7;
background-color:#fcfcfc;
}
.container {
max-width: 730px;
}
}
@media (max-width: 767px) { @media (max-width: 767px) {
ul.timeline:before { ul.timeline:before {
left: 40px; left: 40px;
......
<div ng-app="ulakbus.dashboard"> <div ng-app="ulakbus.dashboard">
<div class="starter-template"> <div class="starter-template">
<h1>Main Dashboard</h1> <h1>Main Dashboard2</h1>
{{ testData }} <!-- {{ testData }} -->
<table class="table table-bordered" style="background-color:#fff;">
<thead>
<tr>
<th colspan="2">#</th>
<th>First Name</th>
<th>Last Name</th>
<th>Username</th>
</tr>
</thead>
<tbody>
<tr>
<td width="60">
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">1</th>
<td>Mark</td>
<td>Otto</td>
<td>@mdo</td>
</tr>
<tr>
<td>
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">2</th>
<td>Jacob</td>
<td>Thornton</td>
<td>@fat</td>
</tr>
<tr>
<td>
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">3</th>
<td>Larry</td>
<td>the Bird</td>
<td>@twitter</td>
</tr>
<tr>
<td width="60">
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">4</th>
<td>Mark</td>
<td>Otto</td>
<td>@mdo</td>
</tr>
<tr>
<td>
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">5</th>
<td>Jacob</td>
<td>Thornton</td>
<td>@fat</td>
</tr>
<tr>
<td>
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">6</th>
<td>Larry</td>
<td>the Bird</td>
<td>@twitter</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<!--<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">--> <!--<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">-->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<link href="styles/roboto/roboto.css" rel="stylesheet">
<link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css"> <link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css">
<link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css"> <link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css">
<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" type="text/css"> <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" type="text/css">
...@@ -25,40 +26,38 @@ ...@@ -25,40 +26,38 @@
</head> </head>
<body> <body>
<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>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="index.html">ULAKBUS</a> <a class="navbar-brand" href="index.html"><img src="img/ulakbus-logo.png" /></a>
</div> </div>
<!-- /.navbar-header --> <!-- /.navbar-header -->
<header-notification></header-notification> <header-notification></header-notification>
<sidebar></sidebar> <sidebar></sidebar>
</nav> </nav>
<div class="container-fluid"> <div id="page-wrapper">
<div class="row"> <div class="col-md-12">
<div class="row">
<div class="main" ng-view>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main" </div>
ng-view> <hr>
</div>
</div> </div>
</div>
<hr>
<div>UlakbusUI app: v<span app-version></span></div>
</div>
</div>
<script src="bower_components/angular/angular.min.js"></script> <script src="bower_components/angular/angular.min.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script> <script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/angular-route/angular-route.min.js"></script> <script src="bower_components/angular-route/angular-route.min.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.min.js"></script> <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
......
This diff is collapsed.
@font-face {
font-family: 'robotoblack';
src: url('Roboto-Black-webfont.eot');
src: url('Roboto-Black-webfont.eot?#iefix') format('embedded-opentype'),
url('Roboto-Black-webfont.woff') format('woff'),
url('Roboto-Black-webfont.ttf') format('truetype'),
url('Roboto-Black-webfont.svg#robotoblack') format('svg');
font-weight: normal;
font-style: normal;
}
This diff is collapsed.
@font-face {
font-family: 'robotobold';
src: url('Roboto-Bold-webfont.eot');
src: url('Roboto-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('Roboto-Bold-webfont.woff') format('woff'),
url('Roboto-Bold-webfont.ttf') format('truetype'),
url('Roboto-Bold-webfont.svg#robotobold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'robotoitalic';
src: url('Roboto-Italic-webfont.eot');
src: url('Roboto-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('Roboto-Italic-webfont.woff') format('woff'),
url('Roboto-Italic-webfont.ttf') format('truetype'),
url('Roboto-Italic-webfont.svg#robotoitalic') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'robotolight';
src: url('Roboto-Light-webfont.eot');
src: url('Roboto-Light-webfont.eot?#iefix') format('embedded-opentype'),
url('Roboto-Light-webfont.woff') format('woff'),
url('Roboto-Light-webfont.ttf') format('truetype'),
url('Roboto-Light-webfont.svg#robotolight') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'robotomedium';
src: url('Roboto-Medium-webfont.eot');
src: url('Roboto-Medium-webfont.eot?#iefix') format('embedded-opentype'),
url('Roboto-Medium-webfont.woff') format('woff'),
url('Roboto-Medium-webfont.ttf') format('truetype'),
url('Roboto-Medium-webfont.svg#robotomedium') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'robotoregular';
src: url('Roboto-Regular-webfont.eot');
src: url('Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('Roboto-Regular-webfont.woff') format('woff'),
url('Roboto-Regular-webfont.ttf') format('truetype'),
url('Roboto-Regular-webfont.svg#robotoregular') format('svg');
font-weight: normal;
font-style: normal;
}
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">--> <!--<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">-->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<link href="styles/roboto/roboto.css" rel="stylesheet">
<link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css"> <link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css">
<link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css"> <link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css">
<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" type="text/css"> <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" type="text/css">
...@@ -30,38 +31,33 @@ ...@@ -30,38 +31,33 @@
</head> </head>
<body> <body>
<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">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">ULAKBUS</a>
</div>
<!-- /.navbar-header -->
<header-notification></header-notification>
<sidebar></sidebar>
</nav>
<div class="container-fluid">
<div class="row">
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main"
ng-view>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html"><img src="app/img/ulakbus-logo.png"/></a>
</div>
<!-- /.navbar-header -->
<header-notification></header-notification>
<sidebar></sidebar>
</nav>
<div id="page-wrapper">
<div class="col-md-12">
<div class="row">
<div class="main" ng-view>
</div>
<hr>
</div>
</div> </div>
<hr>
<div>UlakbusUI app: v<span app-version></span></div>
</div> </div>
</div>
<!-- @if NODE_ENV == 'DEVELOPMENT' --> <!-- @if NODE_ENV == 'DEVELOPMENT' -->
<script src="bower_components/angular/angular.min.js"></script> <script src="bower_components/angular/angular.min.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script> <script src="bower_components/jquery/dist/jquery.min.js"></script>
......
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