Skip to content

Commit

Permalink
v1.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronconway7 committed Feb 26, 2017
1 parent 28bb28b commit e0e4e83
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 27 deletions.
21 changes: 11 additions & 10 deletions app/css/eden.css
Original file line number Diff line number Diff line change
Expand Up @@ -923,24 +923,24 @@ button, .button {
.modal > .content > .close {
position: absolute;
opacity: 0.5;
transition: all 0.3s ease-in-out; }
transition: all 0.3s ease-in-out;
color: #52ae76;
background-color: transparent; }
.modal > .content > .close:hover {
opacity: 1;
cursor: pointer; }
.modal > .content > .close.dark {
color: #2f2f2f !important; }
color: #2f2f2f !important;
background-color: transparent !important; }
.modal > .content > .close.light {
color: #ececec !important; }
.modal > .content > .close.eden {
color: #52ae76 !important; }
color: #ececec !important;
background-color: transparent !important; }
.modal > .content > .close.inside {
right: 15px;
top: 12px;
color: #ececec; }
top: 12px; }
.modal > .content > .close.outside {
right: -1.25em;
top: -1.25em;
color: #2f2f2f; }
top: -1.25em; }
.modal > .content > .close.corner {
right: -1em;
top: -1em;
Expand Down Expand Up @@ -1273,7 +1273,8 @@ textarea {
display: -ms-flexbox;
display: flex; }
.lightbox .modal .content {
text-align: center; }
text-align: center;
background-color: transparent; }
.lightbox .modal .content .active-img {
position: relative; }
.lightbox .modal .content .active-img img {
Expand Down
1 change: 1 addition & 0 deletions app/sass/components/lightbox.sass
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

.content
text-align: center
background-color: transparent

.active-img
position: relative
Expand Down
9 changes: 4 additions & 5 deletions app/sass/components/modal.sass
Original file line number Diff line number Diff line change
Expand Up @@ -103,29 +103,28 @@
position: absolute
opacity: 0.5
transition: all 0.3s ease-in-out
color: $eden-green
background-color: transparent

&:hover
opacity: 1
cursor: pointer

&.dark
color: $eden-charcoal !important
background-color: transparent !important

&.light
color: $eden-light-grey !important

&.eden
color: $eden-green !important
background-color: transparent !important

&.inside
right: 15px
top: 12px
color: $eden-light-grey

&.outside
right: -1.25em
top: -1.25em
color: $eden-charcoal

&.corner
right: -1em
Expand Down
21 changes: 11 additions & 10 deletions dist/css/eden.css
Original file line number Diff line number Diff line change
Expand Up @@ -923,24 +923,24 @@ button, .button {
.modal > .content > .close {
position: absolute;
opacity: 0.5;
transition: all 0.3s ease-in-out; }
transition: all 0.3s ease-in-out;
color: #52ae76;
background-color: transparent; }
.modal > .content > .close:hover {
opacity: 1;
cursor: pointer; }
.modal > .content > .close.dark {
color: #2f2f2f !important; }
color: #2f2f2f !important;
background-color: transparent !important; }
.modal > .content > .close.light {
color: #ececec !important; }
.modal > .content > .close.eden {
color: #52ae76 !important; }
color: #ececec !important;
background-color: transparent !important; }
.modal > .content > .close.inside {
right: 15px;
top: 12px;
color: #ececec; }
top: 12px; }
.modal > .content > .close.outside {
right: -1.25em;
top: -1.25em;
color: #2f2f2f; }
top: -1.25em; }
.modal > .content > .close.corner {
right: -1em;
top: -1em;
Expand Down Expand Up @@ -1273,7 +1273,8 @@ textarea {
display: -ms-flexbox;
display: flex; }
.lightbox .modal .content {
text-align: center; }
text-align: center;
background-color: transparent; }
.lightbox .modal .content .active-img {
position: relative; }
.lightbox .modal .content .active-img img {
Expand Down
2 changes: 1 addition & 1 deletion dist/css/eden.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aaronconway7/eden",
"version": "1.1.5",
"version": "1.1.6",
"description": "A front-end framework focused on beautiful deisgn and unique web development.",
"main": "dist",
"dependencies": {
Expand Down

0 comments on commit e0e4e83

Please sign in to comment.