Skip to content

Commit

Permalink
Merge branch 'master' into fix-hover-issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@rezatavakoli
rezatavakoli authored Aug 21, 2020
2 parents e9e2ed4 + bd00961 commit f776b0a
Show file tree
Hide file tree
Showing 49 changed files with 338 additions and 294 deletions.
33 changes: 19 additions & 14 deletions assets/css/home-custom.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,23 +99,27 @@


body {
background:#ffffff;
background:#faf8f8;
font-size: 16px;
line-height: 1.5rem;
color: #212121;
font-family: 'Lato', sans-serif;
margin: 0;
}

header .sw-logo:focus, header .sw-usermenu:focus {
box-shadow:inset 0 0 0 2px #0C273E;
header .sw-logo:focus {
box-shadow: inset 0 0 0 2px #000;
outline: 0;
}
header .sw-usermenu:focus {
box-shadow: 0 0 0 2px #000;
outline: 0;
}
header .ui.search>input.sw-searchbox:focus {
box-shadow:0 0 0 2px #0C273E;
box-shadow:0 0 0 2px #000;
}
header .ui.button.add-deck:focus, header .ui.button.sign-in:focus {
box-shadow:inset 0 0 0 2px #0C273E!important;
box-shadow: 0 0 0 2px #000!important;
}
header .sw-usermenu {
display: inline-block;
Expand Down Expand Up @@ -207,26 +211,22 @@ textarea:focus{
::-webkit-input-placeholder {
color: #767676 !important;
font-family: 'Lato', sans-serif;
font-weight:600;
}

:-moz-placeholder {
color: #767676 !important;
font-family: 'Lato', sans-serif;
font-weight:600;
}

::-moz-placeholder {
color: #767676 !important;
font-family: 'Lato', sans-serif;
font-weight:600;
opacity: 1;
}

:-ms-input-placeholder {
color: #767676 !important;
font-family: 'Lato', sans-serif;
font-weight:600;
}


Expand Down Expand Up @@ -568,6 +568,8 @@ textarea:focus{
background: #fff;
color: #158570;
border: 1px solid #158570;
box-shadow: 0 0 0 2px #306ca1;
outline: 0;
}

.home.secondary.button {
Expand All @@ -590,8 +592,9 @@ textarea:focus{
}
.home.secondary.button:focus {
background: #158570;
border: 3px solid #fff;
color: #fff;
box-shadow: 0 0 0 2px #000;
outline: 0;
}

.button-blk {
Expand Down Expand Up @@ -728,7 +731,7 @@ textarea:focus{
.presentation-block {
width: 100%;
border-top: 2px solid #68a5d1;
padding: 175px 0;
padding: 75px 0;
}

.presentation-block h2 {
Expand Down Expand Up @@ -841,7 +844,6 @@ textarea:focus{

.deck-link {
position: absolute;
colour: #1e78bb;
right: 40px;
bottom: -2px;
padding: 20px 55px 0 55px;
Expand All @@ -853,7 +855,7 @@ textarea:focus{
-moz-border-radius-topright: 5px;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
background: #ffffff;
background: #faf8f8;
}

.deck-link a {
Expand Down Expand Up @@ -998,7 +1000,7 @@ textarea:focus{
.footer-right {
width: 100%;
float: left;
padding: 0 0 290px 0;
padding: 0 0 75px 0;
position: relative;
margin: 0 0 0 55px;
}
Expand Down Expand Up @@ -1196,3 +1198,6 @@ textarea:focus{
.accordion__title:hover {
cursor: pointer;
}
*:focus {
outline-color: #306CA1;
}
18 changes: 9 additions & 9 deletions assets/css/home-layout.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
.feature-content p {font-size: 16px;line-height: 22px;}
.feature-content h4{font-size: 24px;}

.feature-content.green-block{border: 1px solid #128571;border-left: none;}
.feature-content.green-block-terms{border: 1px solid #128571;}
.feature-content.blue-block{border: 1px solid #1d78ba;}
.feature-content.blue-block-terms{border: 1px solid #1d78ba;}
.feature-content.red-block{border: 1px solid #981d1f;border-left: none;}
.feature-content.red-block-terms{border: 1px solid #981d1f;}
.feature-content.green-block{border: 2px solid #128571;border-left: none;}
.feature-content.green-block-terms{border: 2px solid #128571;}
.feature-content.blue-block{border: 2px solid #1d78ba;}
.feature-content.blue-block-terms{border: 2px solid #1d78ba;}
.feature-content.red-block{border: 2px solid #981d1f;border-left: none;}
.feature-content.red-block-terms{border: 2px solid #981d1f;}
.signin-blk{border: 1px solid #1d78ba;}
.signin-blk:before,.signin-blk:after{height: 1px;}
.deck-link{bottom: -1px;border: 1px solid #68a5d1;border-bottom: none;}
Expand Down Expand Up @@ -46,7 +46,7 @@
.banner-content .ui.input > input{line-height: 50px;font-size: 25px;}
.category-outer{padding: 120px 0 0;}
.footer-container{padding: 60px 0 0 0;}
.footer-right{padding: 0 0 200px 0;margin: 0;}
.footer-right{padding: 0 0 75px 0;margin: 0;}
.presentation-block{padding: 60px 0;}
.presentation-block h2{font-size: 32px;line-height: 34px;padding: 0 0 60px 0;}
.featured-deck{padding: 40px 40px 60px 40px;}
Expand Down Expand Up @@ -127,7 +127,7 @@
.banner-content .ui.input > input{line-height: 40px;font-size: 24px;}
.banner-content .ui.icon.input > i.icon{font-size: 28px;}
.footer-container{padding: 40px 0 0 0;}
.footer-right{padding: 0 0 150px 0;margin: 0;}
.footer-right{padding: 0 0 75px 0;margin: 0;}
.footer-menu h6{font-size: 14px;}
.footer-menu ul li a{font-size: 14px;}
.footer-right p{font-size: 14px;}
Expand Down Expand Up @@ -221,7 +221,7 @@
.results.home{margin-top: 4rem}
.home.secondary.button,.home.primary.button{line-height: 59px;font-size: 20px;}
.footer-container{padding: 40px 0 0 0;}
.footer-right{padding: 0 0 100px 0;}
.footer-right{padding: 0 0 75px 0;}
.footer-menu h6{font-size: 14px;}
.footer-menu ul li a{font-size: 14px;}
.footer-right{margin: 0;}
Expand Down
73 changes: 36 additions & 37 deletions assets/custom-semantic-ui/dist/components/button.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
background-color: #CACBCD;
color: rgba(0, 0, 0, 0.8);
background-image: '' !important;
-webkit-box-shadow: 0 0 0 2px #5E9ACF inset !important;
box-shadow: 0 0 0 2px #5E9ACF inset !important;
-webkit-box-shadow: 0 0 0 2px #306CA1 !important;
box-shadow: 0 0 0 2px #306CA1 !important;
}
.ui.button:focus .icon {
opacity: 0.85;
Expand Down Expand Up @@ -769,8 +769,8 @@
.ui.basic.button:focus {
background: #FFFFFF !important;
color: rgba(0, 0, 0, 0.8) !important;
-webkit-box-shadow: 0px 0px 0px 2px #5E9ACF inset !important;
box-shadow: 0px 0px 0px 2px #5E9ACF inset !important;
-webkit-box-shadow: 0px 0px 0px 2px #306CA1 !important;
box-shadow: 0px 0px 0px 2px #306CA1 !important;
}
.ui.basic.buttons .button:active,
.ui.basic.button:active {
Expand Down Expand Up @@ -3111,7 +3111,7 @@

.ui.yellow.buttons .button,
.ui.yellow.button {
background-color: #FFD900;
background-color: #B88A00;
color: #FFFFFF;
text-shadow: none;
background-image: none;
Expand All @@ -3122,64 +3122,64 @@
}
.ui.yellow.buttons .button:hover,
.ui.yellow.button:hover {
background-color: #e6c300;
background-color: #9f7700;
color: #FFFFFF;
text-shadow: none;
}
.ui.yellow.buttons .button:focus,
.ui.yellow.button:focus {
background-color: #d6b600;
background-color: #8f6b00;
color: #FFFFFF;
text-shadow: none;
}
.ui.yellow.buttons .button:active,
.ui.yellow.button:active {
background-color: #ccae00;
background-color: #856400;
color: #FFFFFF;
text-shadow: none;
}
.ui.yellow.buttons .active.button,
.ui.yellow.buttons .active.button:active,
.ui.yellow.active.button,
.ui.yellow.button .active.button:active {
background-color: #e6c300;
background-color: #9f7700;
color: #FFFFFF;
text-shadow: none;
}

/* Basic */
.ui.basic.yellow.buttons .button,
.ui.basic.yellow.button {
-webkit-box-shadow: 0px 0px 0px 1px #FFD900 inset !important;
box-shadow: 0px 0px 0px 1px #FFD900 inset !important;
color: #FFD900 !important;
-webkit-box-shadow: 0px 0px 0px 1px #B88A00 inset !important;
box-shadow: 0px 0px 0px 1px #B88A00 inset !important;
color: #B88A00 !important;
}
.ui.basic.yellow.buttons .button:hover,
.ui.basic.yellow.button:hover {
background: transparent !important;
-webkit-box-shadow: 0px 0px 0px 1px #e6c300 inset !important;
box-shadow: 0px 0px 0px 1px #e6c300 inset !important;
color: #e6c300 !important;
-webkit-box-shadow: 0px 0px 0px 1px #9f7700 inset !important;
box-shadow: 0px 0px 0px 1px #9f7700 inset !important;
color: #9f7700 !important;
}
.ui.basic.yellow.buttons .button:focus,
.ui.basic.yellow.button:focus {
background: transparent !important;
-webkit-box-shadow: 0px 0px 0px 1px #d6b600 inset !important;
box-shadow: 0px 0px 0px 1px #d6b600 inset !important;
color: #e6c300 !important;
-webkit-box-shadow: 0px 0px 0px 1px #8f6b00 inset !important;
box-shadow: 0px 0px 0px 1px #8f6b00 inset !important;
color: #9f7700 !important;
}
.ui.basic.yellow.buttons .active.button,
.ui.basic.yellow.active.button {
background: transparent !important;
-webkit-box-shadow: 0px 0px 0px 1px #e6c300 inset !important;
box-shadow: 0px 0px 0px 1px #e6c300 inset !important;
color: #ccae00 !important;
-webkit-box-shadow: 0px 0px 0px 1px #9f7700 inset !important;
box-shadow: 0px 0px 0px 1px #9f7700 inset !important;
color: #856400 !important;
}
.ui.basic.yellow.buttons .button:active,
.ui.basic.yellow.button:active {
-webkit-box-shadow: 0px 0px 0px 1px #ccae00 inset !important;
box-shadow: 0px 0px 0px 1px #ccae00 inset !important;
color: #ccae00 !important;
-webkit-box-shadow: 0px 0px 0px 1px #856400 inset !important;
box-shadow: 0px 0px 0px 1px #856400 inset !important;
color: #856400 !important;
}
.ui.buttons:not(.vertical) > .basic.yellow.button:not(:first-child) {
margin-left: -1px;
Expand Down Expand Up @@ -3836,27 +3836,26 @@
.ui.primary.button:focus,
.ui.blue.buttons .button:focus,
.ui.blue.button:focus {
-webkit-box-shadow: 0 0 0 2px #731516 inset !important;
box-shadow: 0 0 0 2px #731516 inset !important;
-webkit-box-shadow: 0 0 0 2px #000000 !important;
box-shadow: 0 0 0 2px #000000 !important;
}
.ui.secondary.buttons .button:focus,
.ui.secondary.button:focus {
-webkit-box-shadow: 0 0 0 2px #d7d7d7 inset !important;
box-shadow: 0 0 0 2px #d7d7d7 inset !important;
}
.ui.secondary.button:focus,
.ui.button.grey:focus,
.ui.positive.buttons .button:focus,
.ui.positive.button:focus,
.ui.green.buttons .button:focus,
.ui.green.button:focus {
-webkit-box-shadow: 0 0 0 2px #1bef5d inset !important;
box-shadow: 0 0 0 2px #1bef5d inset !important;
}
.ui.green.button:focus,
.ui.negative.buttons .button:focus,
.ui.negative.button:focus,
.ui.red.buttons .button:focus,
.ui.red.button:focus {
-webkit-box-shadow: 0 0 0 2px #000000 inset !important;
box-shadow: 0 0 0 2px #000000 inset !important;
.ui.red.button:focus,
.ui.button.secondary-focus:focus {
-webkit-box-shadow: 0 0 0 2px #000000 !important;
box-shadow: 0 0 0 2px #000000 !important;
}
.button:focus {
z-index: 3;
}


Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/button.min.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions assets/custom-semantic-ui/dist/components/card.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,14 +536,14 @@ a.ui.card:hover,
.ui.yellow.cards > .card,
.ui.cards > .yellow.card,
.ui.yellow.card {
-webkit-box-shadow: 0px 0px 0px 1px #D4D4D5, 0px 2px 0px 0px #FFD900, 0px 1px 3px 0px #D4D4D5;
box-shadow: 0px 0px 0px 1px #D4D4D5, 0px 2px 0px 0px #FFD900, 0px 1px 3px 0px #D4D4D5;
-webkit-box-shadow: 0px 0px 0px 1px #D4D4D5, 0px 2px 0px 0px #B88A00, 0px 1px 3px 0px #D4D4D5;
box-shadow: 0px 0px 0px 1px #D4D4D5, 0px 2px 0px 0px #B88A00, 0px 1px 3px 0px #D4D4D5;
}
.ui.yellow.cards > .card:hover,
.ui.cards > .yellow.card:hover,
.ui.yellow.card:hover {
-webkit-box-shadow: 0px 0px 0px 1px #D4D4D5, 0px 2px 0px 0px #e6c300, 0px 1px 3px 0px #767676;
box-shadow: 0px 0px 0px 1px #D4D4D5, 0px 2px 0px 0px #e6c300, 0px 1px 3px 0px #767676;
-webkit-box-shadow: 0px 0px 0px 1px #D4D4D5, 0px 2px 0px 0px #9f7700, 0px 1px 3px 0px #767676;
box-shadow: 0px 0px 0px 1px #D4D4D5, 0px 2px 0px 0px #9f7700, 0px 1px 3px 0px #767676;
}

/* Olive */
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/card.min.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/custom-semantic-ui/dist/components/checkbox.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
transition: border 0.1s ease, opacity 0.1s ease, -webkit-transform 0.1s ease, -webkit-box-shadow 0.1s ease;
transition: border 0.1s ease, opacity 0.1s ease, transform 0.1s ease, box-shadow 0.1s ease;
transition: border 0.1s ease, opacity 0.1s ease, transform 0.1s ease, box-shadow 0.1s ease, -webkit-transform 0.1s ease, -webkit-box-shadow 0.1s ease;
border: 1px solid #D4D4D5;
border: 1px solid #757575;
}

/*--------------
Expand Down Expand Up @@ -626,8 +626,8 @@
*/
.ui.checkbox input:focus ~ .box:before,
.ui.checkbox input:focus ~ label:before {
-webkit-box-shadow: 0 0 0 3px #5E9ACF;
box-shadow: 0 0 0 3px #5E9ACF;
-webkit-box-shadow: 0 0 0 2px #000000;
box-shadow: 0 0 0 2px #000000;
}


Expand Down
Loading

0 comments on commit f776b0a

Please sign in to comment.