Skip to content

Commit

Permalink
Updated styling and javascript for carousels and snippets
Browse files Browse the repository at this point in the history
  • Loading branch information
Michal Fiedorowicz committed May 3, 2016
1 parent e9c6d51 commit f12b9ce
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 15 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ Installation
Changelog
---------

## 1.1.0.2-alpha, May 2, 2016

- Updated styling and javascript for carousels and snippets

## 1.1.0.1-alpha, April 28, 2016

- Styling updates for carousels
Expand Down
11 changes: 6 additions & 5 deletions assets/less/carousel/carousel-and-snippet.less
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@
position: relative;
clear: both;
margin: 0 auto;
max-width: 100%;
height: 100%;
width: 100%;
height: 200px;
width: 200px;;
list-style: none;
text-align: center;
display: block;
Expand Down Expand Up @@ -110,6 +109,7 @@
color: @blue-corn;
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
overflow: hidden;
}

.grid-item figure figcaption::before,
Expand Down Expand Up @@ -156,10 +156,11 @@ figure.effect-winston {
background-position: center;
background-size: contain;
background-repeat: no-repeat;
width: 200px;
height: 200px;
// width: 200px;
// height: 200px;
-webkit-transition: opacity 0.45s;
transition: opacity 0.45s;
overflow: hidden;
}

figure.effect-winston img {
Expand Down
24 changes: 24 additions & 0 deletions assets/less/form/form.less
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,30 @@ body.mata-cms {
}
}

#media-modal {
.qq-upload-list-selector {
position: relative;
margin: 0 4px;

.qq-upload-spinner {

height: 3px;
width: 0%;
background: #b471a3;
.transition(width 0.4s);
opacity: 1;
display: block !important;
position: absolute;
top: 0px;
left: 0px;

&.success {
background: #78b572;
}
}
}
}

.qq-hide {
display: none !important;
}
Expand Down
15 changes: 7 additions & 8 deletions web/css/carousel/carousel-and-snippet.css

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

8 changes: 6 additions & 2 deletions web/css/form/form.css

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

10 changes: 10 additions & 0 deletions web/js/layout/forms.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,13 @@ mata.form.checkFormChange = function() {
return true;
}
}

$(window).load(function() {

$(document).on('mouseenter', 'figure.effect-winston', function() {
$(this).addClass('hover')
}).on('mouseleave', 'figure.effect-winston', function() {
$(this).removeClass('hover')
});

});
5 changes: 5 additions & 0 deletions web/js/layout/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ jQuery(document).ready(function($) {

//this function update the .cd-marker position
function updateSelectedNav(type) {


if($('.cd-selected').length == 0)
return;

var selectedItem = $('.cd-selected'),
selectedItemPosition = selectedItem.index() + 1,
leftPosition = selectedItem.offset().left,
Expand Down

0 comments on commit f12b9ce

Please sign in to comment.