Skip to content

Commit 43bce07

Browse files
refactor(global)
1 parent 34432ef commit 43bce07

7 files changed

Lines changed: 46 additions & 19 deletions

File tree

‎src/app/theme/components/sidebar/SidebarCtrl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
menu.expanded = menu.expanded || menu.selected;
2121
if (menu.subMenu) {
2222
$.each(menu.subMenu, function (subIndex, subMenu) {
23-
subMenu.selected = ('#' + $location.$$url).indexOf(subMenu.root) == 0;
23+
subMenu.selected = (('#' + $location.$$url).indexOf(subMenu.root) == 0) && !subMenu.disabled;
2424
});
2525
}
2626
});

‎src/app/theme/components/sidebar/sidebar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
subSubitem.title }}</a>
3131
</li>
3232
</ul>
33-
<a ng-mouseenter="hoverItem($event, item)" target="{{subitem.root[0]=='#' ? '_self' : '_blank'}}" ng-if="!subitem.subMenu" href="{{ subitem.root }}">{{ subitem.title}}</a>
33+
<a ng-mouseenter="hoverItem($event, item)" target="{{subitem.blank ? '_blank' : '_self'}}" ng-if="!subitem.subMenu" href="{{ subitem.root }}">{{ subitem.title}}</a>
3434
</li>
3535
</ul>
3636
</li>

‎src/app/theme/components/sidebar/sidebar.service.js‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,33 @@
1111
icon: 'ion-document',
1212
subMenu: [{
1313
title: 'Sign In',
14-
root: 'auth.html'
14+
root: 'auth.html',
15+
blank: true
1516
}, {
1617
title: 'Sign Up',
17-
root: 'reg.html'
18+
root: 'reg.html',
19+
blank: true
1820
}, {
1921
title: 'User Profile',
2022
root: '#/profile'
2123
}, {
2224
title: '404 Page',
23-
root: '404.html'
25+
root: '404.html',
26+
blank: true
2427
}]
2528
}, {
2629
title: 'Menu Level 1',
2730
icon: 'ion-ios-more',
2831
subMenu: [{
2932
title: 'Menu Level 1.1',
30-
root: '#'
33+
root: '#',
34+
disabled: true
3135
}, {
3236
title: 'Menu Level 1.2',
3337
subMenu: [{
3438
title: 'Menu Level 1.2.1',
35-
root: '#'
39+
root: '#',
40+
disabled: true
3641
}]
3742
}]
3843
}];

‎src/sass/app/_buttonsPage.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ $btn-icon-size: 34px;
8585
line-height: 1;
8686
font-size: 14px;
8787
margin-bottom: 10px;
88+
margin-top: 10px;
8889
}
8990
.row + .row {
9091
margin-top: 30px;

‎src/sass/app/_form.scss‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ textarea.form-control {
124124
}
125125

126126
.bootstrap-switch {
127-
border-radius: 0;
127+
border-radius: 5px;
128128
border: 1px solid $default;
129129
transition: border-color ease-in-out .7s, box-shadow ease-in-out .7s;
130130
&:focus {
@@ -446,7 +446,7 @@ label.custom-input-danger {
446446
.bootstrap-select {
447447
.btn-default {
448448
background: transparent;
449-
color: #555555;
449+
color: $default;
450450
&:focus {
451451
background: #ffffff;
452452
box-shadow: none;
@@ -459,13 +459,11 @@ label.custom-input-danger {
459459
}
460460
}
461461
&.open {
462-
.btn-default + .dropdown-menu {
463-
border-top: 1px solid $disabled;
464-
}
465462
.btn-default.dropdown-toggle {
466463
box-shadow: none;
467464
background-color: #ffffff;
468465
border-color: $default;
466+
color: $default;
469467
}
470468
.dropdown-menu {
471469
border-left: 1px solid $default;
@@ -483,9 +481,15 @@ label.custom-input-danger {
483481
border-top: none;
484482
}
485483
}
484+
&.with-search.open{
485+
.btn-default.btn{
486+
background-color: rgba(0, 0, 0, 0.2);
487+
border-color: 1px solid $default;
488+
}
489+
}
486490
&.with-search.open .btn-default + .dropdown-menu {
487491
.bs-searchbox .form-control {
488-
background-color: rgba(0, 0, 0, 0.5);
492+
background-color: rgba(0, 0, 0, 0.35);
489493
}
490494
.no-results {
491495
color: $default-text;

‎src/sass/app/_profile.scss‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,11 @@ $snPadding: 8px;
132132
a.sn-link {
133133
transition: none;
134134
display: block;
135-
background-color: #fff;
135+
border-radius: 5px;
136+
background-color: rgba(0, 0, 0, .15);
136137
padding: $snPadding;
137-
color: $default-text;
138-
border: 1px solid $border;
138+
color: $default;
139+
border: 1px solid transparent;
139140
margin-bottom: 23px;
140141
width: 100%;
141142
position: relative;
@@ -147,7 +148,7 @@ a.sn-link {
147148
width: auto;
148149
font-size: 17px;
149150
margin-right: 8px;
150-
background-color: #666666;
151+
background-color: rgba(0,0,0,.15);
151152
color: #fff;
152153
}
153154
span {
@@ -164,7 +165,7 @@ a.sn-link {
164165
border-width: 2px;
165166
padding: $snPadding - 1;
166167
span {
167-
color: $snColor;
168+
color: $default;
168169
}
169170
i {
170171
background: $snColor;

‎src/sass/theme/_buttons.scss‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,18 @@ $hover: 24;
3737
}
3838
}
3939

40-
.open > .dropdown-toggle {
40+
.open > .btn.dropdown-toggle {
4141
&.btn.btn-primary {
4242
@include styleButton($primary, $primary - $hover);
4343
background-color: $primary-dark;
4444
border-color: $primary-dark;
4545
}
4646
&.btn-default {
4747
@include styleButton(transparent, $default);
48+
&:focus, &:active:hover, &.active:hover, &:hover{
49+
background-color: rgba(0, 0, 0, 0.2);
50+
color: $default;
51+
}
4852
}
4953
&.btn-success {
5054
@include styleButton($success, $success - $hover);
@@ -116,6 +120,18 @@ button.btn.btn-danger {
116120
}
117121
}
118122

123+
124+
button.btn.btn-inverse {
125+
@include buttonColor($help-text, $help-text);
126+
color: $default;
127+
&:active, &:target, &:hover {
128+
background-color: $help-text;
129+
color: $default;
130+
}
131+
}
132+
133+
134+
119135
.btn-with-icon {
120136
i {
121137
margin-right: 10px;

0 commit comments

Comments
 (0)