Skip to content

Commit

Permalink
Merge pull request #460 from PressForward/3.4.x
Browse files Browse the repository at this point in the history 
3.4.3 Merge - Ready to release
  • Loading branch information
@AramZS
AramZS committed Dec 17, 2014
2 parents 902aec9 + e324378 commit 0f2da56
Show file tree
Hide file tree
Showing 39 changed files with 5,663 additions and 1,754 deletions.
37 changes: 17 additions & 20 deletions assets/css/pf-responsive.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
.pressforward .grid #entries article.feed-item {
width: 23%;
}

.pressforward .grid.full #entries article.feed-item {
width: 18%;
}
}
}

/* Large-ish desktop */
@media (min-width: 1491px) and (max-width: 1999px) {
.pressforward .grid #entries article.feed-item {
width: 31%;
}

.pressforward .grid.full #entries article.feed-item {
width: 23%;
}
}
}
/* Portrait tablet to landscape and desktop
@media all and (min-width: 1176px) and (max-width: 1299px) {

/* Portrait tablet to landscape and desktop
@media all and (min-width: 1176px) and (max-width: 1299px) {
.pressforward .grid #entries article.feed-item {
width: 48%;
}
Expand All @@ -32,7 +32,7 @@
}
}
*/
@media all and (min-width: 1051px) and (max-width: 1390px) {
@media all and (min-width: 1051px) and (max-width: 1390px) {
.pressforward .grid #entries article.feed-item {
width: 48%;
}
Expand All @@ -41,26 +41,23 @@
width: 31%;
}
}

/* Landscape phone to portrait tablet */
@media all and (max-width: 1050px) {
.pressforward .modal-sidebar {
display: none;
}
@media all and (max-width: 1050px) {
.pressforward .grid #entries article.feed-item {
width: 100%;
}
}
.pressforward .grid.full #entries article.feed-item {
width: 48%;
}
}
}

/* Landscape phones and down */
@media all and (max-width: 800px) {
@media all and (max-width: 800px) {
.pressforward .grid #entries article.feed-item {
width: 100%;
}
}
.pressforward .grid.full #entries article.feed-item {
width: 100%;
}
}
}
}
131 changes: 112 additions & 19 deletions assets/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ background-repeat: repeat-x;

border-color: #9FB351 #768341 #BFD662 #9FB351;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#AFC459', endColorstr='#768341', GradientType=1);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);

}

Expand All @@ -49,7 +49,7 @@ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-o-writing-mode: vertical-rl;
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-ms-transform: rotate(180deg);
-ms-writing-mode: vertical-rl;
-ms-writing-mode: vertical-rl;
writing-mode: tb-rl;
white-space: nowrap;
line-height: 0;
Expand All @@ -67,6 +67,10 @@ clear:both;
visibility:hidden;
}

#deletefeedarchive {
width:100%;
}

.main-container {
margin-top: 10px;
}
Expand All @@ -86,7 +90,7 @@ visibility:hidden;
}

.toplevel_page_pf-menu #wpwrap, .pressforward_page_pf-review #wpwrap, .pressforward_page_pf-feeder #wpwrap {

background-color: #ecf3f9;

}
Expand All @@ -102,7 +106,7 @@ visibility:hidden;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
margin: 0;
margin: 0;
}

.item_title {
Expand Down Expand Up @@ -137,6 +141,68 @@ visibility:hidden;
margin: 0;
}

