Skip to content

Commit 873be23

Browse files
committed
update core styles
1 parent 78ea0f4 commit 873be23

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

src/app/layout/navbar/navbar.template.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,16 @@
149149
<div>Sidebar on the</div>
150150
<div id="sidebar-toggle" class="btn-group">
151151
<!--nRight = sidebar == 'right'-->
152-
<button type="button" btnRadio="Left" [(ngModel)]="radioModel" (click)="sidebarPosition('Left')" class="btn btn-sm btn-default">Left</button>
153-
<button type="button" btnRadio="Right" [(ngModel)]="radioModel" (click)="sidebarPosition('Right')" class="btn btn-sm btn-default">Right</button>
152+
<button type="button" btnRadio="Left" [(ngModel)]="radioModel" (click)="sidebarPosition('Left')" class="btn btn-dark">Left</button>
153+
<button type="button" btnRadio="Right" [(ngModel)]="radioModel" (click)="sidebarPosition('Right')" class="btn btn-dark">Right</button>
154154
</div>
155155
</div>
156156
<div class="setting clearfix">
157157
<div>Sidebar</div>
158158
<div id="display-sidebar-toggle" class="btn-group" data-toggle="buttons-radio">
159159
<!--display = displaySidebar-->
160-
<button type="button" btnRadio="Left" [(ngModel)]="display" (click)="sidebarDisplay('Show')" class="btn btn-sm btn-default">Show</button>
161-
<button type="button" btnRadio="Right" [(ngModel)]="display" (click)="sidebarDisplay('Hide')" class="btn btn-sm btn-default">Hide</button>
160+
<button type="button" btnRadio="Left" [(ngModel)]="display" (click)="sidebarDisplay('Show')" class="btn btn-dark">Show</button>
161+
<button type="button" btnRadio="Right" [(ngModel)]="display" (click)="sidebarDisplay('Hide')" class="btn btn-dark">Hide</button>
162162
</div>
163163
</div>
164164
</div>

src/app/styles/_base.scss

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
.sidebar-on-right{
296296
.sidebar{
297297
right: 0;
298-
margin: $sidebar-mt 25px 0 0;
298+
margin-right: 25px;
299299
}
300300

301301
.wrap{
@@ -849,13 +849,12 @@
849849
/**********************************/
850850

851851
.messages{
852-
background: $header-dropdown-bg;
853852
@include box-shadow($header-dropdown-shadow);
854853
border-radius: $border-radius-base !important;
855854
color: $header-dropdown-primary-color;
856855
}
857856

858-
.navbar .nav > li > .messages{
857+
.messages{
859858
&:before{
860859
border-bottom: none;
861860
}
@@ -910,7 +909,6 @@
910909
/**********************************/
911910

912911
.support{
913-
background: $header-dropdown-bg;
914912
@include box-shadow($header-dropdown-shadow);
915913
border-radius: $border-radius-base !important;
916914
color: $header-dropdown-primary-color;
@@ -963,10 +961,8 @@
963961
/**********************************/
964962

965963
.navbar-nav.nav > li > .settings{
966-
background: $header-dropdown-bg;
967964
border-radius: $border-radius-base !important;
968965
color: $header-dropdown-primary-color;
969-
width: 122px;
970966
font-size: $font-size-sm;
971967
text-align: center;
972968
min-width: auto;
@@ -1008,7 +1004,6 @@
10081004

10091005
.account{
10101006
width: 180px;
1011-
background: $header-dropdown-bg;
10121007
@include box-shadow($header-dropdown-shadow);
10131008
border-radius: $border-radius-base !important;
10141009
color: $header-dropdown-primary-color;
@@ -1047,6 +1042,19 @@
10471042
padding: 7px 10px;
10481043
}
10491044

1045+
.dropdown .dropdown-menu.show {
1046+
&.messages,
1047+
&.support,
1048+
&.settings,
1049+
&.account {
1050+
background-color: rgba(51, 51, 51, .85);
1051+
1052+
&:after {
1053+
visibility: hidden;
1054+
}
1055+
}
1056+
}
1057+
10501058
/***********************************/
10511059
/** BUTTONS **/
10521060
/**********************************/

src/app/styles/_override-bootstrap.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ legend {
340340
}
341341

342342
.dropdown-menu{
343-
background-color: $black;
344343
border-radius: $border-radius-lg;
345344

346345
& > li > a {

src/app/styles/_variables.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ $theme-colors: (
5757
'warning': $yellow,
5858
'danger': $red,
5959
'light': $gray-200,
60-
'dark': $gray-800,
60+
'dark': $gray-700,
6161
'inverse': $white-dark,
6262
'gray': $gray-300,
6363
'default': #f8f8f8
@@ -130,7 +130,7 @@ $widget-border-radius: 10px;
130130
$widget-bg-color: rgba(0, 0, 0, .24);
131131

132132
$text-transparent: opacify($widget-bg-color, .07);
133-
$bg-addition: rgba($widget-bg-color, 0.3);
133+
$bg-addition: darken($widget-bg-color, .07);
134134

135135
$widget-padding-vertical: 15px;
136136
$widget-padding-horizontal: 17px;
@@ -245,7 +245,7 @@ $legend-color: $white !default;
245245
// Dropdowns
246246
// -------------------------
247247

248-
$dropdown-bg: $white !default;
248+
$dropdown-bg: rgba($bg-addition, .8) !default;
249249
$dropdown-border: rgba(0, 0, 0, 0.2) !default;
250250

251251
$dropdown-link-active-color: #fff !default;

0 commit comments

Comments
 (0)