jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(smartTables): fix buttons align

pull/3/head
alex 2016-02-12 16:35:13 +03:00
parent ae5c5211ee
commit eb1d079ffa
5 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/pages/components/timeline/timeline.html
View File

@ -3,10 +3,10 @@
<section id="cd-timeline" class="cd-container cssanimations" ng-controller="TimelineCtrl"> <section id="cd-timeline" class="cd-container cssanimations" ng-controller="TimelineCtrl">
<div class="cd-timeline-block"> <div class="cd-timeline-block">
<div class="cd-timeline-img"> <div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg success"><img ng-src="{{::( 'Euro-Coin' | kameleonImg )}}"></div> <div class="kameleon-icon with-round-bg warning"><img ng-src="{{::( 'Euro-Coin' | kameleonImg )}}"></div>
</div> </div>
<div class="cd-timeline-content cd-timeline-content-green"> <div class="cd-timeline-content cd-timeline-content-yellow">
<h5>Title of section 1</h5> <h5>Title of section 1</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi
@ -45,10 +45,10 @@
<div class="cd-timeline-block"> <div class="cd-timeline-block">
<div class="cd-timeline-img"> <div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg success"><img ng-src="{{::( 'Boss-3' | kameleonImg )}}"></div> <div class="kameleon-icon with-round-bg warning"><img ng-src="{{::( 'Boss-3' | kameleonImg )}}"></div>
</div> </div>
<div class="cd-timeline-content cd-timeline-content-green"> <div class="cd-timeline-content cd-timeline-content-yellow">
<h5>Title of section 4</h5> <h5>Title of section 4</h5>
<p>Morbi fringilla in massa ac posuere. Fusce non sagittis massa, id accumsan odio. Nullam eget tempor est. <p>Morbi fringilla in massa ac posuere. Fusce non sagittis massa, id accumsan odio. Nullam eget tempor est.
@ -86,10 +86,10 @@
</div> </div>
<div class="cd-timeline-block"> <div class="cd-timeline-block">
<div class="cd-timeline-img"> <div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg success"><img ng-src="{{::( 'Vector' | kameleonImg )}}"></div> <div class="kameleon-icon with-round-bg warning"><img ng-src="{{::( 'Vector' | kameleonImg )}}"></div>
</div> </div>
<div class="cd-timeline-content cd-timeline-content-green"> <div class="cd-timeline-content cd-timeline-content-yellow">
<h5>Title of section 7</h5> <h5>Title of section 7</h5>
<p>Vivamus ut laoreet erat, vitae eleifend eros. Sed varius id tellus non lobortis. Sed dolor ante, cursus non <p>Vivamus ut laoreet erat, vitae eleifend eros. Sed varius id tellus non lobortis. Sed dolor ante, cursus non

4
src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js
View File

@ -71,7 +71,7 @@
id: 'g0', id: 'g0',
bullet: 'none', bullet: 'none',
useLineColorForBulletBorder: true, useLineColorForBulletBorder: true,
lineColor: layoutColors.default, lineColor: 'rgba(0,0,0,0.3)',
lineThickness: 1, lineThickness: 1,
negativeLineColor: layoutColors.danger, negativeLineColor: layoutColors.danger,
type: 'smoothedLine', type: 'smoothedLine',
@ -83,7 +83,7 @@
id: 'g1', id: 'g1',
bullet: 'none', bullet: 'none',
useLineColorForBulletBorder: true, useLineColorForBulletBorder: true,
lineColor: layoutColors.primary, lineColor: 'rgba(0,0,0,0.6)',
lineThickness: 1, lineThickness: 1,
negativeLineColor: layoutColors.danger, negativeLineColor: layoutColors.danger,
type: 'smoothedLine', type: 'smoothedLine',

2
src/app/theme/components/sidebar/SidebarCtrl.js
View File

@ -80,7 +80,7 @@
var submenu = $($event.currentTarget).next(); var submenu = $($event.currentTarget).next();
if ($scope.$isMenuCollapsed) { if ($scope.$isMenuCollapsed) {
$scope.menuExpand(); $scope.menuExpand();
if (!item.selected) { if (!item.expanded) {
$timeout(function () { $timeout(function () {
item.expanded = !item.expanded; item.expanded = !item.expanded;
changeSelectElemTopValue(); changeSelectElemTopValue();

26
src/sass/theme/_table.scss
View File

@ -178,6 +178,27 @@ input.search-input {
width: 60px; width: 60px;
} }
.table{
.editable-wrap .editable-controls, .editable-wrap .editable-error{
vertical-align: sub;
.btn{
&.dropdown-toggle{
padding: 3px 20px;
margin-top: 3px;
}
padding: 3px 8px;
}
input{
line-height: 1px;
height: 30px;
}
}
}
.form-inline button[type="submit"].editable-table-button{
margin-left: 0;
}
body.badmin-transparent { body.badmin-transparent {
.table { .table {
& > thead { & > thead {
@ -224,4 +245,9 @@ body.badmin-transparent {
.table > tbody > tr.info > td{ .table > tbody > tr.info > td{
background-color: $info; background-color: $info;
} }
.editable-click, a.editable-click {
color: $default;
border-bottom: dashed 1px $default;
}
} }

12
src/sass/theme/dashboard/_timeline.scss
View File

@ -135,8 +135,8 @@
} }
} }
.cd-timeline-content-green { .cd-timeline-content-yellow {
@include cd-timeline-color($success); @include cd-timeline-color($warning);
} }
.cd-timeline-content-red { .cd-timeline-content-red {
@ -197,8 +197,8 @@
} }
} }
.cd-timeline-content-green { .cd-timeline-content-yellow {
@include cd-timeline-left-color($success-bg); @include cd-timeline-left-color($warning-bg);
} }
.cd-timeline-content-red { .cd-timeline-content-red {
@ -228,8 +228,8 @@
border-right-color: $color; border-right-color: $color;
} }
} }
&.cd-timeline-content-green { &.cd-timeline-content-yellow {
@include cd-timeline-right-color($success-bg); @include cd-timeline-right-color($warning-bg);
} }
&.cd-timeline-content-red { &.cd-timeline-content-red {
@include cd-timeline-right-color($danger-bg); @include cd-timeline-right-color($danger-bg);