Fix some theme and UI problems

- More stick buttons!
- Fix line-height of titles + fix load more on mobile (Origine)
- Fix content width and filter buttons (Dark and Flat)

6 files changed, 38 insertions, 18 deletions

diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index c199ad53d..87aac6198 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -32,8 +32,10 @@
 		<div class="form-group">
 			<label class="group-name" for="apiPasswordPlain"><?php echo Minz_Translate::t('password_api'); ?></label>
 			<div class="group-controls">
-				<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-				<a class="btn toggle-password"/><?php echo FreshRSS_Themes::icon('key'); ?></a>
+				<div class="stick">
+					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
+					<a class="btn toggle-password"/><?php echo FreshRSS_Themes::icon('key'); ?></a>
+				</div>
 			</div>
 		</div>
 		<?php } ?>
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 56ac5f8dd..849dacac6 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -28,10 +28,8 @@
 		<div class="form-group">
 			<label class="group-name"><?php echo Minz_Translate::t('website_url'); ?></label>
 			<div class="group-controls">
-				<label>
 				<?php echo $this->feed->website(); ?>
-				<a target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
-				</label>
+				<a class="btn" target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
 			</div>
 		</div>
 		<?php } ?>
@@ -39,9 +37,11 @@
 		<div class="form-group">
 			<label class="group-name" for="url"><?php echo Minz_Translate::t('feed_url'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="url_rss" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
-				<a target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
-				  <a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo Minz_Translate::t('feed_validator'); ?></a>
+				<div class="stick">
+					<input type="text" name="url_rss" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
+					<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+				</div>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo Minz_Translate::t('feed_validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css
index 9e58855dc..aef9a7469 100644
--- a/p/themes/Dark/freshrss.css
+++ b/p/themes/Dark/freshrss.css
@@ -88,10 +88,6 @@
 		.nav_menu .search {
 			display:none;
 		}
-		.nav_menu .btn[aria-checked="true"]{
-			border-color: #2f2f2f;
-			box-shadow: 0 0 10px 3px #2f2f2f inset;
-		}
 
 .favicon {
 	height: 16px;
@@ -387,12 +383,20 @@
 
 .content {
 	min-height: 150px;
-	max-width: 550px;
 	margin: 0 auto;
 	padding: 20px 10px;
 	line-height: 170%;
 	word-wrap: break-word;
 }
+	.content.large {
+		max-width: 1000px;
+	}
+	.content.medium {
+		max-width: 800px;
+	}
+	.content.thin {
+		max-width: 550px;
+	}
 	.content h1, .content h2, .content h3 {
 		margin: 20px 0 5px;
 	}
diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css
index 061bd4a84..503eec813 100644
--- a/p/themes/Flat/freshrss.css
+++ b/p/themes/Flat/freshrss.css
@@ -87,10 +87,6 @@ body {
 		.nav_menu .search {
 			display:none;
 		}
-		.nav_menu .btn[aria-checked="true"]{
-			background-color: #2980B9;
-			border-bottom-color: #3498DB;
-		}
 
 .favicon {
 	height: 16px;
@@ -383,12 +379,20 @@ body {
 
 .content {
 	min-height: 150px;
-	max-width: 550px;
 	margin: 0 auto;
 	padding: 20px 10px;
 	line-height: 170%;
 	word-wrap: break-word;
 }
+	.content.large {
+		max-width: 1000px;
+	}
+	.content.medium {
+		max-width: 800px;
+	}
+	.content.thin {
+		max-width: 550px;
+	}
 	.content h1, .content h2, .content h3 {
 		margin: 20px 0 5px;
 	}
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 3a32d54d3..71534aff8 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -674,6 +674,9 @@ a.btn {
 	font-size: 0.8rem;
 	cursor: pointer;
 }
+.flux .title {
+	font-size: 0.9rem;
+}
 .flux .website .favicon {
 	padding: 5px;
 }
@@ -992,6 +995,10 @@ a.btn {
 		padding: 12px;
 	}
 
+	.pagination {
+		margin: 0 0 3.5em;
+	}
+
 	.notification a.close {
 		display: block;
 		left: 0;
diff --git a/p/themes/Origine/template.css b/p/themes/Origine/template.css
index 8b14633b2..5160b4591 100644
--- a/p/themes/Origine/template.css
+++ b/p/themes/Origine/template.css
@@ -26,14 +26,17 @@ ul, ol, dd {
 h1 {
 	margin: 0.6em 0 0.3em;
 	font-size: 1.8em;
+	line-height: 1.6em;
 }
 h2 {
 	margin: 0.5em 0 0.25em;
 	font-size: 1.6em;
+	line-height: 2em;
 }
 h3 {
 	margin: 0.5em 0 0.25em;
 	font-size: 1.4em;
+	line-height: 2em;
 }
 
 /*=== Paragraphs */