mirror of https://github.com/akveo/blur-admin
Merge branch 'lugovsky-feature' into v2
# Conflicts: # bower.json # src/app/pages/pages.module.js # src/app/theme/components/sidebar/SidebarCtrl.jspull/3/head
Vladimir Lugovsky
commit
2631c853e9
|
|
@ -48,7 +48,9 @@
|
|||
"angular-chartist.js": "~3.3.12",
|
||||
"angular-morris-chart": "~1.1.0",
|
||||
"angular-ui-tree": "~2.12.0",
|
||||
"ionrangeslider": "~2.1.2"
|
||||
"ionrangeslider": "~2.1.2",
|
||||
"angular-bootstrap": "~0.14.3",
|
||||
"angular-animate": "~1.4.8"
|
||||
},
|
||||
"overrides": {
|
||||
"amcharts": {
|
||||
|
|
@ -82,8 +84,5 @@
|
|||
"font-awesome": {
|
||||
"main": "css/font-awesome.css"
|
||||
}
|
||||
},
|
||||
"devDependencies": {
|
||||
"angular-ui-router": "~0.2.15"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ function browserSyncInit(baseDir, browser) {
|
|||
browserSync.instance = browserSync.init({
|
||||
startPath: '/',
|
||||
server: server,
|
||||
browser: browser
|
||||
browser: browser,
|
||||
ghostMode: false
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('BlurAdmin', [
|
||||
'ngAnimate',
|
||||
'ui.bootstrap',
|
||||
'ui.sortable',
|
||||
'ui.router',
|
||||
'ngTouch',
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
'BlurAdmin.pages.slider',
|
||||
'BlurAdmin.pages.tables',
|
||||
'BlurAdmin.pages.tree',
|
||||
'BlurAdmin.pages.tabs',
|
||||
'BlurAdmin.pages.typography'
|
||||
])
|
||||
.config(routeConfig);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
<uib-tabset>
|
||||
<uib-tab heading="Start">
|
||||
<p>
|
||||
Take up one idea. Make that one idea your life--think of it, dream of it, live on that idea. Let the brain, muscles, nerves, every part of your body, be full of that idea, and just leave every other idea alone. This is the way to success.
|
||||
</p>
|
||||
<p>
|
||||
People who succeed have momentum. The more they succeed, the more they want to succeed, and the more they find a way to succeed. Similarly, when someone is failing, the tendency is to get on a downward spiral that can even become a self-fulfilling prophecy.
|
||||
</p>
|
||||
</uib-tab>
|
||||
<uib-tab heading="Getting Done" >
|
||||
<p>
|
||||
You can't connect the dots looking forward; you can only connect them looking backwards. So you have to trust that the dots will somehow connect in your future. You have to trust in something--your gut, destiny, life, karma, whatever. This approach has never let me down, and it has made all the difference in my life.
|
||||
</p>
|
||||
<p>
|
||||
The reason most people never reach their goals is that they don't define them, or ever seriously consider them as believable or achievable. Winners can tell you where they are going, what they plan to do along the way, and who will be sharing the adventure with them.
|
||||
</p>
|
||||
</uib-tab>
|
||||
<uib-tab ng-init="$dropdownTabActive = 1" class="with-dropdown">
|
||||
<uib-tab-heading uib-dropdown>
|
||||
<a uib-dropdown-toggle ng-click="$event.stopPropagation()">
|
||||
Dropdown tab <i class="caret"></i>
|
||||
</a>
|
||||
<ul class="uib-dropdown-menu">
|
||||
<li><a ng-click="$dropdownTabActive = 1">Tab 1</a></li>
|
||||
<li><a ng-click="$dropdownTabActive = 2">Tab 2</a></li>
|
||||
</ul>
|
||||
</uib-tab-heading>
|
||||
<div ng-show="$dropdownTabActive == 1">
|
||||
<p>
|
||||
Success is ... knowing your purpose in life, growing to reach your maximum potential, and sowing seeds that benefit others.
|
||||
</p>
|
||||
<p>Failure is the condiment that gives success its flavor.</p>
|
||||
</div>
|
||||
<div ng-show="$dropdownTabActive == 2">
|
||||
<p>
|
||||
<button class="btn btn-danger">I'm just a dummy button</button>
|
||||
</p>
|
||||
</div>
|
||||
</uib-tab>
|
||||
</uib-tabset>
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
<uib-accordion>
|
||||
<uib-accordion-group heading="Static Header, initially expanded">
|
||||
This content is straight in the template.
|
||||
</uib-accordion-group>
|
||||
<uib-accordion-group heading="Dynamic Body Content">
|
||||
<p>The body of the uib-accordion group grows to fit the contents</p>
|
||||
<button type="button" class="btn btn-default btn-sm" ng-click="addItem()">Add Item</button>
|
||||
</uib-accordion-group>
|
||||
<uib-accordion-group heading="Custom template">
|
||||
Hello
|
||||
</uib-accordion-group>
|
||||
<uib-accordion-group heading="Delete account" panel-class="panel-danger">
|
||||
<p>Please, to delete your account, click the button below</p>
|
||||
<button class="btn btn-danger">Delete</button>
|
||||
</uib-accordion-group>
|
||||
<uib-accordion-group is-open="status.open">
|
||||
<uib-accordion-heading>
|
||||
I can have markup, too! <b class="fa pull-right" ng-class="{'fa-angle-up': status.open, 'fa-angle-down': !status.open}"></b>
|
||||
</uib-accordion-heading>
|
||||
This is just some content to illustrate fancy headings.
|
||||
</uib-accordion-group>
|
||||
</uib-accordion>
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
<uib-tabset class="tabs-left">
|
||||
<uib-tab heading="Start">
|
||||
<p>
|
||||
Take up one idea. Make that one idea your life--think of it, dream of it, live on that idea. Let the brain, muscles, nerves, every part of your body, be full of that idea, and just leave every other idea alone. This is the way to success.
|
||||
</p>
|
||||
<p>
|
||||
People who succeed have momentum. The more they succeed, the more they want to succeed, and the more they find a way to succeed. Similarly, when someone is failing, the tendency is to get on a downward spiral that can even become a self-fulfilling prophecy.
|
||||
</p>
|
||||
</uib-tab>
|
||||
<uib-tab heading="Get it done" >
|
||||
<p>
|
||||
You can't connect the dots looking forward; you can only connect them looking backwards. So you have to trust that the dots will somehow connect in your future. You have to trust in something--your gut, destiny, life, karma, whatever. This approach has never let me down, and it has made all the difference in my life.
|
||||
</p>
|
||||
<p>
|
||||
The reason most people never reach their goals is that they don't define them, or ever seriously consider them as believable or achievable. Winners can tell you where they are going, what they plan to do along the way, and who will be sharing the adventure with them.
|
||||
</p>
|
||||
</uib-tab>
|
||||
<uib-tab heading="Achieve">
|
||||
<p>
|
||||
Success is ... knowing your purpose in life, growing to reach your maximum potential, and sowing seeds that benefit others.
|
||||
</p>
|
||||
<p>Failure is the condiment that gives success its flavor.</p>
|
||||
</uib-tab>
|
||||
</uib-tabset>
|
||||
|
||||
<uib-tabset class="tabs-right">
|
||||
<uib-tab heading="Start">
|
||||
<p>
|
||||
Take up one idea. Make that one idea your life--think of it, dream of it, live on that idea. Let the brain, muscles, nerves, every part of your body, be full of that idea, and just leave every other idea alone. This is the way to success.
|
||||
</p>
|
||||
<p>
|
||||
People who succeed have momentum. The more they succeed, the more they want to succeed, and the more they find a way to succeed. Similarly, when someone is failing, the tendency is to get on a downward spiral that can even become a self-fulfilling prophecy.
|
||||
</p>
|
||||
</uib-tab>
|
||||
<uib-tab heading="Get it done" >
|
||||
<p>
|
||||
You can't connect the dots looking forward; you can only connect them looking backwards. So you have to trust that the dots will somehow connect in your future. You have to trust in something--your gut, destiny, life, karma, whatever. This approach has never let me down, and it has made all the difference in my life.
|
||||
</p>
|
||||
<p>
|
||||
The reason most people never reach their goals is that they don't define them, or ever seriously consider them as believable or achievable. Winners can tell you where they are going, what they plan to do along the way, and who will be sharing the adventure with them.
|
||||
</p>
|
||||
</uib-tab>
|
||||
<uib-tab heading="Achieve">
|
||||
<p>
|
||||
Success is ... knowing your purpose in life, growing to reach your maximum potential, and sowing seeds that benefit others.
|
||||
</p>
|
||||
<p>Failure is the condiment that gives success its flavor.</p>
|
||||
</uib-tab>
|
||||
</uib-tabset>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<div>
|
||||
<div class="row">
|
||||
<div class="col-md-6" ng-include="'app/pages/tabs/mainTabs.html'"></div>
|
||||
<div class="col-md-6 tabset-group" ng-include="'app/pages/tabs/sideTabs.html'"></div>
|
||||
</div>
|
||||
<div class="row accordions-row">
|
||||
<div class="col-md-6" ng-include="'app/pages/tabs/sampleAccordion.html'"></div>
|
||||
<div class="col-md-6" ng-include="'app/pages/tabs/sampleAccordion.html'"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
/**
|
||||
* @author v.lugovsky
|
||||
* created on 21.12.2015
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
angular.module('BlurAdmin.pages.tabs', [])
|
||||
.config(routeConfig);
|
||||
|
||||
/** @ngInject */
|
||||
function routeConfig($stateProvider) {
|
||||
$stateProvider
|
||||
.state('tabs', {
|
||||
url: '/tabs',
|
||||
templateUrl: 'app/pages/tabs/tabs.html'
|
||||
});
|
||||
}
|
||||
|
||||
})();
|
||||
|
|
@ -93,6 +93,10 @@
|
|||
title: 'Notifications',
|
||||
root: '#/notifications'
|
||||
},
|
||||
{
|
||||
title: 'Tabs and Accordions',
|
||||
root: '#/tabs'
|
||||
},
|
||||
{
|
||||
title: 'Tree View',
|
||||
root: '#/tree'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
.tabset-group {
|
||||
> div + div {
|
||||
margin-top: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
.accordions-row {
|
||||
margin-top: 30px;
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
.panel-group {
|
||||
> .panel {
|
||||
> .panel-heading {
|
||||
padding: 0;
|
||||
|
||||
> h4.panel-title {
|
||||
height: 50px;
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
|
||||
> a {
|
||||
display: block;
|
||||
padding: 15px 22px;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.panel-collapse {
|
||||
transition: height $default-animation-duration $default-animation-style;
|
||||
.panel-body {
|
||||
padding: 15px;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
/** Different tabs positions, which were removed from bootstrap */
|
||||
.tabs-below, .tabs-right, .tabs-left {
|
||||
.nav-tabs {
|
||||
border-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-content > .tab-pane,
|
||||
.pill-content > .pill-pane {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.tab-content > .active,
|
||||
.pill-content > .active {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.tabs-below {
|
||||
> .nav-tabs {
|
||||
border-top: 1px solid #ddd;
|
||||
|
||||
> li {
|
||||
margin-top: -1px;
|
||||
margin-bottom: 0;
|
||||
|
||||
> a {
|
||||
-webkit-border-radius: 0 0 4px 4px;
|
||||
-moz-border-radius: 0 0 4px 4px;
|
||||
border-radius: 0 0 4px 4px;
|
||||
|
||||
&:hover, &:focus {
|
||||
border-top-color: #ddd;
|
||||
border-bottom-color: transparent;
|
||||
}
|
||||
}
|
||||
}
|
||||
> .active a {
|
||||
&, &:hover, &:focus {
|
||||
border-color: transparent #ddd #ddd #ddd;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.tabs-left, .tabs-right {
|
||||
> .nav-tabs > li {
|
||||
float: none;
|
||||
|
||||
> a {
|
||||
min-width: 74px;
|
||||
margin-right: 0;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.tabs-left > .nav-tabs {
|
||||
float: left;
|
||||
margin-right: 19px;
|
||||
border-right: 1px solid #ddd;
|
||||
|
||||
> li > a {
|
||||
margin-right: -1px;
|
||||
-webkit-border-radius: 4px 0 0 4px;
|
||||
-moz-border-radius: 4px 0 0 4px;
|
||||
border-radius: 4px 0 0 4px;
|
||||
|
||||
&:hover, &:focus {
|
||||
border-color: #eee #ddd #eee #eee;
|
||||
}
|
||||
}
|
||||
|
||||
> .active a {
|
||||
&, &:hover, &:focus {
|
||||
border-color: #ddd transparent #ddd #ddd;
|
||||
*border-right-color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.tabs-right > .nav-tabs {
|
||||
float: right;
|
||||
margin-left: 19px;
|
||||
border-left: 1px solid #ddd;
|
||||
|
||||
> li > a {
|
||||
margin-left: -1px;
|
||||
-webkit-border-radius: 0 4px 4px 0;
|
||||
-moz-border-radius: 0 4px 4px 0;
|
||||
border-radius: 0 4px 4px 0;
|
||||
|
||||
&:hover, &:focus {
|
||||
border-color: #eee #eee #eee #ddd;
|
||||
}
|
||||
}
|
||||
|
||||
> .active a {
|
||||
&, &:hover, &:focus {
|
||||
border-color: #ddd #ddd #ddd transparent;
|
||||
*border-left-color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** /Different tabs positions, which were removed from bootstrap */
|
||||
|
||||
.nav-tabs {
|
||||
border-bottom: none;
|
||||
background-color: #ddd;
|
||||
border-top-left-radius: 4px;
|
||||
border-top-right-radius: 4px;
|
||||
}
|
||||
|
||||
.nav-tabs > li.with-dropdown {
|
||||
> a {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.dropdown-toggle {
|
||||
padding: 10px 15px;
|
||||
display: inline-block;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-content {
|
||||
padding: 15px;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
|
@ -58,6 +58,9 @@ $medium-panel-height: 400px;
|
|||
$extra-medium-panel-height: 550px;
|
||||
$large-panel-height: 974px;
|
||||
|
||||
$default-animation-duration: 0.2s;
|
||||
$default-animation-style: ease-out;
|
||||
|
||||
$assets-root: '../assets/';
|
||||
$images-root: $assets-root + 'img/';
|
||||
$fonts-root: $assets-root + 'fonts/';
|
||||
Loading…
Reference in New Issue