Permalink
Browse files

modified: css3.css

    modified:   editor-style.css
    modified:   functions.php
    modified:   lib/alias_functions.php
    modified:   lib/csscolor.css.php
    modified:   style.css
  • Loading branch information...
1 parent c856a13 commit 0c28d79db6907abe9a73f31c534c8b7fb53f6948 @tenman committed Feb 29, 2012
Showing with 159 additions and 52 deletions.
  1. +6 −0 css3.css
  2. +1 −1 editor-style.css
  3. +140 −48 functions.php
  4. +1 −1 lib/alias_functions.php
  5. +8 −1 lib/csscolor.css.php
  6. +3 −1 style.css
View
@@ -88,3 +88,9 @@ submit{
border-bottom:none;
}
+.raindrops-tab-content,
+.raindrops-tab-list li{
+
+border:1px solid rgba(200,200,200,0.3);
+
+}
View
@@ -4,9 +4,9 @@
* Filetype: CSS
* @package Raindrops
*/
+@import url("style.css");
html .mceContentBody {
max-width:640px;
-
}
a{
View
@@ -146,9 +146,35 @@
*
*/
if( !isset( $raindrops_fluid_minimam_width ) ){
- $raindrops_fluid_minimam_width = '400';
+ $raindrops_fluid_minimam_width = '480';
}
/**
+ * fluid page main column maximam width px
+ *
+ *
+ *
+ *
+ *
+ */
+
+ if( !isset( $raindrops_fluid_maximam_width ) ){
+ $raindrops_fluid_maximam_width = '1280';
+ }
+/**
+ * Special simple view for mobile and small width browser
+ * If it sets to true, a display simple compulsory always will be performed.
+ *
+ * default false
+ *
+ *
+ */
+
+ if( !isset( $raindrops_fallback_human_interface_show ) ){
+ $raindrops_fallback_human_interface_show = false;
+ }
+
+
+/**
* Raindrops header and footer image upload
*
*
@@ -393,11 +419,11 @@ function raindrops_custom_width($content,$key){
$c_width = (int)$raindrops_page_width;
$width = $c_width / 13;
$ie_width = $width * 0.9759;
- $custom_content_width = '<style type="text/css">'.
+ $custom_content_width = '<style type="text/css"><!--'.
'#custom-doc {margin:auto;text-align:left;'."\n".
'width:'.round($width,0).'em;'."\n".
'*width:'.round($ie_width,0).'em;'."\n".
- 'min-width:'.round($width * 0.7,0).'em;}</style>';
+ 'min-width:'.round($width * 0.7,0).'em;}</style>-->';
echo apply_filters("raindrops_custom_width",$custom_content_width);
}
@@ -425,42 +451,32 @@ function raindrops_custom_width($content,$key){
*/
if (!function_exists('raindrops_is_fluid')) {
function raindrops_is_fluid(){
- global $is_IE, $raindrops_fluid_minimam_width;
- $width = intval($raindrops_fluid_minimam_width);
- $width = $width / 13;
- $sidebar_width = 'yui-'.raindrops_warehouse_clone('raindrops_col_width');
- $adjust = 20;
- if($sidebar_width == 'yui-t1'){
- $raindrops_default_col_width = 160 + $adjust;
- }elseif($sidebar_width == 'yui-t2'){
- $raindrops_default_col_width = 180 + $adjust;
- }elseif($sidebar_width == 'yui-t3'){
- $raindrops_default_col_width = 300 + $adjust;
- }elseif($sidebar_width == 'yui-t4'){
- $raindrops_default_col_width = 180 + $adjust;
- }elseif($sidebar_width == 'yui-t5'){
- $raindrops_default_col_width = 240 + $adjust;
- }elseif($sidebar_width == 'yui-t6'){
- $raindrops_default_col_width = 300 + $adjust;
- }else{
- $raindrops_default_col_width = 0;
- }
- $horizontal_nav_width = $raindrops_default_col_width + intval($raindrops_fluid_minimam_width);
- $horizontal_nav_width = $horizontal_nav_width / 13;
- if($is_IE){
- $width = round($width * 0.9759,1);
- $horizontal_nav_width = round($horizontal_nav_width * 0.9759,1) + 1;
+ global $is_IE, $raindrops_fluid_minimam_width, $raindrops_fluid_maximam_width;
+ $width = intval($raindrops_fluid_minimam_width);
+ $extra_sidebar_width = raindrops_warehouse_clone('raindrops_right_sidebar_width_percent');
+
+ if($extra_sidebar_width == '25'){
+ $main_column_width_fluid = 74;
+ }elseif($extra_sidebar_width == '75'){
+ $main_column_width_fluid = 24;
+ }elseif($extra_sidebar_width == '33'){
+ $main_column_width_fluid = 64;
+ }elseif($extra_sidebar_width == '66'){
+ $main_column_width_fluid = 32;
+ }elseif($extra_sidebar_width == '50'){
+ $main_column_width_fluid = 49;
}else{
- $width = round($width,1);
- $horizontal_nav_width = round($horizontal_nav_width * 0.9759,1);
+ $main_column_width_fluid = 100;
}
- $fluid_min_width = '<style type="text/css">'.
- "\n#container{min-width:".
- $width.
- 'em;}'.
+
+ $fluid_min_width = '<style type="text/css"><!--'.
+ "\n#doc3{min-width:".
+ $raindrops_fluid_minimam_width.
+ 'px;max-width:'.$raindrops_fluid_maximam_width.'px;}'.
+ "\n#container > .first{width:".$main_column_width_fluid."%;}".
"\n#access{min-width:".
- $width.
- 'em;}</style>';
+ $raindrops_fluid_minimam_width.
+ 'px;}--></style>';
echo apply_filters("raindrops_is_fluid",$fluid_min_width);
}
}
@@ -501,15 +517,15 @@ function raindrops_is_fixed(){
$width = round($width,1);
$raindrops_main_width = round($raindrops_main_width,1);
}
- $custom_fixed_width = '<style type="text/css">'."
+ $custom_fixed_width = '<style type="text/css"><!--'."
\n#".$pw.'{margin:auto;text-align:left;'."\n".
'min-width:'.$width.'em;'.
$add_ie.
$px.
'}'.
"\n#container{min-width:".
$raindrops_main_width.
- 'em;}</style>';
+ 'em;}--></style>';
echo apply_filters("raindrops_is_fixed",$custom_fixed_width);
}
@@ -1041,6 +1057,7 @@ function add_raindrops_stylesheet() {
wp_enqueue_script('raindrops');
}
}
+
/**
* filter function comment form
*
@@ -1203,10 +1220,13 @@ function raindrops_embed_meta($content){
.gallery-columns-7 dl{ width: 14.28% }
.gallery-columns-8 dl{ width: 12.5% }
.gallery-columns-9 dl{ width: 11.1% }';
- $css = $raindrops_gallerys;
- $raindrops_options = get_option("raindrops_theme_settings");
- //$css .= $raindrops_options['_raindrops_indv_css'];
- $css .= raindrops_warehouse_clone('_raindrops_indv_css');
+ $css = $raindrops_gallerys;
+ $css .= apply_filters("raindrops_gallerys_css",$css);
+
+ $raindrops_options = get_option("raindrops_theme_settings");
+ $raindrops_indv_css = raindrops_warehouse_clone('_raindrops_indv_css');
+ $css .= apply_filters("raindrops_indv_css",$raindrops_indv_css);
+
$background = get_background_image();
$color = get_background_color();
if(!empty($background) or !empty($color)){
@@ -1217,8 +1237,11 @@ function raindrops_embed_meta($content){
}
$css = apply_filters("raindrops_embed_meta_css",$css);
-
+if(WP_DEBUG !== true){
$css = str_replace(array("\n","\r","\t",'&quot;','--','\"'),array("","","",'"','','"'),$css);
+ }else{
+ $css = str_replace(array('&quot;','--','\"'),array('"','','"'),$css);
+ }
if (is_single() || is_page()) {
if(have_posts()){
while (have_posts()) : the_post();
@@ -1228,7 +1251,7 @@ function raindrops_embed_meta($content){
$css .= get_post_meta($post->ID, 'css', true);
if (!empty($css)) {
$result .= '<style type="text/css">';
- $result .= "\n/*<![CDATA[*/\n";
+ $result .= "\n<!--/*<![CDATA[*/\n";
$result .= $css;
$result .= "\n/*]]>*/\n";
$result .= "</style>";
@@ -1238,7 +1261,7 @@ function raindrops_embed_meta($content){
$result .= '<script type="text/javascript">';
$result .= "\n/*<![CDATA[*/\n";
$result .= $javascript;
- $result .= "\n/*]]>*/\n";
+ $result .= "\n/*]]>*/-->\n";
$result .= "</script>";
}
$meta = get_post_meta($post->ID, 'meta', true);
@@ -1250,9 +1273,9 @@ function raindrops_embed_meta($content){
}else{
if(RAINDROPS_USE_AUTO_COLOR == true){
$result .= '<style type="text/css">';
- $result .= "\n/*<![CDATA[*/\n";
+ $result .= "\n<!--/*<![CDATA[*/\n";
$result .= $css;
- $result .= "\n/*]]>*/\n";
+ $result .= "\n/*]]>*/-->\n";
$result .= "</style>";
}
}
@@ -2109,6 +2132,7 @@ function raindrops_admin_header_style() {
$css_result = str_replace(array('#headimg body','a:hover'),array('#headimg','a'),$css_result);
?>
<style type="text/css">
+<!--
a:hover{color:none;}
#headimg{
width:<?php echo $custom_header_width;?>!important;
@@ -2229,7 +2253,7 @@ function raindrops_admin_header_style() {
span#site-title,
#message a{
color: #21759B!important;
-}
+}-->
</style>
<?php
}
@@ -2631,4 +2655,72 @@ function raindrops_enqueue_comment_reply() {
}
}
+
+
+ add_filter('the_content', 'raindrops_fallback_human_interface');
+ add_filter('raindrops_posted_in', 'raindrops_fallback_human_interface');
+
+ function raindrops_fallback_human_interface($content){
+ if((is_home() or is_front_page()) and small_screen_check() == true){
+ return;
+ }else{
+ return $content;
+ }
+ }
+
+
+ function small_screen_check() {
+ global $raindrops_fluid_minimam_width, $raindrops_fallback_human_interface_show;
+ $size = '';
+ if ( !empty($_SERVER['HTTP_UA_PIXELS'] )) {
+ $size = $_SERVER['HTTP_UA_PIXELS'];
+ }
+ if(!empty( $_SERVER['HTTP_X_UP_DEVCAP_SCREENPIXELS'] ) ){
+ $size = $_SERVER['HTTP_X_UP_DEVCAP_SCREENPIXELS'];
+ }
+ if(!empty( $_SERVER['HTTP_X_JPHONE_DISPLAY'] ) ){
+ $size = $_SERVER['HTTP_X_JPHONE_DISPLAY'];
+ }
+
+
+ $size = split('[x,*]', $size);
+
+ if($raindrops_fallback_human_interface_show == true){
+ return true;
+ }
+
+ if (isset($size[0]) and is_numeric($size[0])) {
+
+ if($size[0] < $raindrops_fluid_minimam_width){
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ return false;
+
+ }
+
+ function fallback_user_interface_view() {
+ //wp_deregister_style( 'style' );
+ wp_deregister_style( 'raindrops_reset_fonts_grids' );
+ wp_deregister_style( 'raindrops_grids' );
+ wp_deregister_style( 'raindrops_fonts' );
+ wp_deregister_style( 'raindrops_css3' );
+ wp_deregister_style( 'child' );
+ $current_theme = get_current_theme();
+ $themes = get_themes();
+ $raindrops_version = $themes[$current_theme]['Version'];
+ $fallback_style = get_template_directory_uri().'/fallback.css';
+ wp_register_style('fallback_style', $fallback_style,array(),$raindrops_version,'all');
+ wp_enqueue_style( 'fallback_style');
+ add_filter('raindrops_indv_css',__return_false());
+ add_filter('raindrops_is_fluid',__return_false());
+ }
+
+ if(small_screen_check() == true){
+ add_action('wp_print_styles', 'fallback_user_interface_view',99);
+ }
+
?>
View
@@ -82,7 +82,7 @@ function raindrops_content_width_clone(){
$raindrops_content_width = $default;
}
}elseif($document_width == 'doc3'){
- $raindrops_content_width = false;
+ $raindrops_content_width = 0;
/* $w = 750;
if($sidebar_width == 'yui-t1'){
$raindrops_content_width = $w - 160 - $adjust;
View
@@ -531,6 +531,8 @@ function raindrops_indv_css_dark(){
border-left:1px solid %rgba_border%;
}
+
+
CSS3;
return $style.$css3;
}
@@ -780,8 +782,10 @@ function raindrops_indv_css_w3standard(){
%c_1%
}
a.raindrops-comment-link:hover .point {
-border-left:1px solid %rgba_border%;
+border-left:1px solid %c_border%;
}
+
+
DOC;
return $style;
}
@@ -1339,6 +1343,8 @@ function raindrops_indv_css_light(){
a.raindrops-comment-link:hover .point {
border-left:1px solid %rgba_border%;
}
+
+
CSS3;
return $style.$css3;
}
@@ -1393,6 +1399,7 @@ function raindrops_indv_css_minimal(){
a.raindrops-comment-link:hover .point {
border-left:1px solid %rgba_border%;
}
+
input[type="text"],
textarea#comment{
border:1px solid #ddd;
View
@@ -719,6 +719,8 @@ padding:0;
width:90%;
line-height:1.4;
margin-top:0.3em;
+ word-break:break-all;
+ word-wrap:break-word;
}
.lsidebar li.page_item a,
.lsidebar li.category_report a,
@@ -1355,6 +1357,7 @@ div.menu li a{
padding:0.8em 0;
height: auto;
}
+#access .children:hover > a,
#access li:hover > a,
#access ul ul :hover > a {
color:red; /* for ie9 */
@@ -2098,7 +2101,6 @@ margin:0;padding:0;
.raindrops-tab-list li{
margin:0;
padding:0;
-border:1px solid rgba(200,200,200,0.3);
}
.raindrops-tab-list li{

0 comments on commit 0c28d79

Please sign in to comment.