diff options
| -rw-r--r-- | include/photos.php | 6 | ||||
| -rw-r--r-- | view/css/bootstrap-red.css | 19 | ||||
| -rw-r--r-- | view/css/conversation.css | 12 | ||||
| -rw-r--r-- | view/css/default.css | 7 | ||||
| -rw-r--r-- | view/css/widgets.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/narrow_navbar.css | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 71 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 2 |
8 files changed, 39 insertions, 90 deletions
diff --git a/include/photos.php b/include/photos.php index 82af4aaeb..c0243cc15 100644 --- a/include/photos.php +++ b/include/photos.php @@ -164,6 +164,7 @@ function photo_upload($channel, $observer, $args) { $p['scale'] = 1; $r2 = $ph->save($p); $smallest = 1; + $width_x_height = $ph->getWidth() . 'x' . $ph->getHeight(); if(! $r2) $errors = true; } @@ -173,6 +174,7 @@ function photo_upload($channel, $observer, $args) { $p['scale'] = 2; $r3 = $ph->save($p); $smallest = 2; + $width_x_height = $ph->getWidth() . 'x' . $ph->getHeight(); if(! $r3) $errors = true; } @@ -221,7 +223,7 @@ function photo_upload($channel, $observer, $args) { $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' - . '[zmg]' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]' + . '[zmg=' . $width_x_height. ']' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]' . '[/zrl]'; $result = item_store($arr); @@ -426,4 +428,4 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) { $item_id = $result['item_id']; return $item_id; -}
\ No newline at end of file +} diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 016c66c97..10d341691 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,28 +1,9 @@ /* override some bootstrap settings */ -*, -*:before, -*:after { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} html { font-size: 100%; } -.panel-body .form-control{ - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.profile-jot-text{ - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - - h1, .h1 { font-size: 24px; diff --git a/view/css/conversation.css b/view/css/conversation.css index 33786600d..8d7404b5d 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -6,7 +6,7 @@ border: 0px; margin: 0px; padding: 8px; - height: 1.8em; + height: 3.4em; width: 70%; margin-bottom: 5px; } @@ -16,10 +16,10 @@ } #profile-jot-text { - height: 1.8em; + height: 3.4em; padding: 8px; margin-right: 0px; - width: 90%; + width: 100%; } #profile-jot-text-loading { @@ -29,11 +29,11 @@ #profile-jot-submit-wrapper { margin-top: 10px; - width: 90%; + width: 100%; } #profile-jot-submit { - height: 22px; + height: 30px; width: 70px; float: right; } @@ -369,7 +369,7 @@ } .comment-edit-text-empty { - height: 1.2em; + height: 2.8em; width: 30%; overflow: auto; margin-bottom: 10px; diff --git a/view/css/default.css b/view/css/default.css index 9ece626b4..c6a8fe58e 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -14,11 +14,12 @@ main { } aside#region_1 { - width: 210px; - min-width: 210px; + width: 231px; + min-width: 231px; + max-width: 231px; display: table-cell; vertical-align: top; - padding: 65px 7px 13px 7px; + padding: 65px 7px 0px 7px; } aside input[type='text'] { diff --git a/view/css/widgets.css b/view/css/widgets.css index dcda66b81..7c2a03c3b 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -22,8 +22,8 @@ /* notes */ #note-text { - width: 190px; - max-width: 190px; + width: 100%; + resize: vertical; height: 150px; } diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index b05f46797..cfda9760e 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,8 +1,9 @@ +@media screen and (min-width: 760px) { .navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;} .navbar {min-height:25px !important;} nav img { -height: 25px; -width: 25px; +height: 30px; +width: 30px; margin: 2px 0px 1px 10px; border-radius: 0px; } @@ -12,7 +13,7 @@ border-radius: 0px; #nav-search-text {margin:5px;} header #banner {margin-top:5px;} nav .dropdown-menu { -top: 30px;} +top: 33px;} nav .badge { position: relative; top: -30px; @@ -24,4 +25,5 @@ nav .badge { #jGrowl.top-right { top: 30px; right: 15px; +} }
\ No newline at end of file diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4415bdc30..ecb9352ec 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -138,51 +138,10 @@ blockquote { filter:alpha(opacity=100); } - -#langselector { - position: fixed; - top: 3px; - left: 5px; - z-index:9999; - opacity: 0.3; - filter:alpha(opacity=30); - - -} -#langselector:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -/* this is not yet supported - -nav { - background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%); - background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); +nav, +header { opacity: $nav_float_min_opacity; filter:alpha(opacity=$nav_percent_min_opacity); - -} - -nav:hover { - background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - opacity: 1.0; - filter:alpha(opacity=100); - -} -*/ - -nav #site-location { - color: #888a85; - font-size: 0.8em; - position: absolute; } .error-message { @@ -213,10 +172,6 @@ nav #banner #logo-text a { } nav #banner #logo-text a:hover { text-decoration: none; } -header #site-location { - display: none; -} - header #banner { overflow: hidden; text-align: center; @@ -402,6 +357,10 @@ footer { color: #444444; } +.vcard { + padding: 8px; +} + .vcard .title { margin-bottom: 5px; } @@ -474,9 +433,9 @@ footer { #profile-photo-wrapper img { - width:175px; - height:175px; padding: 12px; + width: 201px; + height: 201px; } #profile-in-dir-yes-label, @@ -772,6 +731,7 @@ footer { #contact-block { margin-top: 25px; + padding: 8px; } #contact-block-numcontacts { @@ -781,8 +741,8 @@ footer { .contact-block-div { float: left; - width: 52px; - height: 52px; + width: 50px; + height: 50px; } .contact-block-textdiv { float: left; @@ -1285,7 +1245,7 @@ brain is weird like that */ background-image:url("../../../../images/onoff.jpg"); background-repeat: no-repeat; padding: 4px 2px 2px 2px; - height: 16px; + height: 24px; text-decoration: none; } .field .onoff .off { @@ -1475,6 +1435,9 @@ div.jGrowl div.info { right: 15px; } +div.jGrowl div.jGrowl-notification { + min-height: 60px; +} #id_term_label { width:75px; @@ -2309,8 +2272,8 @@ blockquote { } main { - left: -225px; - width: calc( 100% + 225px ); + left: -231px; + width: calc( 100% + 231px ); } main.region_1-on { diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 34c04e91c..fc9388f2e 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -27,7 +27,7 @@ {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$converse_width}} -{{* include file="field_input.tpl" field=$nav_min_opacity *}} +{{include file="field_input.tpl" field=$nav_min_opacity}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} {{include file="field_checkbox.tpl" field=$sloppy_photos}} |