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

refactor(global): after Konstantin review

pull/3/head
alex 2016-02-19 20:25:27 +03:00
parent 8ebf35f001
commit b42807e46e
19 changed files with 115 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js
View File

@ -17,7 +17,7 @@
center: 'title', center: 'title',
right: 'month,agendaWeek,agendaDay' right: 'month,agendaWeek,agendaDay'
}, },
defaultDate: '2015-07-12', defaultDate: '2016-03-08',
selectable: true, selectable: true,
selectHelper: true, selectHelper: true,
select: function (start, end) { select: function (start, end) {
@ -38,55 +38,24 @@
events: [ events: [
{ {
title: 'All Day Event', title: 'All Day Event',
start: '2015-07-01' start: '2016-03-01',
color: layoutColors.success
}, },
{ {
title: 'Long Event', title: 'Long Event',
start: '2015-07-07', start: '2016-03-07',
end: '2015-07-10', end: '2016-03-10',
color: layoutColors.danger color: layoutColors.info
},
{
id: 999,
title: 'Repeating Event',
start: '2015-07-09T16:00:00'
},
{
id: 999,
title: 'Repeating Event',
start: '2015-07-16T16:00:00'
},
{
title: 'Conference',
start: '2015-07-11',
end: '2015-07-13',
color: layoutColors.successLight
},
{
title: 'Meeting',
start: '2015-07-12T10:30:00',
end: '2015-07-12T12:30:00',
color: layoutColors.danger
},
{
title: 'Meeting',
start: '2015-07-14T14:30:00',
color: layoutColors.successLight
}, },
{ {
title: 'Dinner', title: 'Dinner',
start: '2015-07-14T20:00:00', start: '2016-03-14T20:00:00',
color: layoutColors.success color: layoutColors.warning
}, },
{ {
title: 'Birthday Party', title: 'Birthday Party',
start: '2015-07-13T07:00:00', start: '2016-04-01T07:00:00',
color: layoutColors.success color: layoutColors.info
},
{
title: 'Click for Google',
url: 'http://google.com/',
start: '2015-07-28'
} }
] ]
}); });

105
src/app/pages/form/inputs/widgets/checkboxesRadios.html
View File

@ -1,65 +1,56 @@
<div class="row"> <div class="checkbox-demo-row">
<div class="col-md-6"> <div class="input-demo checkbox-demo row">
<div class="row checkbox-demo-row"> <div class="col-md-4">
<div class="col-xs-4"> <label class="checkbox-inline custom-checkbox nowrap">
<label class="checkbox-inline custom-checkbox nowrap"> <input type="checkbox" id="inlineCheckbox01" value="option1">
<input type="checkbox" id="inlineCheckbox01" value="option1"> <span>Check 1</span>
<span>Check 1</span> </label>
</label> </div>
</div> <div class="col-md-4">
<div class="col-xs-4"> <label class="checkbox-inline custom-checkbox nowrap">
<label class="checkbox-inline custom-checkbox nowrap"> <input type="checkbox" id="inlineCheckbox02" value="option2">
<input type="checkbox" id="inlineCheckbox02" value="option2"> <span>Check 2</span>
<span>Check 2</span> </label>
</label> </div>
</div> <div class="col-md-4">
<div class="col-xs-4"> <label class="checkbox-inline custom-checkbox nowrap">
<label class="checkbox-inline custom-checkbox nowrap"> <input type="checkbox" id="inlineCheckbox03" value="option3">
<input type="checkbox" id="inlineCheckbox03" value="option3"> <span>Check 3</span>
<span>Check 3</span> </label>
</label>
</div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="input-demo radio-demo row">
<div class="row checkbox-demo-row"> <div class="col-md-4">
<div class="col-xs-4"> <label class="radio-inline custom-radio nowrap">
<label class="radio-inline custom-radio nowrap"> <input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1">
<input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1"> <span>Option 1</span>
<span>Option 1</span> </label>
</label> </div>
</div> <div class="col-md-4">
<div class="col-xs-4"> <label class="radio-inline custom-radio nowrap">
<label class="radio-inline custom-radio nowrap"> <input type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2">
<input type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2"> <span>Option 2</span>
<span>Option 2</span> </label>
</label> </div>
</div> <div class="col-md-4">
<div class="col-xs-4"> <label class="radio-inline custom-radio nowrap">
<label class="radio-inline custom-radio nowrap"> <input type="radio" name="inlineRadioOptions" id="inlineRadio3" value="option3">
<input type="radio" name="inlineRadioOptions" id="inlineRadio3" value="option3"> <span>Option3</span>
<span>Option3</span> </label>
</label>
</div>
</div> </div>
</div> </div>
</div> </div>
<div>
<div class="row"> <div class="checkbox disabled">
<div class="col-sm-6"> <label class="custom-checkbox nowrap">
<div class="checkbox disabled"> <input type="checkbox" value="" disabled>
<label class="custom-checkbox nowrap"> <span>Checkbox is disabled</span>
<input type="checkbox" value="" disabled> </label>
<span>Checkbox is disabled</span>
</label>
</div>
</div> </div>
<div class="col-sm-6"> <div class="radio disabled">
<div class="radio disabled"> <label class="custom-radio nowrap">
<label class="custom-radio nowrap"> <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
<input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled> <span>Disabled option</span>
<span>Disabled option</span> </label>
</label>
</div>
</div> </div>
</div> </div>

