Skip to content
This repository has been archived by the owner on Apr 26, 2021. It is now read-only.

Commit

Permalink
revert integration of lightbox into bower due to incompatable versions
Browse files Browse the repository at this point in the history
And while at it also replace some /img/ paths with /images/ etc.
  • Loading branch information
jbremer committed Apr 6, 2017
1 parent b416740 commit 19a669f
Show file tree
Hide file tree
Showing 9 changed files with 622 additions and 43 deletions.
6 changes: 2 additions & 4 deletions cuckoo/web/src/assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@
"handlebars/handlebars.js",
"string/dist/string.js",
"moment/moment.js",
"chart.js/dist/Chart.js",
"lightbox2/dist/lightbox.js"
"chart.js/dist/Chart.js"
],
"css/vendor.css@concat": [
"font-roboto/dist/styles/roboto.css",
"bootstrap/dist/css/bootstrap.css",
"highlight/src/styles/default.css",
"datatables/media/src/dataTables.bootstrap.css",
"lightbox2/dist/css/lightbox.css"
"datatables/media/src/dataTables.bootstrap.css"
],
"fonts@copy": [
"font-awesome/fonts/*",
Expand Down
1 change: 0 additions & 1 deletion cuckoo/web/src/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"js-cookie": "^2.1.4",
"datatables": "^1.10.13",
"highlight": "^9.10.0",
"lightbox2": "lightbox#^2.9.0",
"jquery-ui": "^1.12.1"
}
}
2 changes: 1 addition & 1 deletion cuckoo/web/src/scss/plugins/_jstree.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.jstree-default .jstree-clicked, .jstree-default .jstree-wholerow-hovered { background: transparent !important; box-shadow: none; }
.jstree-grid-header-regular { text-align: center !important; margin-bottom: 21px !important; background-color: #f9f9f9; }
.jstree-grid-wrapper { padding-bottom: 20px !important; }
.jstree-grid-midwrapper { background: url("/static/img/theme_default/table_bg_22px.png"); background-position-y: 2px; }
.jstree-grid-midwrapper { background: url("/static/images/theme_default/table_bg_22px.png"); background-position-y: 2px; }
.jstree-grid-cell { color: #929292; }
.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox, .jstree-default .jstree-checked>.jstree-checkbox { background-position: -228px -4px; }
.jstree-default .jstree-clicked.jstree-grid-col-0, .jstree-default .jstree-checked { color: #4c4c4c; }
Expand Down
205 changes: 205 additions & 0 deletions cuckoo/web/static/css/lightbox.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
/* Preload images */
body:after {
content: url(../images/close.png) url(../images/loading.gif) url(../images/prev.png) url(../images/next.png);
display: none;
}

.lightboxOverlay {
position: absolute;
top: 0;
left: 0;
z-index: 9999;
background-color: black;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
opacity: 0.8;
display: none;
}

.lightbox {
position: absolute;
left: 0;
width: 100%;
z-index: 10000;
text-align: center;
line-height: 0;
font-weight: normal;
}

.lightbox .lb-image {
display: block;
height: auto;
max-width: inherit;
}

.lightbox a img {
border: none;
}

.lb-outerContainer {
position: relative;
background-color: white;
*zoom: 1;
width: 250px;
height: 250px;
margin: 0 auto;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-ms-border-radius: 4px;
-o-border-radius: 4px;
border-radius: 4px;
}

.lb-outerContainer:after {
content: "";
display: table;
clear: both;
}

.lb-container {
padding: 4px;
}

.lb-loader {
position: absolute;
top: 43%;
left: 0;
height: 25%;
width: 100%;
text-align: center;
line-height: 0;
}

.lb-cancel {
display: block;
width: 32px;
height: 32px;
margin: 0 auto;
background: url(../images/loading.gif) no-repeat;
}

.lb-nav {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
z-index: 10;
}

.lb-container > .nav {
left: 0;
}

.lb-nav a {
outline: none;
background-image: url('data:image/gif;base64,R0lGODlhAQABAPAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
}

.lb-prev, .lb-next {
height: 100%;
cursor: pointer;
display: block;
}

.lb-nav a.lb-prev {
width: 34%;
left: 0;
float: left;
background: url(../images/prev.png) left 48% no-repeat;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
opacity: 0;
-webkit-transition: opacity 0.6s;
-moz-transition: opacity 0.6s;
-o-transition: opacity 0.6s;
transition: opacity 0.6s;
}

.lb-nav a.lb-prev:hover {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
opacity: 1;
}

.lb-nav a.lb-next {
width: 64%;
right: 0;
float: right;
background: url(../images/next.png) right 48% no-repeat;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
opacity: 0;
-webkit-transition: opacity 0.6s;
-moz-transition: opacity 0.6s;
-o-transition: opacity 0.6s;
transition: opacity 0.6s;
}

.lb-nav a.lb-next:hover {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
opacity: 1;
}

.lb-dataContainer {
margin: 0 auto;
padding-top: 5px;
*zoom: 1;
width: 100%;
-moz-border-radius-bottomleft: 4px;
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-moz-border-radius-bottomright: 4px;
-webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
}

.lb-dataContainer:after {
content: "";
display: table;
clear: both;
}

.lb-data {
padding: 0 4px;
color: #ccc;
}

.lb-data .lb-details {
width: 85%;
float: left;
text-align: left;
line-height: 1.1em;
}

.lb-data .lb-caption {
font-size: 13px;
font-weight: bold;
line-height: 1em;
}

.lb-data .lb-number {
display: block;
clear: left;
padding-bottom: 1em;
font-size: 12px;
color: #999999;
}

.lb-data .lb-close {
display: block;
float: right;
width: 30px;
height: 30px;
background: url(../images/close.png) top right no-repeat;
text-align: right;
outline: none;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
opacity: 0.7;
-webkit-transition: opacity 0.2s;
-moz-transition: opacity 0.2s;
-o-transition: opacity 0.2s;
transition: opacity 0.2s;
}

.lb-data .lb-close:hover {
cursor: pointer;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
opacity: 1;
}
2 changes: 1 addition & 1 deletion cuckoo/web/static/css/main.css

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

36 changes: 0 additions & 36 deletions cuckoo/web/static/css/vendor.css
Original file line number Diff line number Diff line change
Expand Up @@ -6896,42 +6896,6 @@ body.lb-disable-scrolling {
overflow: hidden;
}

.lightboxOverlay {
position: absolute;
top: 0;
left: 0;
z-index: 9999;
background-color: black;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
opacity: 0.8;
display: none;
}

.lightbox {
position: absolute;
left: 0;
width: 100%;
z-index: 10000;
text-align: center;
line-height: 0;
font-weight: normal;
}

.lightbox .lb-image {
display: block;
height: auto;
max-width: inherit;
max-height: none;
border-radius: 3px;

/* Image border */
border: 4px solid white;
}

.lightbox a img {
border: none;
}

.lb-outerContainer {
position: relative;
*zoom: 1;
Expand Down
Loading

0 comments on commit 19a669f

Please sign in to comment.