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

refactor(mail): fix inputs issues

pull/3/head
alex 2016-01-20 19:40:46 +03:00
parent c231ae22a4
commit 59adfd15a3
3 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/pages/components/mail/list/mailList.html
View File

@ -1,16 +1,15 @@
<div class="side-message-navigation"> <div class="side-message-navigation">
<div class="messages-control side-message-navigation-item"> <div class="mail-messages-control side-message-navigation-item">
<label class="checkbox-inline custom-checkbox nowrap margin-left"> <label class="checkbox-inline custom-checkbox nowrap margin-left">
<span class="select-all-label">Select All</span>
<input type="checkbox" id="inlineCheckbox01" value="option1"> <input type="checkbox" id="inlineCheckbox01" value="option1">
<span class="select-all-label">Select All</span>
</label> </label>
<button type="button" class="btn btn-icon margin-left"><i class="ion-refresh"></i></button> <button type="button" class="btn btn-icon margin-left"><i class="ion-refresh"></i></button>
<div class="btn-group margin-left"> <div class="btn-group margin-left" uib-dropdown>
<button type="button" class="btn btn-icon dropdown-toggle more-button" data-toggle="dropdown" <button type="button" class="btn more-button" uib-dropdown-toggle>
aria-haspopup="true" More <span class="caret"></span>
aria-expanded="false">More<span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul uib-dropdown-menu>
<li><a href>Action</a></li> <li><a href>Action</a></li>
<li><a href>Another action</a></li> <li><a href>Another action</a></li>
<li><a href>Something else here</a></li> <li><a href>Something else here</a></li>
@ -22,29 +21,28 @@
<div class="messages"> <div class="messages">
<table> <table>
<tr ng-repeat="m in listCtrl.messages track by m.id | orderBy:'-date'" <tr ng-repeat="m in listCtrl.messages track by m.id | orderBy:'-date'"
class="side-message-navigation-item little-human shineHover {{m.tag}}" class="side-message-navigation-item little-human shineHover {{m.tag}}">
ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
<td> <td>
<div class="mail-checkbox"> <div class="mail-checkbox">
<label class="checkbox-inline custom-checkbox nowrap margin-left"> <label class="checkbox-inline custom-checkbox nowrap margin-left">
<span></span>
<input type="checkbox"> <input type="checkbox">
<span></span>
</label> </label>
</div> </div>
</td> </td>
<td><img ng-src="{{m.name.split(' ')[0] | profilePicture}}" class="little-human-picture"></td> <td ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})"><img ng-src="{{m.name.split(' ')[0] | profilePicture}}" class="little-human-picture"></td>
<td > <td ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
<div class="margin-left"> <div class="margin-left">
<div><span class="name">{{m.name.split(' ')[0] + ' ' + m.name.split(' ')[1][0]}}.</span></div> <div><span class="name">{{m.name.split(' ')[0] + ' ' + m.name.split(' ')[1][0]}}.</span></div>
<div><span class="tag label label-primary {{m.tag}}">{{m.tag}}</span></div> <div><span class="tag label label-primary {{m.tag}}">{{m.tag}}</span></div>
</div> </div>
</td> </td>
<td > <td ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
<div class="margin-left additional-info"> <div class="margin-left additional-info">
<span class="subject"> {{m.subject}}</span> <span class="subject"> {{m.subject}}</span>
</div> </div>
</td> </td>
<td> <td ui-sref="components.mail.detail({id: m.id, label: listCtrl.label})">
<div class="mail-body-part">{{m.body | plainText}}</div> <div class="mail-body-part">{{m.body | plainText}}</div>
</td> </td>
<td class="date"> <td class="date">

24
src/app/pages/ui/buttons/widgets/dropdowns.html
View File

@ -1,7 +1,7 @@
<div class="row btns-row"> <div class="row btns-row">
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-primary " uib-dropdown-toggle>
Primary <span class="caret"></span> Primary <span class="caret"></span>
</button> </button>
<ul uib-dropdown-menu> <ul uib-dropdown-menu>
@ -15,7 +15,7 @@
</div> </div>
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-success dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-success " uib-dropdown-toggle>
Success <span class="caret"></span> Success <span class="caret"></span>
</button> </button>
<ul uib-dropdown-menu> <ul uib-dropdown-menu>
@ -29,7 +29,7 @@
</div> </div>
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-info dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-info " uib-dropdown-toggle>
Info <span class="caret"></span> Info <span class="caret"></span>
</button> </button>
<ul uib-dropdown-menu> <ul uib-dropdown-menu>
@ -43,7 +43,7 @@
</div> </div>
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-default " uib-dropdown-toggle>
Default <span class="caret"></span> Default <span class="caret"></span>
</button> </button>
<ul uib-dropdown-menu> <ul uib-dropdown-menu>
@ -57,7 +57,7 @@
</div> </div>
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-warning dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-warning " uib-dropdown-toggle>
Warning <span class="caret"></span> Warning <span class="caret"></span>
</button> </button>
<ul uib-dropdown-menu> <ul uib-dropdown-menu>
@ -71,7 +71,7 @@
</div> </div>
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-danger dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-danger " uib-dropdown-toggle>
Danger <span class="caret"></span> Danger <span class="caret"></span>
</button> </button>
<ul uib-dropdown-menu> <ul uib-dropdown-menu>
@ -91,7 +91,7 @@
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-primary">Primary</button> <button type="button" class="btn btn-primary">Primary</button>
<button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-primary " uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>
@ -107,7 +107,7 @@
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-success">Success</button> <button type="button" class="btn btn-success">Success</button>
<button type="button" class="btn btn-success dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-success " uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>
@ -123,7 +123,7 @@
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-info">Info</button> <button type="button" class="btn btn-info">Info</button>
<button type="button" class="btn btn-info dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-info " uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>
@ -139,7 +139,7 @@
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-default">Default</button> <button type="button" class="btn btn-default">Default</button>
<button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-default " uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>
@ -155,7 +155,7 @@
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-warning">Warning</button> <button type="button" class="btn btn-warning">Warning</button>
<button type="button" class="btn btn-warning dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-warning " uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>
@ -171,7 +171,7 @@
<div class="col-sm-4 col-xs-6"> <div class="col-sm-4 col-xs-6">
<div class="btn-group" uib-dropdown dropdown-append-to-body> <div class="btn-group" uib-dropdown dropdown-append-to-body>
<button type="button" class="btn btn-danger">Danger</button> <button type="button" class="btn btn-danger">Danger</button>
<button type="button" class="btn btn-danger dropdown-toggle" uib-dropdown-toggle> <button type="button" class="btn btn-danger " uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>

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

@ -88,11 +88,11 @@
margin-left: 10px; margin-left: 10px;
} }
.messages-control { .mail-messages-control {
padding: 10px; padding: 10px;
.dropdown-menu { ul.dropdown-menu {
margin-left: 10px; margin-top: 5px;
} }
.btn { .btn {
@ -102,9 +102,8 @@
.more-button { .more-button {
width: 60px; width: 60px;
font-size: 14px;
font-size: 12px; padding: 6px 5px;
font-weight: 100;
} }
span.select-all-label { span.select-all-label {