Commit 2a861f82 authored by Evren Kutar's avatar Evren Kutar

new style dist created with dependent files

parent 2f452ca7
......@@ -72,6 +72,8 @@ module.exports = function (grunt) {
prod: {
files: [
{expand: true, cwd: 'app/bower_components/font-awesome/fonts/', src: '*', dest: 'dist/fonts/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'brand-logo.png', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/styles/roboto/', src: '**/*', dest: 'dist/css/roboto/', flatten: false},
{expand: true, cwd: 'app/bower_components/bootstrap/dist/fonts/', src: '*', dest: 'dist/fonts/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/bower_components/jquery/dist/', src: 'jquery.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'}
]
......
......@@ -24,7 +24,7 @@ var app = angular.module(
//'ulakbus.version',
'schemaForm',
'gettext',
//'templates-prod'
'templates-prod'
]).
/**
* RESTURL is the url of rest api to talk
......
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
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;
}
This diff is collapsed.
@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;
}
......@@ -15,42 +15,54 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/app.css">
<link rel="stylesheet" href="css/roboto/roboto.css">
</head>
<body>
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<ul class="header-menu">
<li><a href="">Mesajlar</a></li>
<li><a href="">Görevler</a></li>
<li><a href="">Raporlar</a></li>
<li><a href="">Ayarlar</a></li>
</ul>
<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>
<sidebar></sidebar>
<div class="container-fluid">
<div class="manager-view">
<div class="manager-view-inner">
<!-- manager-header -->
<div class="manager-view-header container-fluid">
<ul class="breadcrumb">
<li><a href="#">Personeller</a></li>
<li><a href="#">Liste</a></li>
<li class="active">Tablo</li>
</ul>
<button type="button" class="btn btn-primary">Kaydet</button>
</div>
<!-- end of manager-header -->
<div class="manager-view-content">
<div class="row">
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main"
ng-view>
<div class="main" ng-view>
</div>
<hr>
<div>UlakbusUI app: v<span app-version></span></div>
</div>
</div>
</div>
</div>
<script src="bower_components/jquery.min.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.17/angular.min.js"></script>
<script src="bower_components/components.js"></script>
......
This diff is collapsed.
......@@ -27,6 +27,7 @@
<!-- @if NODE_ENV == 'PRODUCTION' -->
<link rel="stylesheet" href="css/app.css">
<link rel="stylesheet" href="css/roboto/roboto.css">
<!-- @endif -->
</head>
<body>
......
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