Skip to content

Commit

Permalink
Merge pull request #1 from marcwieland95/develop
Browse files Browse the repository at this point in the history
Beta 2
  • Loading branch information
marcwieland95 committed Oct 19, 2015
2 parents d8cd5d8 + 2f105b8 commit 8db2f15
Show file tree
Hide file tree
Showing 18 changed files with 758 additions and 102 deletions.
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
In progress

##ToDo
- Reduce JS in calculation function - achieve more trought css
- Reduce JS in calculation function (improve) - achieve more trought css (flexbox)
- Improve margin/padding handling
- Rewritte title functions
- Don't hardcode arrow and close sizes inside css (height and width)

##Building
Build using Grunt and Bower. The following tasks are available:
Expand All @@ -21,6 +24,13 @@ Build using Grunt and Bower. The following tasks are available:
See [Trello-Board](https://trello.com/b/kjfwYtGe/litbx) to check future feature and current work state.

##Changelog
### Beta 2 (Sprint 2) - 19.10.2015
* Keyboard (2)
* Arrow-Handling (4)
* Preload (3)
* Divide into galleries (data-attr) (2)
* Overlay (stop scroll, color) (2)

### Beta 1 (Sprint 1) - 06.09.2015
* Bootstrap (3)
* Grunt, Bower and Travis (1)
Expand Down
29 changes: 29 additions & 0 deletions dist/css/litbx.core.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
/*
Arrow
*/
/*
Close
*/
/*
Title
*/
/*
Loading
*/
Expand Down Expand Up @@ -42,6 +48,8 @@
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
width: 80%;
height: auto;
}
.litbx__inner {
width: 100%;
Expand Down Expand Up @@ -85,6 +93,27 @@
.litbx__arrow--next {
right: 0;
}
.litbx__close {
position: absolute;
cursor: pointer;
top: 0;
right: 0;
width: 70px;
height: 70px;
text-align: center;
line-height: 70px;
}
.litbx__title {
position: absolute;
bottom: 0;
left: 0;
right: 0;
}
.litbx__title.outside {
-webkit-transform: translateY(100%);
-ms-transform: translateY(100%);
transform: translateY(100%);
}
.litbx__overlay.loading::after {
content: "";
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/litbx.core.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8db2f15

Please sign in to comment.