Skip to content

Commit

Permalink
style: add new theme styles
Browse files Browse the repository at this point in the history
  • Loading branch information
mohamedsamara committed Oct 3, 2020
1 parent 0b820f3 commit 066fdd7
Show file tree
Hide file tree
Showing 20 changed files with 88 additions and 119 deletions.
2 changes: 1 addition & 1 deletion client/app/styles/core/_account.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.admin {
padding: 5px;
border-radius: $border-radius-default;
background-color: $theme-light-blue;
background-color: $primary-color;
color: $white;
font-weight: $font-weight-bold-one;
margin-left: 10px;
Expand Down
9 changes: 1 addition & 8 deletions client/app/styles/core/_brand.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}

&:hover {
border-color: $theme-black;
border-color: $border-hover-color;
-moz-transition: border-color $layout-transition-speed ease-in-out;
-webkit-transition: border-color $layout-transition-speed ease-in-out;
-ms-transition: border-color $layout-transition-speed ease-in-out;
Expand All @@ -30,12 +30,5 @@
.brand-desc {
@include text-ellipsis(2);
}

h1 {
a {
font-size: $font-size-heading-small !important;
color: $red !important;
}
}
}
}
16 changes: 13 additions & 3 deletions client/app/styles/core/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ button[type='reset'] {
}

.redirect-link {
color: $red !important;
color: $primary-color !important;
font-weight: $font-weight-bold-one;
text-transform: capitalize;
}
Expand Down Expand Up @@ -128,10 +128,20 @@ button[type='reset'] {
width: 100% !important;
}

.btn-text {
margin-left: 5px;
}

&:hover {
color: $white !important;
background-color: $btn-bg-hover !important;
border-color: transparent;
-webkit-transition: $layout-transition-speed;
transition: $layout-transition-speed;

.bag-icon {
// fill: $red;
stroke: $red !important;
fill: $white;
stroke: $white !important;
-webkit-transition: $layout-transition-speed;
transition: $layout-transition-speed;
}
Expand Down
7 changes: 3 additions & 4 deletions client/app/styles/core/_cart.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
overflow-y: auto;
overflow-x: hidden;
max-height: 100%;
background-color: $theme-white;
background-color: $white;
}