.btn-warning {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #ffe003;
*background-color: #ffdc1a;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffe003), to(#ffdc1a));
background-image: -webkit-linear-gradient(top, #ffe003, #ffdc1a);
background-image: -o-linear-gradient(top, #ffe003, #ffdc1a);
background-image: linear-gradient(to bottom, #ffe003, #ffdc1a);
background-image: -moz-linear-gradient(top, #ffe003, #ffdc1a);
background-repeat: repeat-x;
border-color: #ffe003 #ffdc1a #f2cd00;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffe003', endColorstr='#ffdc1a', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
#resetFeedOps, #goMenu, .nom-to-archive.btn-warning, .archived .nom-to-archive {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #faa732;
*background-color: #f89406;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
background-image: -o-linear-gradient(top, #fbb450, #f89406);
background-image: linear-gradient(to bottom, #fbb450, #f89406);
background-image: -moz-linear-gradient(top, #fbb450, #f89406);
background-repeat: repeat-x;
border-color: #f89406 #f89406 #ad6704;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
.btn-warning.nom-to-archive:hover {
background-color: #f89406;
*background-color: #f89406;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
background-image: -o-linear-gradient(top, #fbb450, #f89406);
background-image: linear-gradient(to bottom, #fbb450, #f89406);
background-image: -moz-linear-gradient(top, #fbb450, #f89406);
background-repeat: repeat-x;

}
.btn-warning:hover,
.btn-warning:active,
.btn-warning.active,
.btn-warning.disabled,
.btn-warning[disabled] {
color: #ffffff;
background-color: #ffe003;
*background-color: #dbc000;
}

.btn-warning:active,
.btn-warning.active {
background-color: #ffe003 \9;
}





.actions form {
margin: 0;
}
Expand Down Expand Up @@ -234,6 +300,11 @@ h3 {
#tools {
display:none;
}

#feed-folders {
display:none;
}

.primary-btn-tools .btn {
width:100%;
border-radius: 0;
Expand All @@ -244,7 +315,7 @@ h3 {
}
.primary-btn-tools .btn:last-child {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
}
.primary-btn-tools .btn:only-of-type {
border-radius: 4px;
Expand All @@ -271,7 +342,7 @@ h3 {
}

.pf_feeder_input_box {
margin-bottom:24px;
margin-bottom:24px;
}

.full #entries {
Expand All @@ -293,14 +364,17 @@ h3 {
display: inline;
}

.box-controls i {
background-color:#0085B0;
}

.schema-read {
float: right;
margin-right: -12px;
margin-top: -12px;
display: block;
cursor: pointer;
background-image: url("../../lib/twitter-bootstrap/img/glyphicons-halflings-white.png");
background-color:lavender;
border-radius:6px;
position:absolute;
}
Expand All @@ -327,7 +401,7 @@ h3 {
cursor: pointer;
background-image: url("../../lib/twitter-bootstrap/img/glyphicons-halflings-white.png");
background-color:lavender;
border-radius:6px;
border-radius:6px;
position:absolute;
}

Expand All @@ -348,7 +422,7 @@ h3 {
cursor: pointer;
background-image: url("../../lib/twitter-bootstrap/img/glyphicons-halflings-white.png");
background-color:lavender;
border-radius:6px;
border-radius:6px;
position:absolute;
}

Expand All @@ -361,14 +435,19 @@ h3 {
margin-top: 0;
}

.relationship-button-active {
background-color:none;
background-image: url("../../lib/twitter-bootstrap/img/glyphicons-halflings.png");
}

#infscr-loading {
width:100%;
float: left;
padding-left: 40px;
}

.list .actions {

}

.list .modal .actions {
Expand Down Expand Up @@ -477,6 +556,14 @@ h3 {
line-height: 1.7em;
}

.pfmodal > div {
z-index: 2000;
}

.itemCommentModal {
min-width: 40.7px;
}

.feed-item-info-box {
display:none;
}
Expand All @@ -486,41 +573,41 @@ h3 {
font-size: 10px;
line-height: 13px;

z-index: 6002;

z-index: 99999;
}

.info-box-popover {
background-color: #f5f5f5;
z-index: 6001;
z-index: 99998;
width: 310px;

}

.info-box-popover.right {

}

.info-box-popover.top {

}

.info-box-popover.top .popover-content {

}

.info-box-popover.right .arrow {

border-right-color: #f5f5f5!important;

}

.info-box-popover .popover-title {
display:none;
}

.info-box-popover .popover-content {

}

#nom-this-toolbox {
Expand All @@ -530,11 +617,17 @@ h3 {
margin: 10px;
}

#gomenu.btn-warning {
background-color: #9E8A00;
background-image: linear-gradient(to bottom, #9E8A00, #AB9602);
border-color: #9E8A00 #AB9602 #C5AC00;
}

/**
* Specific override styles.
*
*/

ul.wp-submenu {
padding: 0;
margin: 0;
Expand All @@ -546,4 +639,4 @@ ul.wp-submenu {

.relationship-button-active {
background-color:black;
}
}
6 changes: 3 additions & 3 deletions assets/css/susy.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@
display: block;
}

#tools {
#tools, #feed-folders {
float: right;
width: 25%;
padding: 40px;
}
#tools h2 {
#tools h2, #feed-folders h2 {
font-size: 1.125em;
line-height: 1.55556em;
}
Expand Down Expand Up @@ -198,4 +198,4 @@
font-size: 1.75em;
line-height: 2em;
}
}
}
Binary file added assets/icon-128x128.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icon-256x256.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0f2da56

Please sign in to comment.