Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/pixelgrade/pixtypes into dev
Browse files Browse the repository at this point in the history
* 'dev' of https://github.com/pixelgrade/pixtypes:
  Better legacy (pile) #14
  • Loading branch information
andreilupu committed Oct 29, 2015
2 parents 2e1edaf + 3f561ee commit 74c8156
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
8 changes: 4 additions & 4 deletions features/metaboxes/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2783,8 +2783,7 @@ div.time-picker li.selected {
#pixgallery > ul, #pixvideos > ul {
padding-top: 0; }
#pixgallery > ul li, #pixvideos > ul li {
width: 31%;
display: inline-block; }
width: 31%; }
#pixgallery > ul li:only-child, #pixvideos > ul li:only-child {
width: 100%; }
#pixgallery > ul li img, #pixvideos > ul li img {
Expand Down Expand Up @@ -2812,7 +2811,6 @@ div.time-picker li.selected {
display: block;
width: 70px;
height: 60px;
font-size: 40px;
font: normal 20px/1 'dashicons';
font-size: 56px; }
#pixgallery .open_pixgallery div, #pixgallery .open_pixvideos div, #pixvideos .open_pixgallery div, #pixvideos .open_pixvideos div {
Expand Down Expand Up @@ -2846,7 +2844,7 @@ div.time-picker li.selected {
#pixgallery.has-items .open_pixgallery i.icon, #pixgallery.has-items .open_pixvideos i.icon, #pixvideos.has-items .open_pixgallery i.icon, #pixvideos.has-items .open_pixvideos i.icon {
font-size: 56px; }
#pixgallery.has-items .open_pixgallery i.icon:before, #pixgallery.has-items .open_pixvideos i.icon:before, #pixvideos.has-items .open_pixgallery i.icon:before, #pixvideos.has-items .open_pixvideos i.icon:before {
content: "\f464"; }
content: "\f464" !important; }
#pixgallery.has-items .open_pixgallery > div span, #pixgallery.has-items .open_pixvideos > div span, #pixvideos.has-items .open_pixgallery > div span, #pixvideos.has-items .open_pixvideos > div span {
display: none; }
#pixgallery.has-items .open_pixgallery:hover, #pixgallery.has-items .open_pixvideos:hover, #pixvideos.has-items .open_pixgallery:hover, #pixvideos.has-items .open_pixvideos:hover {
Expand All @@ -2856,6 +2854,8 @@ div.time-picker li.selected {

#pixgallery.no-items > ul {
min-height: 130px; }
#pixgallery .open_pixgallery .icon:before {
content: "\f233" !important; }

#pixvideos > ul {
list-style: none;
Expand Down
7 changes: 5 additions & 2 deletions features/metaboxes/scss/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,6 @@ $accent: #07d3f8;
display: block;
width: 70px;
height: 60px;
font-size: 40px;
font: normal 20px/1 'dashicons';
font-size: 56px;

Expand Down Expand Up @@ -1561,7 +1560,7 @@ $accent: #07d3f8;
font-size: 56px;

&:before {
content: "\f464";
content: "\f464" !important;
}
}

Expand Down Expand Up @@ -1593,6 +1592,10 @@ $accent: #07d3f8;
&.no-items > ul {
min-height: 130px;
}

.open_pixgallery .icon:before {
content: "\f233" !important;
}
}

// Videos
Expand Down

0 comments on commit 74c8156

Please sign in to comment.