Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSS fix and Optimisations #215

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CSS fix and Optimisations #215

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d6340d
Optimised CSS, removed px and s references when 0 will suffice, none …
malard Mar 27, 2016
351ad09
Merge pull request #1 from malard/css-fixes
malard Mar 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions assets/css/croppic.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
box-sizing: content-box;
-moz-box-sizing: content-box;
border-radius: 2px;
background-image: url(../img/placeholder.png);
background-image: url('../img/placeholder.png');
background-repeat: no-repeat;
background-position: center;
box-shadow: 8px 8px 0px rgba(0,0,0,0.1);
Expand Down Expand Up @@ -70,19 +70,19 @@

.cropControls i:hover{ background-color:rgba(0,0,0,0.7); }

.cropControls i.cropControlZoomMuchIn{ background-position:0px 0px;}
.cropControls i.cropControlZoomIn{ background-position:-30px 0px; }
.cropControls i.cropControlZoomOut{ background-position:-60px 0px; }
.cropControls i.cropControlZoomMuchOut{ background-position:-90px 0px; }
.cropControls i.cropControlRotateLeft{ background-position:-210px 0px; }
.cropControls i.cropControlRotateRight{ background-position:-240px 0px; }
.cropControls i.cropControlCrop{ background-position:-120px 0px;}
.cropControls i.cropControlUpload{ background-position:-150px 0px;}
.cropControls i.cropControlReset{ background-position:-180px 0px;}
.cropControls i.cropControlRemoveCroppedImage{ background-position:-180px 0px;}
.cropControls i.cropControlZoomMuchIn{ background-position:0 0;}
.cropControls i.cropControlZoomIn{ background-position:-30px 0; }
.cropControls i.cropControlZoomOut{ background-position:-60px 0; }
.cropControls i.cropControlZoomMuchOut{ background-position:-90px 0; }
.cropControls i.cropControlRotateLeft{ background-position:-210px 0; }
.cropControls i.cropControlRotateRight{ background-position:-240px 0; }
.cropControls i.cropControlCrop{ background-position:-120px 0;}
.cropControls i.cropControlUpload{ background-position:-150px 0;}
.cropControls i.cropControlReset{ background-position:-180px 0;}
.cropControls i.cropControlRemoveCroppedImage{ background-position:-180px 0;}

.cropControls i:last-child{
margin-right:none;
margin-right: 0;
}

#croppicModal{
Expand Down Expand Up @@ -120,7 +120,7 @@
height: 10px;
margin: 25px auto;
background: #FFF;
box-shadow: 5px 5px 0px rgba(0,0,0,0.2);
box-shadow: 5px 5px 0 rgba(0,0,0,0.2);
-moz-border-radius: 50px;
-moz-animation: bubblingG 1s infinite alternate;
-webkit-border-radius: 50px;
Expand All @@ -135,11 +135,11 @@
}

#bubblingG_1 {
-moz-animation-delay: 0s;
-webkit-animation-delay: 0s;
-ms-animation-delay: 0s;
-o-animation-delay: 0s;
animation-delay: 0s;
-moz-animation-delay: 0;
-webkit-animation-delay: 0;
-ms-animation-delay: 0;
-o-animation-delay: 0;
animation-delay: 0;
}

#bubblingG_2 {
Expand Down