Skip to content

Commit cdc3333

Browse files
tomlandiatomlandia
committed
Update to version: 1.4.55
1 parent f5c105e commit cdc3333

12 files changed

+2530
-1032
lines changed

‎bookingbug-angular-admin-dashboard-templates.js‎

100644100755
Lines changed: 33 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bookingbug-angular-admin-dashboard.js‎

100644100755
Lines changed: 2324 additions & 926 deletions
Large diffs are not rendered by default.

‎bookingbug-angular-admin-dashboard.min.js‎

100644100755
Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bower.json‎

100644100755
Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
22
"name": "bookingbug-angular-admin-dashboard",
3-
"version": "1.4.54",
3+
"version": "1.4.55",
44
"homepage": "https://github.com/BookingBug/bookingbug-angular-admin-dashboard-bower",
55
"authors": [
66
"Glenn Shoosmith <glenn@bookingbug.com>",
7-
"Ed Clements <ed@bookingbug.com>"
7+
"Ed Clements <ed@bookingbug.com>",
8+
"Lefteris Kokkonas <ekokkonas@bookingbug.com>"
89
],
910
"main": [
1011
"bookingbug-angular-admin-dashboard.js",
1112
"bookingbug-angular-admin-dashboard-templates.js",
12-
"bookingbug-angular-admin-dashboard.css"
13+
"bookingbug-angular-admin-dashboard.css",
14+
"src/stylesheets/*"
1315
],
1416
"license": "MIT",
1517
"ignore": [
@@ -20,33 +22,23 @@
2022
"tests"
2123
],
2224
"dependencies": {
23-
"bookingbug-angular-core": "1.4.54",
24-
"bookingbug-angular-admin": "1.4.54",
25+
"bookingbug-angular-core": "1.4.55",
26+
"bookingbug-angular-admin": "1.4.55",
27+
"bookingbug-angular-member": "master",
2528
"bookingbug-angular-admin-booking": "master",
2629
"bookingbug-angular-services": "master",
27-
"fullcalendar": "2.7.2",
28-
"fullcalendar-scheduler": "1.3.1",
30+
"bookingbug-angular-events": "master",
31+
"AdminLTE-angular-sass": "~0.0.1",
32+
"fullcalendar-scheduler": "~1.3.3",
2933
"jqueryui-touch-punch": "*",
3034
"pusher": "~2.2.4",
3135
"angular-ui-calendar": "~1.0.1",
32-
"adminlte-bower": "~2.2.1",
33-
"angular-touch": "~1.5.0",
34-
"angular-xeditable": "~0.1.10",
35-
"angular-input-date": "~1.0.4",
36-
"bootstrap-sass-official": "~3.3.6",
37-
"angular-ui-router": "~0.2.18",
38-
"jquery-slimscroll": "1.3.6",
39-
"ui-router-extras": "^0.1.0",
36+
"ui-router-extras": "^0.1.2",
4037
"angular-bootstrap-toggle-switch": "^0.5.6",
41-
"ui-select": "angular-ui-select#^0.16.1"
42-
},
43-
"resolutions": {
44-
"angular": "1.2.28",
45-
"moment": "~2.13.0",
46-
"jquery": "~1.11.2",
47-
"fullcalendar": "2.7.2",
48-
"bookingbug-angular-core": "master",
49-
"components-font-awesome": "~4.5",
50-
"bookingbug-angular-admin": "master"
38+
"ui-select": "angular-ui-select#^0.16.1",
39+
"ngScrollable": "ng-scrollable#^0.2.5",
40+
"angular-bootstrap-checkbox": "^0.4.0",
41+
"angular-toastr": "^1.7.0",
42+
"angular-loading-bar": "^0.9.0"
5143
}
5244
}

‎src/stylesheets/_animations.scss‎

100644100755
File mode changed.

‎src/stylesheets/_default-theme.scss‎

100644100755
Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
11
//Default bookingbug admin theme
2-
//SIDEBAR SKINS
3-
//--------------------------------------------------------
4-
5-
//Dark sidebar
6-
$sidebar-dark-bg : #222d32;
7-
$sidebar-dark-hover-bg : darken($sidebar-dark-bg, 2%);
8-
$sidebar-dark-color : lighten($sidebar-dark-bg, 60%);
9-
$sidebar-dark-hover-color : #fff;
10-
$sidebar-dark-submenu-bg : lighten($sidebar-dark-bg, 5%);
11-
$sidebar-dark-submenu-color : lighten($sidebar-dark-submenu-bg, 40%);
12-
$sidebar-dark-submenu-hover-color : #fff;
13-
14-
//Light sidebar
15-
$sidebar-light-bg : #f8f8f8;
16-
$sidebar-light-hover-bg : lighten(#f0f0f1, 1.5%);
17-
$sidebar-light-color : #444;
18-
$sidebar-light-hover-color : #000;
19-
$sidebar-light-submenu-bg : $sidebar-light-hover-bg;
20-
$sidebar-light-submenu-color : #777;
21-
$sidebar-light-submenu-hover-color : #000;
22-
23-
$transition-speed : 0.3s;
24-
$transition-fn : ease-in-out;
25-
26-
272
$theme-color : #81bc00;
283
$screen-header-collapse : $screen-xs-max;
294

@@ -34,6 +9,11 @@ $screen-header-collapse : $screen-xs-max;
349
z-index: -1;
3510
}
3611