3
src/app/pages/maps/map-lines/MapLinesPageCtrl.js
View File

@ -23,7 +23,6 @@
linkToObject: 'london', linkToObject: 'london',
images: [ { images: [ {
id: 'london', id: 'london',
color: layoutColors.warningBg,
svgPath: targetSVG, svgPath: targetSVG,
title: 'London', title: 'London',
latitude: 51.5002, latitude: 51.5002,
@ -95,7 +94,6 @@
{ {
id: 'vilnius', id: 'vilnius',
color: layoutColors.warningBg,
svgPath: targetSVG, svgPath: targetSVG,
title: 'Vilnius', title: 'Vilnius',
latitude: 54.6896, latitude: 54.6896,
@ -255,7 +253,6 @@
imagesSettings: { imagesSettings: {
color: layoutColors.warningBg, color: layoutColors.warningBg,
rollOverColor: layoutColors.warningBg,
selectedColor: layoutColors.warning selectedColor: layoutColors.warning
}, },

16
src/app/pages/profile/profile.html
View File

@ -2,7 +2,7 @@
<div class="panel-content"> <div class="panel-content">
<div class="progress-info">Your profile is 70% Complete</div> <div class="progress-info">Your profile is 70% Complete</div>
<div class="progress"> <div class="progress">
<div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" <div class="progress-bar progress-bar-primary progress-bar-striped active" role="progressbar"
aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: 70%"> aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: 70%">
</div> </div>
</div> </div>
@ -161,21 +161,21 @@
<label class="col-xs-8">When I receive a message</label> <label class="col-xs-8">When I receive a message</label>
<div class="col-xs-4"> <div class="col-xs-4">
<switch color="success" ng-model="switches[0]"></switch> <switch color="primary" ng-model="switches[0]"></switch>
</div> </div>
</div> </div>
<div class="form-group row clearfix"> <div class="form-group row clearfix">
<label class="col-xs-8">When Someone sends me an invitation</label> <label class="col-xs-8">When Someone sends me an invitation</label>
<div class="col-xs-4"> <div class="col-xs-4">
<switch color="success" ng-model="switches[1]"></switch> <switch color="primary" ng-model="switches[1]"></switch>
</div> </div>
</div> </div>
<div class="form-group row clearfix"> <div class="form-group row clearfix">
<label class="col-xs-8">When profile information changes</label> <label class="col-xs-8">When profile information changes</label>
<div class="col-xs-4"> <div class="col-xs-4">
<switch color="success" ng-model="switches[2]"></switch> <switch color="primary" ng-model="switches[2]"></switch>
</div> </div>
</div> </div>
</div> </div>
@ -184,14 +184,14 @@
<label class="col-xs-8">When anyone logs into your account from a new device or browser</label> <label class="col-xs-8">When anyone logs into your account from a new device or browser</label>
<div class="col-xs-4"> <div class="col-xs-4">
<switch color="success" ng-model="switches[3]"></switch> <switch color="primary" ng-model="switches[3]"></switch>
</div> </div>
</div> </div>
<div class="form-group row clearfix"> <div class="form-group row clearfix">
<label class="col-xs-8">Weekly Reports</label> <label class="col-xs-8">Weekly Reports</label>
<div class="col-xs-4"> <div class="col-xs-4">
<switch color="success" ng-model="switches[4]"></switch> <switch color="primary" ng-model="switches[4]"></switch>
</div> </div>
</div> </div>
@ -199,12 +199,12 @@
<label class="col-xs-8">Daily Reports</label> <label class="col-xs-8">Daily Reports</label>
<div class="col-xs-4"> <div class="col-xs-4">
<switch color="success" ng-model="switches[5]"></switch> <switch color="primary" ng-model="switches[5]"></switch>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<button type="button" class="btn btn-success btn-with-icon save-profile"> <button type="button" class="btn btn-primary btn-with-icon save-profile">
<i class="ion-android-checkmark-circle"></i>Update Profile <i class="ion-android-checkmark-circle"></i>Update Profile
</button> </button>
</div> </div>

2
src/app/pages/ui/notifications/notifications.html
View File

@ -115,7 +115,7 @@
<div class="control"> <div class="control">
<label for="timeOut">Time out</label> <label for="timeOut">Time out</label>
<input type="text" class="form-control" id="timeOut" ng-model="options.timeOut" placeholder="ms"> <input type="text" class="form-control" id="timeOut" ng-model="options.timeOut" placeholder="ms">
<label for="timeOut">If you set it to 0, it will stick</label> <label class="timeout-sub-label" for="timeOut">If you set it to 0, it will stick</label>
</div> </div>
<div class="control"> <div class="control">
<label for="extendedTimeOut">Extended time out</label> <label for="extendedTimeOut">Extended time out</label>

2
src/app/theme/components/pageTop/pageTop.html
View File

@ -9,7 +9,7 @@
<div class="user-profile clearfix"> <div class="user-profile clearfix">
<div class="al-user-profile" uib-dropdown> <div class="al-user-profile" uib-dropdown>
<a uib-dropdown-toggle> <a uib-dropdown-toggle class="profile-toggle-link">
<img ng-src="{{::( 'Nasta' | profilePicture )}}"> <img ng-src="{{::( 'Nasta' | profilePicture )}}">
</a> </a>
<ul class="top-dropdown-menu profile-dropdown" uib-dropdown-menu> <ul class="top-dropdown-menu profile-dropdown" uib-dropdown-menu>

BIN
src/assets/img/app/my-app-logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/assets/img/favicon-16x16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/assets/img/favicon-32x32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/assets/img/favicon-96x96.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 15 KiB

6
src/index.html
View File

@ -8,9 +8,9 @@
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic' rel='stylesheet' type='text/css'>
<link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href="assets/img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png"> <link rel="icon" type="image/png" sizes="96x96" href="assets/img/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="assets/img/favicon-16x16.png">
<!-- build:css({.tmp/serve,src}) styles/vendor.css --> <!-- build:css({.tmp/serve,src}) styles/vendor.css -->
<!-- bower:css --> <!-- bower:css -->

24
src/sass/app/_form.scss
View File

@ -216,7 +216,7 @@ label.custom-checkbox {
& + span { & + span {
color: $disabled; color: $disabled;
&:before { &:before {
border-color: $disabled-bg !important; border-color: $disabled !important;
} }
} }
} }
@ -238,7 +238,7 @@ label.custom-checkbox {
color: $default; color: $default;
content: "\a0"; content: "\a0";
background-color: transparent; background-color: transparent;
border: 1px solid #c8c8c8; border: 1px solid $default;
border-radius: 0; border-radius: 0;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
@ -323,6 +323,10 @@ label.custom-input-danger {
} }
} }
.input-demo{
line-height: 25px;
}
@mixin validationState($color, $focusColor) { @mixin validationState($color, $focusColor) {
.control-label { .control-label {
color: $color; color: $color;
@ -492,17 +496,18 @@ label.custom-input-danger {
background-color: transparent; background-color: transparent;
border: 1px solid $input-border; border: 1px solid $input-border;
box-shadow: none; box-shadow: none;
border-radius: 0;
color: #555555; color: #555555;
max-width: 100%; max-width: 100%;
font-size: 14px; font-size: 14px;
line-height: 26px;
width: 100%; width: 100%;
&.form-control { &.form-control {
display: block; display: block;
width: 100%; width: 100%;
} }
.tag { .tag {
border-radius: 0; border-radius: 3px;
font-weight: $font-normal;
font-size: 11px; font-size: 11px;
padding: 4px 8px; padding: 4px 8px;
& [data-role="remove"]:hover { & [data-role="remove"]:hover {
@ -510,20 +515,11 @@ label.custom-input-danger {
} }
} }
input { input {
line-height: 22px;
font-size: 11px; font-size: 11px;
} }
} }
@media (max-width: $resM) {
.form-inline {
.checkbox {
margin-left: 15px;
}
label.custom-checkbox > span, label.custom-radio > span {
display: inline-block;
}
}
}
.progress-bar-primary { .progress-bar-primary {
background-color: $primary; background-color: $primary;

4
src/sass/app/_notifications.scss
View File

@ -43,4 +43,8 @@
color: rgba(255, 255, 255, 0.9); color: rgba(255, 255, 255, 0.9);
background-color: rgba(0, 0, 0, 0.33); background-color: rgba(0, 0, 0, 0.33);
border: none; border: none;
}
.timeout-sub-label{
margin-top: 5px;
} }

8
src/sass/app/_profile.scss
View File

@ -39,8 +39,8 @@ h3.with-line {
padding: 15px 15px 25px; padding: 15px 15px 25px;
} }
.progress-bar-success { .progress-bar-primary {
background-color: $success-light; background-color: $primary-light;
} }
.form-group { .form-group {
@ -88,7 +88,7 @@ h3.with-line {
font-size: 32px; font-size: 32px;
background: #ffffff; background: #ffffff;
cursor: pointer; cursor: pointer;
color: $success; color: $primary;
top: -11px; top: -11px;
right: -11px; right: -11px;
height: 26px; height: 26px;
@ -127,7 +127,7 @@ h3.with-line {
margin: 23px 0 12px 12px; margin: 23px 0 12px 12px;
} }
$snColor: $success; $snColor: $primary;
$snPadding: 8px; $snPadding: 8px;
a.sn-link { a.sn-link {
transition: none; transition: none;

25
src/sass/theme/_buttons.scss
View File

@ -35,8 +35,10 @@ $hover: 24;
} }
.open > .dropdown-toggle { .open > .dropdown-toggle {
&.btn-primary { &.btn.btn-primary {
@include styleButton($primary, $primary - $hover); @include styleButton($primary, $primary - $hover);
background-color: $primary-bg;
border-color: $primary-bg;
} }
&.btn-default { &.btn-default {
@include styleButton(transparent, $default); @include styleButton(transparent, $default);
@ -59,13 +61,20 @@ $hover: 24;
outline: none !important; outline: none !important;
} }
.btn-primary { button.btn.btn-primary {
@include buttonColor($primary, $primary); @include buttonColor($primary, $primary);
&:active, &:target {
background-color: $primary-bg;
}
} }
.btn-default { button.btn.btn-default {
border-width: 1px; border-width: 1px;
@include buttonColor(transparent, $default); @include buttonColor(transparent, $default);
&:active, &:target, &:focus {
background-color: rgba(0, 0, 0, 0.2);
color: $default ;
}
} }
.btn-success { .btn-success {
@ -136,7 +145,7 @@ $hover: 24;
.progress-inner { .progress-inner {
background-color: darken($btnColor, 20); background-color: darken($btnColor, 20);
} }
&.progress-button-perspective { &.progress-button-perspective {
background: none; background: none;
.content { .content {
background-color: $btnColor; background-color: $btnColor;
@ -178,16 +187,16 @@ $hover: 24;
} }
} }
.btn-raised{ .btn-raised {
box-shadow: 0px 2px 5px 0px rgba(0,0,0,0.35); box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.35);
} }
.btn-mm{ .btn-mm {
padding: 5px 11px; padding: 5px 11px;
font-size: 13px; font-size: 13px;
} }
.btn-xm{ .btn-xm {
padding: 8px 14px; padding: 8px 14px;
font-size: 16px; font-size: 16px;
} }

4
src/sass/theme/components/_pageTop.scss
View File

@ -166,3 +166,7 @@ a.collapse-menu-link {
display: none; display: none;
} }
} }
.profile-toggle-link{
cursor: pointer;
}

2
src/sass/theme/dashboard/_calendar.scss
View File

@ -734,7 +734,7 @@ body.badmin-transparent{
.fc-head{ .fc-head{
color: $default; color: $default;
background-color: $success-light; background-color: $primary;
td, th{ td, th{
border:none; border:none;
} }

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

@ -81,6 +81,7 @@
margin-left: 60px; margin-left: 60px;
background: $primary; background: $primary;
padding: 1em; padding: 1em;
border-radius: 5px;
&:after { &:after {
content: ""; content: "";
display: table; display: table;
@ -137,15 +138,15 @@
} }
.cd-timeline-content-yellow { .cd-timeline-content-yellow {
@include cd-timeline-color($warning); @include cd-timeline-color(rgba(0,0,0,.2));
} }
.cd-timeline-content-red { .cd-timeline-content-red {
@include cd-timeline-color($danger); @include cd-timeline-color(rgba(0,0,0,.2));
} }
.cd-timeline-content-blue { .cd-timeline-content-blue {
@include cd-timeline-color($primary); @include cd-timeline-color(rgba(0,0,0,.2));
} }
.no-touch .cd-timeline-content .cd-read-more:hover { .no-touch .cd-timeline-content .cd-read-more:hover {

1
src/sass/theme/dashboard/_todo.scss
View File

@ -162,7 +162,6 @@ body.badmin-transparent {
&:hover{ &:hover{
.blur-container{ .blur-container{
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12); box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
} }
.blur-box { .blur-box {
height: 100%; height: 100%;