.item-box {
Expand All @@ -63,7 +63,7 @@

.item-details {
.icon-trash {
color: $theme-bright-red;
color: $font-custom-color;
font-size: $font-size-xx-large;
cursor: pointer;
}
Expand Down Expand Up @@ -97,7 +97,6 @@
}

p {
// color: $red;
font-weight: $font-weight-bold-one;
margin-top: 12px;
}
Expand All @@ -109,7 +108,7 @@

.cart-summary {
padding: 10px;
background-color: $theme-light-blue-white;
background-color: $theme-white;

p {
margin-bottom: 0;
Expand Down
7 changes: 2 additions & 5 deletions client/app/styles/core/_checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ input[type='checkbox'] + label {
display: block;
position: relative;
padding: 5px 5px 5px 30px;
color: $font-custom-color;
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
Expand All @@ -39,7 +40,7 @@ input[type='checkbox'] + label:before {
width: 18px;
height: 16px;
border: $border-default;
border-color: $theme-blue;
border-color: $primary-color;
position: absolute;
left: 4px;
top: 7px;
Expand All @@ -59,7 +60,3 @@ input[type='checkbox']:checked + label:before {
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
}

// input[type='checkbox']:checked + label {
// color: $red;
// }
1 change: 0 additions & 1 deletion client/app/styles/core/_contact.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.contact {
h1 {
color: $red !important;
text-transform: uppercase;
}
}
28 changes: 9 additions & 19 deletions client/app/styles/core/_dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,13 @@
margin: 0;
padding: 10px 0px;
text-align: center;
color: $red !important;
border-top: $border-default;
border-right: $border-default;
border-left: $border-default;
border-color: $dark-border-color;
border: $border-primary;
border-bottom: none;
}

.menu-panel {
&.collapse {
border-bottom: $border-default;
border-color: $dark-border-color;
border-bottom: $border-primary;

&:hover {
background-color: $theme-gray;
Expand All @@ -37,7 +33,6 @@

.navbar {
padding: 0px;
background-color: $white;
}

.menu-panel {
Expand All @@ -53,7 +48,7 @@
}

.btn-text {
font-size: $font-size-heading-medium !important;
font-size: $font-size-heading-xsmall !important;
font-weight: $font-weight-bold-one;
}
}
Expand All @@ -64,23 +59,18 @@
margin-bottom: 0;

li {
border-top: $border-default;
border-right: $border-default;
border-left: $border-default;
border-color: $light-border-color;
// border-color: $dark-border-color;
border-top: $border-primary;
border-right: $border-primary;
border-left: $border-primary;

&:hover {
background-color: $white;

a {
color: $font-custom-color !important;
}
}

&:last-child {
border-bottom: $border-default;
border-color: $dark-border-color;
border-bottom: $border-primary;
}

a {
Expand All @@ -92,8 +82,8 @@
}

a.active-link {
color: $red !important;
font-weight: $font-weight-bold-two;
background-color: $white;

// &:hover {
// color: $font-hover-color !important;
Expand Down
25 changes: 10 additions & 15 deletions client/app/styles/core/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// footer styles

.footer {
flex-shrink: 0;
border-top: $border-default;
border-color: $light-border-color;
}

.footer-content {
Expand All @@ -18,16 +16,14 @@
.footer-block {
width: 100%;
margin: 0px 15px;
border-right: $border-default;
border-color: $light-border-color;
border-right: $border-primary;
padding: 20px 0px 40px;

@include media-breakpoint-down(sm) {
text-align: center;
margin: 10px 0px;
border-right: none;
border-bottom: $border-default;
border-color: $light-border-color;
border-bottom: $border-primary;
padding: 20px 0px;
}

Expand All @@ -39,20 +35,19 @@
.block-title {
padding-bottom: 10px;

h2 {
color: $red !important;
}
// h2 {
// color: $secondary-color !important;
// }
}

.footer-link {
padding-bottom: 4px;

// a {
// &:hover {
// color: $red !important;
// color: $font-hover-color !important;
// }
// }
a {
&:hover {
text-decoration: underline !important;
}
}
}
}

Expand Down
18 changes: 3 additions & 15 deletions client/app/styles/core/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@

.header {
background-color: $white;
border-bottom: $border-default;
border-color: $light-border-color;
border-bottom: $border-primary;
}

.fixed-mobile-header {
Expand Down Expand Up @@ -50,7 +49,7 @@

.fa {
cursor: pointer;
color: $red;
color: $theme-dark-gray;
font-size: $font-size-x-huge !important;
}

Expand Down Expand Up @@ -112,13 +111,6 @@
}
}

// a,
// span {
// &:hover {
// color: $red !important;
// }
// }

a,
span {
&:hover {
Expand All @@ -138,7 +130,7 @@
.nav-link {
.dropdown-caret {
font-size: $font-size-x-small !important;
color: $font-light-color;
color: $theme-dark-gray;
margin-left: 5px;
-webkit-transition: $layout-transition-speed;
transition: $layout-transition-speed;
Expand Down Expand Up @@ -200,17 +192,13 @@
}

.bars-icon {
// display: block;
// height: 100%;

@include media-breakpoint-down(sm) {
display: none;
}
}

h1 {
margin: 0px;
// color: $red !important;
color: $font-custom-color !important;
@include media-breakpoint-up(md) {
margin-left: 15px;
Expand Down
8 changes: 4 additions & 4 deletions client/app/styles/core/_input.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ input[type='password'] {
&:focus {
outline: none;
color: $font-focus-color;
border-color: $theme-light-blue !important;
// box-shadow: $box-shadow;
border-color: $border-focus-color !important;
box-shadow: none;
}

&:disabled {
Expand Down Expand Up @@ -70,7 +70,7 @@ input[type='password'] {

label {
margin-bottom: 5px;
color: $theme-blue;
color: $font-custom-color;
font-size: $font-size-large;
}
}
Expand Down Expand Up @@ -99,7 +99,7 @@ textarea {
&:focus {
outline: none;
color: $font-focus-color;
border-color: $theme-light-blue !important;
border-color: $border-focus-color !important;
// box-shadow: $box-shadow;
}
}
Expand Down
3 changes: 1 addition & 2 deletions client/app/styles/core/_login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@
margin-top: 15px;
width: 300px;
max-width: 350px;
border: $border-default;
border-color: $light-border-color;
border: $border-primary;
border-radius: $border-radius-default;
@include media-breakpoint-down(sm) {
width: 100%;
Expand Down
6 changes: 3 additions & 3 deletions client/app/styles/core/_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
transition: $layout-transition-speed;

a {
color: $red !important;
color: $primary-color !important;
}
}

Expand All @@ -82,8 +82,8 @@

a.active-link {
font-weight: $font-weight-bold-two;
color: $red !important;
border-color: $red;
color: $primary-color !important;
border-color: $primary-color;
-webkit-transition: border-color ease-in $layout-transition-speed;
transition: border-color ease-in $layout-transition-speed;
background-color: $white;
Expand Down
7 changes: 0 additions & 7 deletions client/app/styles/core/_merchant.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
.sell {
h1 {
color: $red !important;
text-transform: uppercase;
}
}

// .merchant-dashboard {
// .table-section {
// margin: 20px 0px;
// }
// }
Loading

0 comments on commit 066fdd7

Please sign in to comment.