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

refactor(mail): move compose and message service from theme to mail module

pull/3/head
alex 2016-01-11 12:46:17 +03:00
parent 6a199dd8ec
commit 43e0abf92e
6 changed files with 85 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/app/theme/components/composeBox/compose.html → src/app/pages/mail/composeBox/compose.html
View File

2
src/app/theme/components/composeBox/composeBoxCtrl.js → src/app/pages/mail/composeBox/composeBoxCtrl.js
View File

@ -5,7 +5,7 @@
(function () {
'use strict';
angular.module('BlurAdmin.theme.components')
angular.module('BlurAdmin.pages.mail')
.controller('composeBoxCtrl', composeBoxCtrl);
/** @ngInject */

4
src/app/theme/services/composeModal.js → src/app/pages/mail/composeBox/composeModal.js
View File

@ -5,7 +5,7 @@
(function () {
'use strict';
angular.module('BlurAdmin.theme')
angular.module('BlurAdmin.pages.mail')
.service('composeModal', composeModal);
/** @ngInject */
@ -14,7 +14,7 @@
open : function(options){
return $uibModal.open({
animation: false,
templateUrl: 'app/theme/components/composeBox/compose.html',
templateUrl: 'app/pages/mail/composeBox/compose.html',
controller: 'composeBoxCtrl',
size: 'slim',
resolve: {

0
src/app/theme/services/mailMessages.js → src/app/pages/mail/mailMessages.js
View File

122
src/sass/app/_email.scss
View File

@ -155,12 +155,6 @@
margin-left: 5px;
}
.border-tag{
}
.mail-tag.tag.label{
display: inline-block;
font-size: 14px;
@ -182,40 +176,6 @@
overflow-x: hidden;
}
.control-container {
background-color: #ebebeb;
padding-left: 15px;
margin-bottom: 30px;
.icon-buttons {
margin-left: -10px;
}
.btn-icon {
background-color: $dribble-color;
color: white;
height: 35px;
width: 35px;
font-size: 16px;
margin-left: -3px;
}
.btn.btn-icon.dropdown-toggle {
width: 50px;
&.margin-left {
margin-left: 10px;
}
}
.dropdown-menu {
margin-left: 10px;
}
.more-button {
font-size: 12px;
font-weight: 100;
}
}
.little-human {
cursor: pointer;
transition: border-left 1.5s ease;
@ -618,4 +578,86 @@
.compose-header {
padding: 8px 3px 8px 10px;
color: white;
font-weight: 100;
font-size: 13px;
background-color: $github-color;
}
.header-controls {
display: inline-block;
float: right;
i {
margin-right: 5px;
font-size: 14px;
cursor: pointer;
&:hover {
color: $primary-light;
}
}
}
.compose-input {
border-left: 0;
border-right: 0;
border-top: 0;
}
.compose-footer {
padding: 2px 4px;
background-color: whitesmoke;
.btn-send {
background-color: $primary-light;
color: white;
padding: 2px 10px;
margin: 3px;
font-weight: 100;
}
.btn-default{
background-color: transparent;
border: none;
}
}
.footer-controls {
float: right;
margin: 6px;
}
.compose-footer-icon {
font-size: 18px;
margin-right: 5px;
cursor: pointer;
&:hover {
color: $primary-light;
}
}
.compose-container {
background-color: whitesmoke;
.ta-text.ta-editor {
background-color: white;
}
}
.footer-control-first {
border-right: 2px solid $help-text;
display: inline-block;
padding-right: 9px;
}
.modal .modal-dialog.modal-slim {
width: 398px;
position: fixed;
bottom: 0;
right: 0;
max-height: 474px;
}

79
src/sass/app/_mail.scss
View File

@ -1,79 +0,0 @@
.compose-header {
padding: 8px 3px 8px 10px;
color: white;
font-weight: 100;
font-size: 13px;
background-color: $github-color;
}
.header-controls {
display: inline-block;
float: right;
i {
margin-right: 5px;
font-size: 14px;
cursor: pointer;
&:hover {
color: $primary-light;
}
}
}
.compose-input {
border-left: 0;
border-right: 0;
border-top: 0;
}
.compose-footer {
padding: 2px 4px;
background-color: whitesmoke;
.btn-send {
background-color: $primary-light;
color: white;
padding: 2px 10px;
margin: 3px;
font-weight: 100;
}
.btn-default{
background-color: transparent;
border: none;
}
}
.footer-controls {
float: right;
margin: 6px;
}
.compose-footer-icon {
font-size: 18px;
margin-right: 5px;
cursor: pointer;
&:hover {
color: $primary-light;
}
}
.compose-container {
background-color: whitesmoke;
.ta-text.ta-editor {
background-color: white;
}
}
.footer-control-first {
border-right: 2px solid $help-text;
display: inline-block;
padding-right: 9px;
}
.modal .modal-dialog.modal-slim {
width: 398px;
float: right;
margin-top: 10%;
}