Skip to content

U
ulakbus-ui
Commit 6330ae1c authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

grunt config for distribution

parent 254e6ae0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 605 additions and 265 deletions
Gruntfile.js
View file @ 6330ae1c
...@@ -74,6 +74,8 @@ module.exports = function (grunt) { ...@@ -74,6 +74,8 @@ module.exports = function (grunt) {
{expand: true, cwd: 'app/bower_components/font-awesome/fonts/', src: '*', dest: 'dist/fonts/', flatten: true, filter: 'isFile'}, {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/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/styles/roboto/', src: '**/*', dest: 'dist/css/roboto/', flatten: false},
{expand: true, cwd: 'app/styles/', src: 'jquery-ui.min.css', dest: 'dist/css/', flatten: true},
{expand: true, cwd: 'app/styles/images/', src: '*', dest: 'dist/css/images/', flatten: true},
{expand: true, cwd: 'app/bower_components/bootstrap/dist/fonts/', src: '*', dest: 'dist/fonts/', flatten: true, filter: 'isFile'}, {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'} {expand: true, cwd: 'app/bower_components/jquery/dist/', src: 'jquery.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'}
] ]
...@@ -100,7 +102,6 @@ module.exports = function (grunt) { ...@@ -100,7 +102,6 @@ module.exports = function (grunt) {
}, },
components: { components: {
src: [ src: [
//"app/bower_components/jquery/dist/jquery.min.js",
"app/bower_components/angular-route/angular-route.min.js", "app/bower_components/angular-route/angular-route.min.js",
"app/bower_components/angular-cookies/angular-cookies.min.js", "app/bower_components/angular-cookies/angular-cookies.min.js",
"app/bower_components/angular-resource/angular-resource.min.js", "app/bower_components/angular-resource/angular-resource.min.js",
...@@ -116,7 +117,8 @@ module.exports = function (grunt) { ...@@ -116,7 +117,8 @@ module.exports = function (grunt) {
"app/bower_components/json3/lib/json3.min.js", "app/bower_components/json3/lib/json3.min.js",
"app/bower_components/angular-loading-bar/build/loading-bar.min.js", "app/bower_components/angular-loading-bar/build/loading-bar.min.js",
"app/bower_components/metisMenu/dist/metisMenu.min.js", "app/bower_components/metisMenu/dist/metisMenu.min.js",
"app/bower_components/Chart.js/Chart.min.js" "app/bower_components/Chart.js/Chart.min.js",
"app/shared/scripts/jquery-ui.min.js",
], ],
dest: 'dist/bower_components/components.js' dest: 'dist/bower_components/components.js'
}, },
......
app/index.html
View file @ 6330ae1c
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<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">
</head> </head>
<body> <body>
...@@ -63,13 +64,11 @@ ...@@ -63,13 +64,11 @@
<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/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>
<script src="bower_components/angular-resource/angular-resource.min.js"></script> <script src="bower_components/angular-resource/angular-resource.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script> <script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
<script src="bower_components/tv4/tv4.js"></script> <script src="bower_components/tv4/tv4.js"></script>
<script src="bower_components/objectpath/lib/ObjectPath.js"></script> <script src="bower_components/objectpath/lib/ObjectPath.js"></script>
...@@ -83,10 +82,8 @@ ...@@ -83,10 +82,8 @@
<script src="bower_components/angular-loading-bar/build/loading-bar.min.js"></script> <script src="bower_components/angular-loading-bar/build/loading-bar.min.js"></script>
<script src="bower_components/metisMenu/dist/metisMenu.min.js"></script> <script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
<script src="bower_components/Chart.js/Chart.min.js"></script> <script src="bower_components/Chart.js/Chart.min.js"></script>
<script src="shared/translations.js"></script> <script src="shared/translations.js"></script>
<script src="tmp/templates.js"></script> <script src="tmp/templates.js"></script>
<script src="app.js"></script> <script src="app.js"></script>
<script src="app_routes.js"></script> <script src="app_routes.js"></script>
<script src="shared/scripts/theme.js"></script> <script src="shared/scripts/theme.js"></script>
......
dist/app.js
View file @ 6330ae1c
This diff is collapsed.
dist/bower_components/components.js
View file @ 6330ae1c
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/app.css
View file @ 6330ae1c
...@@ -7,10 +7,33 @@ ...@@ -7,10 +7,33 @@
/* Space out content a bit */ /* Space out content a bit */
body { body {
font-family:'robotoregular'; font-family:'robotoregular';
background-color: #222d32; background-color: #f5f5f5;
overflow:hidden; overflow:hidden;
} }
::-webkit-scrollbar {
width: 5px;
height: 5px;
}
::-webkit-scrollbar-track {
background-color:#ccc;
}
::-webkit-scrollbar-thumb {
background-color:#999;
}
.form-control {
box-shadow:none;
border-radius:0;
border-color:#ececec;
}
.btn {
border:none;
}
.btn:focus, .btn:focus,
.btn:active:focus, .btn:active:focus,
.btn.active:focus, .btn.active:focus,
...@@ -45,8 +68,8 @@ a:hover { ...@@ -45,8 +68,8 @@ a:hover {
.logo img { .logo img {
width: 80%; width: 80%;
margin-left: 8%; margin-left: 8%;
margin-top: 23px; margin-top: 22px;
margin-bottom: 23px; margin-bottom: 22px;
} }
/* Everything but the jumbotron gets side spacing for mobile first views */ /* Everything but the jumbotron gets side spacing for mobile first views */
...@@ -154,13 +177,12 @@ ul.header-menu li a:hover{ ...@@ -154,13 +177,12 @@ ul.header-menu li a:hover{
} }
.sidebar .nav>li ul { .sidebar .nav>li ul {
border-bottom: 3px solid #E4E4E4;
border-left: 3px solid #A61229; border-left: 3px solid #A61229;
} }
.sidebar .nav>li ul>li a { .sidebar .nav>li ul>li a {
font-family:'robotoregular'; font-family:'robotoregular';
background-color:#f5f5f5; background-color:#fdfdfd;
} }
.nav>li>a:visited { .nav>li>a:visited {
...@@ -168,7 +190,7 @@ ul.header-menu li a:hover{ ...@@ -168,7 +190,7 @@ ul.header-menu li a:hover{
.nav>li.active>a { .nav>li.active>a {
text-decoration: none; text-decoration: none;
background-color: #f5f5f5; background-color: #fdfdfd;
color: #565656; color: #565656;
border-color:#A61229; border-color:#A61229;
} }
...@@ -315,7 +337,6 @@ select { ...@@ -315,7 +337,6 @@ select {
.sidebar { .sidebar {
background-color:#fff; background-color:#fff;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
overflow:auto;
} }
.sidebar .sidebar-nav.navbar-collapse { .sidebar .sidebar-nav.navbar-collapse {
...@@ -718,6 +739,121 @@ table.dataTable thead .sorting:after { ...@@ -718,6 +739,121 @@ table.dataTable thead .sorting:after {
margin-top: 5px; margin-top: 5px;
} }
/* PERSONNEL INFO */
.generic-profile-picture img {
width:220px;
height:220px;
}
.personnel-info-container {
width:1000px;
height:530px;
margin-left:auto;
margin-right:auto;
margin-bottom:50px;
background-color:#fff;
-webkit-box-shadow: 0 0 3px rgba(0,0,0,0.1);
-moz-box-shadow: 0 0 3px rgba(0,0,0,0.1);
box-shadow: 0 0 3px rgba(0,0,0,0.1);
background-color:#fff;
position:relative;
}
.personnel-info-left {
width:250px;
height:100%;
background-color:#fcfcfc;
padding:15px;
position:absolute;
left:0;
overflow-y: auto;
overflow-x: hidden;
border-right: 1px solid #F7F7F7;
}
.personnel-info-left ul {
padding:0;
margin-top:20px;
}
.personnel-info-left ul li {
list-style:none;
margin-bottom:15px;
position:relative;
padding-left:30px;
color:#555;
}
.personnel-info-left ul li:nth-child(1) {
padding:0;
font-family:'robotobold';
font-size:18px;
color:#333;
}
.personnel-info-left ul li:nth-child(2) {
padding:0;
font-family:'robotomedium';
font-size:17px;
color:#666;
}
.personnel-info-left ul li i.fa {
width:18px;
margin-right:15px;
font-size:18px;
position:absolute;
left:0;
text-align:center;
}
.personnel-info-right {
width:750px;
height:100%;
background-color:#fff;
padding:40px;
padding-top:15px;
position:absolute;
right:0;
overflow-y:auto;
}
.personnel-info-right h2 {
margin-top:0;
margin-bottom:20px;
font-family:'robotolight';
font-size:23px;
}
.info-block {
margin-bottom:70px;
}
.info-block:last-child {
margin-bottom:0px;
}
.info-block-body dt {
text-align:left;
font-family:'robotomedium';
font-weight:normal;
}
.info-block-body dl {
margin-bottom:10px;
color:#444;
}
.personnel-info-edit .personnel-info-left ul li {
padding-left:0;
}
/* END OF PERSONNEL INFO */
/* Responsive: Portrait tablets and up */ /* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
/* Remove the padding we set earlier */ /* Remove the padding we set earlier */
...@@ -797,8 +933,75 @@ table.dataTable thead .sorting:after { ...@@ -797,8 +933,75 @@ table.dataTable thead .sorting:after {
border-right-width: 14px; border-right-width: 14px;
border-left-width: 0; border-left-width: 0;
} }
.brand {
text-align:center;
}
.logo img {
width:200px;
margin-left:0;
}
.manager-view-content {
overflow:inherit;
}
body {
overflow:auto;
}
}
@media (max-width: 1350px) {
.personnel-info-container {
width:700px;
}
.personnel-info-right {
width:450px;
}
} }
@media (max-width: 1000px) {
.personnel-info-container {
width:500px;
height:auto;
}
.personnel-info-left {
width:100%;
position:relative;
height:auto;
border:none;
}
.personnel-info-right {
width:100%;
position:relative;
height:auto;
}
.generic-profile-picture,
.personnel-info-left ul li:nth-child(1),
.personnel-info-left ul li:nth-child(2) {
text-align:center;
}
.generic-profile-picture img {
border-radius:100%;
}
}
@media (max-width: 560px) {
.personnel-info-container {
width: 350px;
}
}
/* /*
* metismenu - v1.1.3 * metismenu - v1.1.3
* Easy menu jQuery plugin for Twitter Bootstrap 3 * Easy menu jQuery plugin for Twitter Bootstrap 3
......
dist/index.html
View file @ 6330ae1c
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<link rel="stylesheet" href="css/app.css"> <link rel="stylesheet" href="css/app.css">
<link rel="stylesheet" href="css/roboto/roboto.css"> <link rel="stylesheet" href="css/roboto/roboto.css">
<link rel="stylesheet" href="css/jquery-ui.min.css">
</head> </head>
<body> <body>
...@@ -38,23 +39,17 @@ ...@@ -38,23 +39,17 @@
<header-notification></header-notification> <header-notification></header-notification>
</nav> </nav>
<sidebar></sidebar> <sidebar ng-if="$root.loggedInUser"></sidebar>
<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"> <header-sub-menu ng-if="$root.loggedInUser"></header-sub-menu>
<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 --> <!-- end of manager-header -->
<div class="manager-view-content"> <div class="manager-view-content">
<div class="row"> <div class="row">
<div class="main" ng-view> <div class="main" ng-view>
</div> </div>
</div> </div>
......
dist/templates.js
View file @ 6330ae1c
This diff is collapsed.
index.html
View file @ 6330ae1c
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<!-- @if NODE_ENV == 'PRODUCTION' --> <!-- @if NODE_ENV == 'PRODUCTION' -->
<link rel="stylesheet" href="css/app.css"> <link rel="stylesheet" href="css/app.css">
<link rel="stylesheet" href="css/roboto/roboto.css"> <link rel="stylesheet" href="css/roboto/roboto.css">
<link rel="stylesheet" href="css/jquery-ui.min.css">
<!-- @endif --> <!-- @endif -->
</head> </head>
<body> <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