diff options
| -rw-r--r-- | mod/photos.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 30 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 6 |
4 files changed, 29 insertions, 14 deletions
diff --git a/mod/photos.php b/mod/photos.php index c2d90184e..0ff0e29c9 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -654,7 +654,7 @@ function photos_content(&$a) { ); $o .= '<div class="section-title-wrapper">'; - $o .= '<h3>' . $album . '</h3>'; + $o .= '<h2>' . $album . '</h2>'; $o .= '<div class="section-title-submenu">'; if($cmd === 'edit') { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { @@ -1238,7 +1238,7 @@ function photos_content(&$a) { $o .= replace_macros($tpl, array( '$title' => t('Recent Photos'), '$can_post' => $can_post, - '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), + '$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), '$photos' => $photos, )); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8841260e3..1d43fe983 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -24,15 +24,15 @@ body { height: 100%; } -h1, h2 { - font-size: 1.583em; +h1, .h1, h2, .h2 { + font-size: 1.667em; } -h3, h4 { +h3, .h3, h4, .h4 { font-size: 1.334em; } -h5, h6 { +h5, .h5, h6, .h6 { font-size: 0.75rem; } @@ -73,6 +73,15 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; } cursor: pointer; } +a.btn-default { + color: #333; + +} + +a.btn-success { + color: #fff; +font-weight: normal; +} input[type="text"], input[type="password"], @@ -2415,16 +2424,16 @@ blockquote { .btn-default { background-color: $editbuttons_bgcolour; border-color: $editbuttons_bordercolour; - color: $editbuttons_colour; + color: $editbuttons_colour; text-shadow: none; box-shadow: none; } .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { - background-color: $editbuttons_bghover; - border-color: $editbuttons_bordercolourhover; - color: $input_colourhover; - text-decoration: $input_decohover; + background-color: $editbuttons_bghover; + border-color: $editbuttons_bordercolourhover; + color: $input_colourhover; + text-decoration: $input_decohover; } .btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { @@ -2451,7 +2460,7 @@ blockquote { margin-bottom: 10px; } -.section-title-wrapper h3 { +.section-title-wrapper h2 { margin-top: 0px; margin-bottom: 0px; } @@ -2464,6 +2473,7 @@ blockquote { margin-right: 10px; } + @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 5602f8571..0f8b809ac 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -4,10 +4,11 @@ {{if $upload}} <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li> {{/if}} + <li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li> {{if $albums}} {{foreach $albums as $al}} {{if $al.text}} - <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li> + <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li> {{/if}} {{/foreach}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index b4094512c..6b0f555b6 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,5 +1,9 @@ <div class="section-title-wrapper"> - <h3>{{$title}}</h3> + {{if $can_post}} + <a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i> {{$upload.0}}</a> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> </div> <div id="photo-album-contents"> {{foreach $photos as $photo}} |