Skip to content

Commit

Permalink
FIX: conflicts flexslider.css
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexey-svistunov
alexey-svistunov committed Jul 1, 2014
2 parents 8ad3527 + 0d89870 commit 981216d
Show file tree
Hide file tree
Showing 36 changed files with 840 additions and 268 deletions.
30 changes: 15 additions & 15 deletions admin/plugin-maintenance-mode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,29 @@ function isValidDate(y, m, d){
<tbody>
<tr valign="top">
<th scope="row">
<?php _e('Maintenance Mode') ?>
<?php _e('Maintenance Mode', 'cherry-plugin') ?>
</th>
<td>
<label for="mtc_mode_on">
<input name="mtc_mode_on" type="checkbox" id="mtc_mode_on" value="1" <?php echo isset($mtc_options['mtc_mode_on']) ? 'checked="checked"' : '' ; ?>>
<?php _e('Enable this option to activate website maintenance mode.') ?>
<?php _e('Enable this option to activate website maintenance mode.', 'cherry-plugin') ?>
</label>
</td>
</tr>
<tr valign="top">
<th scope="row">
<?php _e('Display Logo?') ?>
<?php _e('Display Logo?', 'cherry-plugin') ?>
</th>
<td>
<label for="mtc_mode_logo">
<input name="mtc_mode_logo" type="checkbox" id="mtc_mode_logo" value="1" <?php echo isset($mtc_options['mtc_mode_logo']) ? 'checked="checked"' : '' ; ?>>
<?php _e('Enable this option to display website logo at the under construction page') ?>
<?php _e('Enable this option to display website logo at the under construction page', 'cherry-plugin') ?>
</label>
</td>
</tr>
<tr valign="top">
<th scope="row">
<?php _e('Description.') ?>
<?php _e('Description', 'cherry-plugin') ?>
</th>
<td>
<p>
Expand All @@ -86,40 +86,40 @@ function isValidDate(y, m, d){
</tr>
<tr valign="top">
<th scope="row">
<?php _e('Display timer?') ?>
<?php _e('Display timer?', 'cherry-plugin') ?>
</th>
<td>
<label for="mtc_mode_timer">
<input name="mtc_mode_timer" type="checkbox" id="mtc_mode_timer" value="1" <?php echo isset($mtc_options['mtc_mode_timer']) ? 'checked="checked"' : '' ; ?>>
<?php _e('Display timer?') ?>
<?php _e('Display timer?', 'cherry-plugin') ?>
</label>
</td>
</tr>
<tr valign="top">
<th scope="row" class="date_input">
<?php _e('Website launch date.') ?><br>
<span class="error"><?php _e('Date is not correct.') ?></span>
<?php _e('Website launch date.', 'cherry-plugin'); ?><br>
<span class="error"><?php _e('Date is not correct.', 'cherry-plugin') ?></span>
</th>
<td>
<p>
<label for="mtc_mode_year" class="small_size" ><?php _e('Year:') ?></label>
<label for="mtc_mode_year" class="small_size" ><?php _e('Year:', 'cherry-plugin') ?></label>
<input name="mtc_mode_year" type="text" id="mtc_mode_year" value="<?php echo $set_date['year'] ?>" class="small-text" maxlength="4">
<label for="mtc_mode_month" class="small_size" ><?php _e('Month:') ?></label>
<label for="mtc_mode_month" class="small_size" ><?php _e('Month:', 'cherry-plugin') ?></label>
<input name="mtc_mode_month" type="text" id="mtc_mode_month" value="<?php echo $set_date['month'] ?>" class="small-text" maxlength="2">
<label for="mtc_mode_day" class="small_size" ><?php _e('Day:') ?></label>
<label for="mtc_mode_day" class="small_size" ><?php _e('Day:', 'cherry-plugin') ?></label>
<input name="mtc_mode_day" type="text" id="mtc_mode_day" value="<?php echo $set_date['day'] ?>" class="small-text" maxlength="2">
</p>
<p>
<label for="mtc_mode_hour" class="small_size" ><?php _e('Hour:') ?></label>
<label for="mtc_mode_hour" class="small_size" ><?php _e('Hour:', 'cherry-plugin') ?></label>
<input name="mtc_mode_hour" type="text" id="mtc_mode_hour" value="<?php echo $set_date['hours'] ?>" class="small-text" maxlength="2">
<label for="mtc_mode_minute" class="small_size" ><?php _e('Minute:') ?></label>
<label for="mtc_mode_minute" class="small_size" ><?php _e('Minute:', 'cherry-plugin') ?></label>
<input name="mtc_mode_minute" type="text" id="mtc_mode_minute" value="<?php echo $set_date['minutes'] ?>" class="small-text" maxlength="2">
</p>
</td>
</tr>
</tbody>
</table>
<p>
<a id="mtc_save" class="button button-primary float-left" href="#"><?php _e('Save Changes', CHERRY_PLUGIN_DOMAIN); ?></a><span class="spinner" style="float:left; margin:4px 0 0 8px; "></span>
<a id="mtc_save" class="button button-primary float-left" href="#"><?php _e('Save Changes', 'cherry-plugin'); ?></a><span class="spinner" style="float:left; margin:4px 0 0 8px; "></span>
</p>
</form>
22 changes: 11 additions & 11 deletions admin/shortcodes/shortcodes/my_button.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ frameworkShortcodeAtts={
id:"style",
controlType:"select-control",
selectValues:['default', 'primary', 'info', 'success', 'warning', 'danger', 'inverse', 'link'],
defaultValue: 'default',
defaultValue: 'default',
defaultText: 'default',
help:"Choose button style."
},
Expand All @@ -24,7 +24,7 @@ frameworkShortcodeAtts={
id:"size",
controlType:"select-control",
selectValues:['mini', 'small', 'normal', 'large'],
defaultValue: 'normal',
defaultValue: 'normal',
defaultText: 'normal',
help:"Choose button size."
},
Expand All @@ -33,7 +33,7 @@ frameworkShortcodeAtts={
id:"target",
controlType:"select-control",
selectValues:['_blank', '_self', '_parent', '_top'],
defaultValue: '_self',
defaultValue: '_self',
defaultText: '_self',
help:"The target attribute specifies a window or a frame where the linked document is loaded."
},
Expand All @@ -42,24 +42,24 @@ frameworkShortcodeAtts={
id:"display",
controlType:"select-control",
selectValues:['inline', 'block'],
defaultValue: 'normal',
defaultText: 'normal',
defaultValue: 'inline',
defaultText: 'inline',
help:"Choose between inline and block display options."
},
{
label:"Class",
id:"class",
help:"Any CSS classes you want to add."
},
{
label:"Icon",
id:"icon",
{
label:"Icon",
id:"icon",
controlType:"select-control",
selectValues:['no', 'pencil', 'refresh', 'comment', 'cogs', 'info-sign', 'user', 'book', 'twitter', 'arrow-right', 'circle-arrow-right'],
defaultValue: 'no',
defaultValue: 'no',
defaultText: 'no',
help:"Optional image."
}
help:"Optional image."
}
],
defaultContent:"",
shortcode:"button"
Expand Down
10 changes: 10 additions & 0 deletions admin/shortcodes/shortcodes/my_mini_posts_grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ frameworkShortcodeAtts={
id:"thumb_height",
help:"Set height for your featured images."
},
{
label:"Which category to pull from? (for Blog posts)",
id:"category",
help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories."
},
{
label:"Which category to pull from? (for Custom posts)",
id:"custom_category",
help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories."
},
{
label:"Order by",
id:"order_by",
Expand Down
2 changes: 1 addition & 1 deletion admin/shortcodes/shortcodes/my_post_cycle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ frameworkShortcodeAtts={
{
label:"Type of posts",
id:"type",
help:'This is the type of posts. Use post slug, e.g. "portfolio" or blank for posts from Blog'
help:"This is the type of posts. Use post slug, e.g. \"portfolio\" or blank for posts from Blog"
},
{
label:"Meta",
Expand Down
70 changes: 48 additions & 22 deletions includes/css/cherry-plugin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,10 @@
border: none;
list-style: none;
/* Images Format Type */

/* Quote Format Type */

/* Link Format Type */

/* Audio Format Type */

/* Video Format Type */

}
.recent-posts_li {
margin: 0 0 20px 20px;
Expand Down Expand Up @@ -427,6 +422,9 @@
padding-top: 22px;
padding-left: 40px;
}
.testimonials .testi-item .testi-meta .user:after {
content: ",";
}
/* Roundabout
---------------------------------------- */
.roundabout-holder {
Expand Down Expand Up @@ -1099,7 +1097,7 @@
.comments-custom li {
overflow: hidden;
margin: 0;
padding: 25px 0 25px 0;
padding: 0 0 25px 0;
border-bottom: none;
background: none;
}
Expand Down Expand Up @@ -1350,7 +1348,6 @@ iframe .uiHeader h3 {
.content_box:before {
left: -99%;
}

#maintenance_mode_notice {
position: fixed;
top: 0px;
Expand All @@ -1376,16 +1373,17 @@ iframe .uiHeader h3 {
#under_construction_page #under_construction_logo .logo,
#under_construction_page #under_construction_logo h1 {
float: none;
width: 100%;
}
#under_construction_page #under_construction_description {
clear: both;
}
#under_construction_page #under_construction_timer {
margin: 40px -20px 40px 0;
margin: 40px 0 40px -30px;
}
#under_construction_page #under_construction_timer .box {
display: inline-block;
margin-right: 30px;
margin-left: 30px;
}
#under_construction_page #under_construction_timer .box:first-child .numbers:before {
content: '';
Expand All @@ -1394,6 +1392,11 @@ iframe .uiHeader h3 {
font-size: 16px;
margin-top: 15px;
}
@media (max-width: 767px) {
#under_construction_page #under_construction_timer .box .lable {
font-size: 12px;
}
}
#under_construction_page #under_construction_timer .box .numbers {
position: relative;
}
Expand All @@ -1405,6 +1408,12 @@ iframe .uiHeader h3 {
font-size: 80px;
line-height: 1.2em;
}
@media (max-width: 767px) {
#under_construction_page #under_construction_timer .box .numbers:before {
font-size: 25px;
left: -10px;
}
}
#under_construction_page #under_construction_timer .box .numbers span {
font-size: 80px;
line-height: 1.2em;
Expand All @@ -1415,9 +1424,26 @@ iframe .uiHeader h3 {
display: inline-block;
min-width: 44px;
}
@media (max-width: 767px) {
#under_construction_page #under_construction_timer .box .numbers span {
font-size: 25px;
padding: 0 7px;
min-width: inherit;
}
}
@media (max-width: 767px) {
#under_construction_page #under_construction_timer .box {
margin-left: 15px;
}
}
#under_construction_page #under_construction_timer .web_site_message {
font-size: 40px;
}
@media (max-width: 767px) {
#under_construction_page #under_construction_timer {
margin-left: 15px;
}
}
div[id^="cherry_instagram_widget"] ul {
margin: 0;
}
Expand Down Expand Up @@ -1544,17 +1570,17 @@ div[id^="cherry_instagram_widget"] .img_thumbnail ul li {
}
}
/*.ie8{
div[id^="cherry_instagram_widget"]{
.img_likes{
i{
color: rgba(255, 0, 0);
div[id^="cherry_instagram_widget"]{
.img_likes{
i{
color: rgba(255, 0, 0);
}
}
.img_commetn_count{
i{
color: rgba(0, 122, 255);
}
}
}
}*/
}
}
.img_commetn_count{
i{
color: rgba(0, 122, 255);
}
}
}
}*/
Loading

0 comments on commit 981216d

Please sign in to comment.