12+
.ui-select-bootstrap .ui-select-choices-row.active>a {
13+
color: $btn-primary-color;
14+
background-color: $brand-primary;
15+
}
16+
3717
//Navbar
3818
.main-header {
3919
.navbar {
@@ -94,10 +74,37 @@ $screen-header-collapse : $screen-xs-max;
9474

9575
//Create the sidebar skin
9676
@include skin-light-sidebar($theme-color);
97-
}
9877

78+
// Calendar
79+
.fc {
80+
.fc-button-group {
81+
.fc-button.fc-state-active {
82+
background-color: $brand-primary;
83+
color: $btn-primary-color;
84+
box-shadow: none;
85+
text-shadow: none;
86+
border-color: $brand-primary;
87+
}
88+
}
89+
90+
.fc-bgevent {
91+
background: $brand-primary;
92+
opacity: 0.1;
93+
}
9994

95+
.fc-event {
96+
border: none;
97+
padding: 7px 0;
98+
&.status_blocked {
99+
background-color: $gray;
100+
}
100101

102+
.fc-bg {
103+
background: none;
104+
}
105+
}
106+
}
107+
}
101108

102109

103110
//Buttons
@@ -130,5 +137,4 @@ $screen-header-collapse : $screen-xs-max;
130137
}
131138
}
132139
}
133-
}
134-
140+
}

‎src/stylesheets/_general.scss‎

100644100755
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,39 @@
159159
width:80px;
160160
}
161161
}
162+
}
163+
164+
.tab-content {
165+
section.content {
166+
padding: 0;
167+
min-height: auto;
168+
}
169+
}
170+
171+
.schema-form-tabs {
172+
.tab-content {
173+
padding-top:20px;
174+
}
175+
}
176+
177+
.panel {
178+
h4.panel-title {
179+
margin-top: 0;
180+
margin-bottom: 0;
181+
font-size: ceil(($font-size-base * 1.125));
182+
}
183+
}
184+
185+
.modal-header {
186+
h1,h2,h3,h4,h5, .modal-title {
187+
margin-bottom: 0;
188+
display: inline-block;
189+
}
190+
}
191+
192+
.modal-body {
193+
.container-fluid {
194+
padding-left: 0;
195+
padding-right: 0;
196+
}
162197
}

‎src/stylesheets/_login.scss‎

100644100755
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
font-weight: bold;
2323
}
2424

25+
.panel-heading {
26+
.panel-title {
27+
margin-bottom: 0 !important;
28+
}
29+
}
30+
2531
.panel-body {
2632
padding-bottom: 0 ;
2733
}

‎src/stylesheets/_ng-scrollable.scss‎

100644100755
File mode changed.

‎src/stylesheets/_resource-calendar.scss‎

100644100755
Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
.resource-calendar {
1212
.fc-toolbar {
1313
p.datepicker {
14-
padding-top: 0;
14+
padding-top: 0;
1515

1616
input.form-control {
1717
height: 29px;
@@ -58,25 +58,51 @@
5858
.fc-time-grid-event,
5959
.fc-timeline-event {
6060
.pre, .post {
61-
background-color: $gray-light;
61+
position: relative;
62+
opacity: 0.4;
63+
64+
&:before{
65+
display: block;
66+
content: '';
67+
position: absolute;
68+
top: 0;
69+
right:0;
70+
bottom:0;
71+
left:0;
72+
background-color: #fff;
73+
opacity: 0.6;
74+
}
6275
}
6376
}
6477

65-
.fc-time-grid-event .post {
66-
width: 100%;
67-
bottom: 0px;
68-
position: absolute;
69-
}
78+
.fc-time-grid-event {
79+
.pre {
80+
border-bottom: 1px dotted #fff;
81+
}
7082

71-
.fc-timeline-event .post {
72-
right: 0px;
73-
z-index: 10;
83+
.post {
84+
border-top: 1px dotted #fff;
85+
width: 100%;
86+
bottom: 0px;
87+
position: absolute;
88+
}
7489
}
7590

76-
.fc-timeline-event .pre,
77-
.fc-timeline-event .post {
78-
height: 100%;
79-
bottom: 0px;
80-
position: absolute;
91+
.fc-timeline-event {
92+
.pre, .post {
93+
height: 100%;
94+
bottom: 0px;
95+
position: absolute;
96+
}
97+
98+
.pre {
99+
border-right: 1px dotted #fff;
100+
}
101+
102+
.post {
103+
border-left: 1px dotted #fff;
104+
right: 0px;
105+
z-index: 10;
106+
}
81107
}
82-
}
108+
}

0 commit comments

Comments
 (0)