refactor(todo): apply new design on blur skun

pull/3/head
alex 2016-02-05 17:12:35 +03:00
parent a1848e3a07
commit 7333ec856b
8 changed files with 136 additions and 20 deletions

View File

@ -43,7 +43,7 @@
<div class="col-xlg-3 col-lg-6 col-md-6 col-xs-12" <div class="col-xlg-3 col-lg-6 col-md-6 col-xs-12"
ba-panel ba-panel
ba-panel-title="To Do List" ba-panel-title="To Do List"
ba-panel-class="xmedium-panel feed-comply-panel with-scroll"> ba-panel-class="xmedium-panel feed-comply-panel with-scroll todo-panel">
<dashboard-todo></dashboard-todo> <dashboard-todo></dashboard-todo>
</div> </div>
<div class="col-xlg-6 col-lg-6 col-md-6 col-xs-12" <div class="col-xlg-6 col-lg-6 col-md-6 col-xs-12"

View File

@ -105,8 +105,8 @@
$scope.newTodoText = ''; $scope.newTodoText = '';
$scope.addToDoItem = function (event) { $scope.addToDoItem = function (event, clickPlus) {
if (event.which === 13) { if (clickPlus || event.which === 13) {
$scope.todoList.unshift({ $scope.todoList.unshift({
text: $scope.newTodoText, text: $scope.newTodoText,
edit: false, edit: false,

View File

@ -1,8 +1,11 @@
<input type="text" value="" class="form-control task-todo" placeholder="Task to do" ng-keyup="addToDoItem($event)" ng-model="newTodoText"/> <input type="text" value="" class="form-control task-todo" placeholder="Task to do.." ng-keyup="addToDoItem($event)" ng-model="newTodoText"/>
<i ng-click="addToDoItem('',true)" class="add-item-icon ion-plus-round"></i>
<div class="box-shadow-border"></div>
<ul class="todo-list" ui-sortable ng-model="todoList"> <ul class="todo-list" ui-sortable ng-model="todoList">
<li ng-repeat="item in todoList" ng-if="!item.deleted" ng-init="activeItem=false" <li ng-repeat="item in todoList" ng-if="!item.deleted" ng-init="activeItem=false"
ng-class="{checked: isChecked, active: activeItem}" class="{{ getMarkColor(item.markId) }}" ng-class="{checked: isChecked, active: activeItem}" class="{{ getMarkColor(item.markId) }}"
ng-mouseenter="activeItem=true" ng-mouseleave="activeItem=false"> ng-mouseenter="activeItem=true" ng-mouseleave="activeItem=false">
<div class="blur-container"><div class="blur-box"></div></div>
<i class="mark"></i> <i class="mark"></i>
<label class="todo-checkbox custom-checkbox custom-input-success"> <label class="todo-checkbox custom-checkbox custom-input-success">
<input type="checkbox" ng-model="isChecked"> <input type="checkbox" ng-model="isChecked">

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 B

View File

@ -38,4 +38,16 @@
padding: 0; padding: 0;
} }
} }
}
body.badmin-transparent{
.popular-app-img {
border-top-right-radius: 5px;
border-top-left-radius: 5px;
}
.popular-app-cost{
border-bottom: 1px solid rgba(0,0,0,0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
}
} }

View File

@ -6,7 +6,6 @@ ul.todo-list {
margin: 0; margin: 0;
padding: 0; padding: 0;
.placeholder, .ui-sortable-placeholder { .placeholder, .ui-sortable-placeholder {
background: #fff;
} }
li { li {
margin: 0 0 -1px 0; margin: 0 0 -1px 0;
@ -85,7 +84,7 @@ ul.todo-list {
i.mark { i.mark {
min-width: 40px; min-width: 40px;
} }
label.todo-checkbox>span { label.todo-checkbox > span {
&:before { &:before {
color: white; color: white;
content: '\f10c'; content: '\f10c';
@ -95,7 +94,7 @@ ul.todo-list {
float: none; float: none;
} }
} }
label.todo-checkbox>input:checked+span:before { label.todo-checkbox > input:checked + span:before {
content: '\f00c'; content: '\f00c';
} }
} }
@ -107,7 +106,7 @@ label.todo-checkbox {
padding-right: 25px; padding-right: 25px;
min-height: 16px; min-height: 16px;
cursor: pointer; cursor: pointer;
>span { > span {
white-space: nowrap; white-space: nowrap;
height: 16px; height: 16px;
&:before { &:before {
@ -116,4 +115,112 @@ label.todo-checkbox {
transition: all 0.15s ease-out; transition: all 0.15s ease-out;
} }
} }
}
.add-item-icon {
display: none;
}
body.badmin-transparent {
.todo-panel.panel {
color: white;
opacity: 0.9;
}
input.task-todo {
color: white;
width: calc(100% - 25px);
opacity: 0.9;
border: none;
&:focus {
outline: none;
background-color: transparent;
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
}
&::-webkit-input-placeholder {
color: white;
opacity: 0.6;
}
}
.add-item-icon {
display: block;
float: right;
margin-top: -45px;
margin-right: 5px;
font-size: 25px;
cursor: pointer;
}
ul.todo-list {
li {
margin: 0;
border: none;
font-weight: $font-light;
.blur-container{
height: 40px;
position: absolute;
width: calc(100% + 40px);;
top: 0;
left: -25px;
overflow-y: hidden;
}
&:hover{
.blur-container{
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
}
.blur-box {
height: 100%;
background: linear-gradient(to right, rgba(0,0,0,0.3) 0%,rgba(255,255,255,0) 100%);
-webkit-filter: blur(3px);
}
}
&.primary, &.danger,&.success, &.info, &.warning {
i.mark {
background-color: transparent;
}
}
i.remove-todo {
color: white;
opacity: 0.4;
&:hover {
color: white;
opacity: 0.95;
}
}
i.mark {
min-width: 40px;
background-color: transparent;
}
label.todo-checkbox > span {
&:before {
color: white;
content: '\f10c';
float: none;
margin-right: 6px;
transition: none;
}
}
&.checked {
label.todo-checkbox > span {
&:before {
margin-right: 0;
position: absolute;
content: '';
background-size: contain;
background: url("../../../assets/img/app/todo/check-icon.png") no-repeat;
}
}
}
}
}
.box-shadow-border{
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
width: calc(100% + 44px);
margin-left: -22px;
}
} }

View File

@ -207,4 +207,10 @@
.chart-bg{ .chart-bg{
left: calc(50% - 90px); left: calc(50% - 90px);
} }
}
body.badmin-transparent{
.traffic-chart canvas{
border: 10px solid rgba(0,0,0,0.35);
border-radius: 150px;
}
} }

View File

@ -4,10 +4,6 @@ body.badmin-transparent {
.default-color{ .default-color{
color: $default-text; color: $default-text;
} }
.traffic-chart canvas{
border: 10px solid rgba(0,0,0,0.35);
border-radius: 150px;
}
.panel.panel-blur{ .panel.panel-blur{
border-radius: 5px; border-radius: 5px;
.panel-heading{ .panel-heading{
@ -15,12 +11,4 @@ body.badmin-transparent {
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12); box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
} }
} }
.popular-app-img {
border-top-right-radius: 5px;
border-top-left-radius: 5px;
}
.popular-app-cost{
border-bottom: 1px solid rgba(0,0,0,0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
}
} }