css fixes

5 files changed, 22 insertions, 23 deletions

diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index c37cc3332..cb3ab51c6 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -19,10 +19,7 @@
 	display: none;
 }
 
-#photos-usage-message {
-	line-height: 22px;
-}
-
 #photos-upload-choose {
-	padding: 2px 12px;
+	border: unset;
+	padding: unset;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 114098465..b9726590a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -45,6 +45,10 @@ abbr {
 }
 
 /* icons */
+.tool-icons {
+	color: $toolicon_colour;
+}
+
 .icon {
   background-color: transparent ;
   background-repeat: no-repeat;
@@ -107,10 +111,6 @@ input[type="submit"] {
 	padding: 6px 12px;
 }
 
-input[type="submit"]:hover {
-	text-decoration: underline;
-}
-
 button, input, optgroup, select, textarea {
 	color: #000;
 }
@@ -869,6 +869,7 @@ footer {
 }
 
 #nav-search-text {
+	font-size: 12px;
 	height: 20px;
 	margin: 15px;
 	padding: 0px 5px 0px 5px;
@@ -2198,6 +2199,7 @@ aside .nav-pills > li > a {
 
 
 .navbar-inverse .navbar-nav > li > a {
+	font-size: 12px;
 	color: $nav_icon_colour;
 	text-shadow: 0px 0px 0px;
 }
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 7175a62da..5506b01f2 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,12 +1,12 @@
 <div class="section-title-wrapper">
 	<div class="pull-right">
 		<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
-		<div class="btn-group btn-group-xs">
+		<div class="btn-group btn-group">
 			{{if $album_edit.1}}
-			<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+			<i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
 			{{/if}}
 			{{if $can_post}}
-			<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+			<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
 			{{/if}}
 		</div>
 	</div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 37aab3c96..e7456427b 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -8,20 +8,20 @@
 			<a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
 			{{/if}}
 
-			<div class="btn-group btn-group-xs dropdown">
+			<div class="btn-group btn-group dropdown">
 				{{if $edit}}
-				<i class="icon-pencil btn btn-default" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
+				<i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
 				{{/if}}
 				{{if $lock}}
-				<i id="lockview" class="icon-lock btn btn-default dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
+				<i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
 				{{/if}}
 			</div>
-			<div class="btn-group btn-group-xs">
+			<div class="btn-group btn-group">
 				{{if $prevlink}}
-				<a href="{{$prevlink.0}}" class="btn btn-default" title="{{$prevlink.1}}"><i class="icon-backward"></i></a>
+				<a href="{{$prevlink.0}}" class="btn btn-default btn-xs" title="{{$prevlink.1}}"><i class="icon-backward"></i></a>
 				{{/if}}
 				{{if $nextlink}}
-				<a href="{{$nextlink.0}}" class="btn btn-default" title="{{$nextlink.1}}"><i class="icon-forward"></i></a>
+				<a href="{{$nextlink.0}}" class="btn btn-default btn-xs" title="{{$nextlink.1}}"><i class="icon-forward"></i></a>
 				{{/if}}
 			</div>
 		</div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 7067c84f5..d06af4f99 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -18,10 +18,10 @@
 			{{$aclselect}}
 
 			{{if $default}}
-			<div class="form-group pull-left">
+			<div class="pull-left">
 				<input id="photos-upload-choose" type="file" name="userfile" />
 			</div>
-			<div class="form-group btn-group pull-right">
+			<div class="btn-group pull-right">
 				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
 					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
 				</button>
@@ -31,9 +31,9 @@
 
 			<div id="photos-upload-new-end" class="clear"></div>
 
-			<div id="photos-upload-noshare">
-				<label id="photos-upload-noshare-text" for="photos-upload-noshare" >
-					<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />&nbsp;{{$nosharetext}}
+			<div class="checkbox">
+				<label class="checkbox-inline" for="photos-upload-noshare" >
+					<input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}}
 				</label>
 			</div>